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
3184 commits 78 branches 380 tags 120 MiB
Commit graph

119 commits

Author SHA1 Message Date
rachel-fenichel
1d5d89f9df Always disconnect the ghost. 2016-03-21 16:57:39 -04:00
Neil Fraser
d086634394 Lint and recompile. 2016-03-18 15:19:26 -07:00
rachel-fenichel
14715ffc37 Merge pull request #121 from rachel-fenichel/feature/c_block_insertion 
C blocks consume other blocks.
 2016-03-18 14:56:53 -07:00
rachel-fenichel
d442a997d6 Don't consider ghosts when looking for the closest connection. 
New branch due to merge problems with #125.
 2016-03-18 14:12:11 -07:00
Neil Fraser
a3b850b0d3 Merge pull request #287 from rachel-fenichel/feature/source_block_fn 
Add a getter; stop accessing private field sourceBlock_ from outside …
 2016-03-16 19:45:20 -07:00
rachel-fenichel
2c70f7ec26 Add a getter; stop accessing private field sourceBlock_ from outside of a connection. 2016-03-15 16:03:49 -07:00
Tim Mickel
5241c4dd9f Merge remote-tracking branch 'Google/develop' into upstream-march-15 
# Conflicts:
#	blockly_compressed_vertical.js
#	blockly_uncompressed_vertical.js
#	blocks/text.js
#	core/block_svg.js
 2016-03-15 10:35:47 -04:00
rachel-fenichel
da714c0d79 C blocks consume other blocks. 2016-03-14 17:10:15 -07:00
Neil Fraser
8fb1178ed8 Update message descriptions. 2016-03-14 16:00:25 -07:00
rachel-fenichel
4ae34599e0 Don't connect a block with no next connection if that would force a bump. 2016-03-11 17:38:59 -08:00
rachel-fenichel
50975170d7 Fix search for closest 2016-03-11 13:13:34 -08:00
Tim Mickel
5d7d44d1c3 Fix connection.js highlight 2016-03-11 13:18:23 -05:00
Tim Mickel
516cd05d82 Merge remote-tracking branch 'Google/develop' into feature/upstream-merge-march-11-2 
# Conflicts:
#	blockly_compressed_vertical.js
#	blocks_compressed.js
#	build.py
#	core/connection.js
#	core/workspace.js
#	tests/playground.html
 2016-03-11 13:18:14 -05:00
Neil Fraser
02d60a2dbe Group variable rename into same event. 2016-03-06 14:51:03 -08:00
Neil Fraser
2a1ffa11c4 Add undo/redo. Also refactor connections. 
Bugs in undoing mutators and renaming variables.
 2016-03-03 17:48:54 -08:00
Tim Mickel
5bdc3070b9 Merge branch 'upstream' into feature/upstream-merge 
# Conflicts:
#	blockly_compressed_vertical.js
#	blockly_uncompressed_vertical.js
#	core/connection.js
#	tests/jsunit/index.html
#	tests/playground.html
 2016-03-03 11:55:59 -05:00
Rachel Fenichel
d29ffdc283 Lint 2016-02-29 15:50:12 -08:00
Rachel Fenichel
7671986734 Move isConnectionAllowed to connection; clean up 2016-02-29 15:04:07 -08:00
Rachel Fenichel
c177fa5276 add searchForClosest 2016-02-26 16:35:22 -08:00
Rachel Fenichel
1b1d777bc5 Add isConnectionAllowed and tests for it 2016-02-26 16:17:17 -08:00
Rachel Fenichel
e3b05ad2c1 Move connection_db to a new file and start adding tests 2016-02-26 14:13:18 -08:00
Rachel Fenichel
240b8d68ae connection tests and js style fixes 2016-02-26 11:05:36 -08:00
Neil Fraser
b567d6b0d7 Allow shadow blocks to be edited. 2016-02-26 00:22:31 -08:00
Rachel Fenichel
5cb6cf5a1d Fix js style 2016-02-25 15:30:05 -08:00
Rachel Fenichel
9263e28263 Add tests for connection logic 2016-02-25 15:16:32 -08:00
Rachel Fenichel
67aa5ef5bc Minor refactor of connection code 2016-02-25 13:37:19 -08:00
Rachel Fenichel
25c0eb7405 Clean up comment 2016-02-24 16:14:49 -08:00
Rachel Fenichel
aeb61291be minor refactor of connection code, plus fix for #87 2016-02-24 16:11:32 -08: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
Neil Fraser
0fab13400a Fire function events instead of DOM events. 2016-02-11 21:40:33 -08:00
Neil Fraser
a481c1cff8 Customizable angle pickers. 2016-02-09 22:36:15 -08:00
Neil Fraser
bbfd883629 Reduce duplication in Connection.connect. Support shadow statement blocks. Fix race condition. 2016-01-30 13:08:47 -05:00
Neil Fraser
a114849545 Remove duplicated connection path from connection.js 2016-01-28 22:12:42 -05:00
Andrew Sliwinski
461aac0a3d WIP block rendering 2016-01-28 16:58:42 -05:00
Neil Fraser
211595075e Make colour optional in JSON. Add ;/n in generator stub. 2016-01-28 14:25:38 -05:00
Andrew Sliwinski
2534a2514e WIP horizontal rendering 2016-01-27 15:44:58 -05:00
Andrew Sliwinski
113b91d659 Additional block rendering progress. 2016-01-26 16:20:33 -05:00
Neil Fraser
9804b31bb0 Allow easier addition of custom loops or functions. 2016-01-21 18:16:25 -08:00
Neil Fraser
a239c7207f Don't update shadows on connections since they are immutable. 2015-11-22 04:26:58 -08:00
Troy McKinnon
11906b7535 improve type annotations 2015-11-10 17:28:46 -06:00
Neil Fraser
a6ea38db4a Stop shadow from reappearing when one block replaces another. Issue #193 2015-10-09 16:04:19 -07:00
Neil Fraser
701ae603b7 Fix headless connections. 2015-10-09 13:53:14 -07:00
Neil Fraser
799835943a Shadow Blocks 2015-10-06 18:09:27 -07:00
Neil Fraser
6f924e349a Speed up connection matching. Fix theoretical race condition. 2015-10-01 14:09:14 -07:00
Neil Fraser
7db8ce94de Minor simplifications to connections. 2015-09-29 23:12:32 -07:00
Neil Fraser
3f8e586fe8 Use prototypes for primitive properties. 2015-09-12 19:31:22 -07:00
Neil Fraser
1b43699ae3 Use prototypes for Connection properties. 2015-09-12 18:44:14 -07:00
Neil Fraser
0478d308a6 Trivial cleanup. 2015-08-18 11:34:22 -07:00
Troy McKinnon
37a3c74aea add another type annotation 2015-07-27 14:18:43 -05:00
Neil Fraser
09f5ac6f7b Remove non-functioning workspace long-click. 2015-07-13 17:48:50 -07:00