scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
686 commits 78 branches 380 tags 120 MiB
Commit graph

686 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
7de680b718 Fix value input positioning on nested statements 
Thank you @tmickel
 2016-02-23 16:58:21 -05:00
Ray Schamp
75c877848d WIP: Position inputs 2016-02-23 16:58:21 -05:00
Ray Schamp
4e08ad8002 Fix empty pants width 2016-02-23 16:54:53 -05:00
rachel-fenichel
ffc727f243 Merge pull request #66 from rachel-fenichel/bugfix/zombie_code 
remove zombie code
 2016-02-19 11:13:23 -08:00
Rachel Fenichel
5464f52910 remove zombie code 2016-02-19 10:42:10 -08:00
Ray Schamp
2d7380e70b Merge pull request #61 from rschamp/merge/google-2016 
Merge latest blockly master
 2016-02-18 17:40:52 -05:00
Ray Schamp
8b0b1dfda6 Update build.py to account for block_svg.js rename 
And rebuild.

Thanks @rachel-fenichel
 2016-02-18 17:38:57 -05:00
Ray Schamp
1a6dff7f42 Merge branch 'master' of github.com:google/blockly into merge/google-2016 
# Conflicts:
#	blockly_compressed_vertical.js
#	blockly_uncompressed_vertical.js
#	blocks/text.js
#	blocks_compressed.js
#	core/block_svg.js
#	core/connection.js
#	core/field_textinput.js
#	core/flyout.js
#	core/toolbox.js
#	tests/playground.html
 2016-02-18 13:29:25 -05:00
Ray Schamp
ca0c0f2c86 Rename block_horizontal_scratch to block_svg 2016-02-18 10:43:28 -05:00
Ray Schamp
e2e82dd91e Merge pull request #55 from tmickel/feature/iOS-playground-wrapper 
iOS playground wrapper #32
 2016-02-18 10:09:46 -05:00
Ray Schamp
b9865f6705 Merge pull request #60 from rachel-fenichel/feature/toolbox_position 
Set toolbox position as well as orientation.
 2016-02-18 10:09:27 -05:00
Rachel Fenichel
c0e28dcb15 switch to an enum 2016-02-17 16:32:31 -08:00
Rachel Fenichel
8f23434703 render toolbox and flyout at start/end in horizontal mode 2016-02-17 11:02:26 -08:00
Neil Fraser
d404fa8c9d Merge pull request #258 from google/2016 
Fix issue 251, $ in ID.
 2016-02-16 22:19:36 -08:00
Neil Fraser
aeabf0ec6f Fix issue 251, $ in ID. 2016-02-16 22:16:36 -08:00
Neil Fraser
18684d9cbd Merge pull request #257 from google/2016 
2016
 2016-02-16 21:57:54 -08:00
Neil Fraser
6e6a04b879 Add X/Y coordinates and block ID to create event. 2016-02-16 21:57:22 -08:00
Neil Fraser
5de9edeea3 Merge branch 'master' into 2016 2016-02-16 13:06:27 -08:00
Neil Fraser
9baec187b4 Merge pull request #255 from google/2016 
Bug fixes from 2016 branch.
 2016-02-16 13:06:12 -08:00
Neil Fraser
5297344a8b Fix RTL XML. 2016-02-16 13:04:47 -08:00
Neil Fraser
3d3892c2ab Merge branch 'master' into 2016 2016-02-16 13:03:05 -08:00
Niklas Laxström
dda2cbfddb Localisation updates from https://translatewiki.net. 2016-02-15 07:10:02 +01:00
Neil Fraser
a0a61d2f33 Add event grouping. Add event monitoring to playground. 2016-02-12 22:09:21 -08:00
Neil Fraser
1d44036cf9 Add missing move when unshadowing and missing XY when deleting. 2016-02-12 19:34:51 -08:00
Neil Fraser
62f86658ff Merge branch 'master' into 2016 2016-02-12 17:42:59 -08:00
Rachel Fenichel
7cd8135125 Render toolbox and flyout at start/end in vertical mode. 2016-02-12 14:48:13 -08:00
Rachel Fenichel
970c6ad8fa Merge branch 'develop' into feature/toolbox_position 2016-02-12 10:58:24 -08:00
Rachel Fenichel
3462a5a2c1 position toolbox 2016-02-12 10:57:33 -08:00
Ray Schamp
5e65f52a81 Merge pull request #58 from rschamp/feature/pants-rendering 
Fix pants blocks width, height and connection positions
 2016-02-12 13:50:02 -05:00
Tim Mickel
03072cf092 Moving XCode project to tests/ 2016-02-12 13:16:01 -05:00
Tim Mickel
d661e7f09a horizontalLayout on horizontal_playground_compressed 2016-02-12 13:13:25 -05:00
Tim Mickel
28a073057b Updating compressed playground filenames 2016-02-12 13:10:24 -05:00
Tim Mickel
82b50d5188 Merge branch 'develop' of github.com:LLK/scratch-blockly into feature/iOS-playground-wrapper 2016-02-12 13:07:47 -05:00
Neil Fraser
e92d7625df Merge pull request #252 from google/2016 
New event model.
 2016-02-11 21:54:21 -08:00
Neil Fraser
a4741f9feb Routine recompile. 2016-02-11 21:48:14 -08:00
Neil Fraser
0fab13400a Fire function events instead of DOM events. 2016-02-11 21:40:33 -08:00
rachel-fenichel
02160ec6b5 Merge pull request #57 from rachel-fenichel/feature/horizontal_config 
Turn toolbox sideways in the horizontal playground.
 2016-02-11 15:14:08 -08:00
Ray Schamp
61c98422f3 Fix pants blocks width, height and connection positions 
TODO: RTL, figure out why we need to add 3 corner radii to the height sometimes.

Thank you @NeilFraser for your help on this.
 2016-02-11 17:56:24 -05:00
Rachel Fenichel
803d0e72b2 Turn toolbox sideways in the horizontal playground. 2016-02-11 14:46:51 -08:00
rachel-fenichel
11c77cd8fb Merge pull request #56 from rachel-fenichel/bugfix/shorthand_ratio 
fix typo in scrollbar.js
 2016-02-11 13:37:14 -08:00
Rachel Fenichel
136e24a132 fix typo in scrollbar.js 2016-02-11 13:34:43 -08:00
Tim Mickel
68ce2f96de Add iOS wrapper and compiled playgrounds 2016-02-11 15:11:34 -05:00
rachel-fenichel
0ccdf83e18 Merge pull request #52 from rachel-fenichel/feature/horizontal_flyout 
Horizontal flyout rendering
 2016-02-11 11:03:05 -08:00
Rachel Fenichel
e00fb1a590 Style fixes 2016-02-11 11:01:46 -08:00
Neil Fraser
d310b96f84 Add mutation events. 2016-02-10 21:40:51 -08:00
Neil Fraser
cf257ea5e9 Add event filtering. 2016-02-10 19:25:17 -08:00
Rachel Fenichel
193ff8de45 Merge branch 'feature/horizontal_flyout' of https://github.com/rachel-fenichel/scratch-blockly into feature/horizontal_flyout 2016-02-10 17:14:49 -08:00
Rachel Fenichel
39b4980867 horizontal flyout rendering. 2016-02-10 17:09:20 -08:00
Rachel Fenichel
0890596f15 horizontal flyout rendering. 2016-02-10 15:32:19 -08:00
Neil Fraser
63c112932b Rename Field.setChangeHandler to Field.setValidator 2016-02-10 14:33:13 -08:00