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

502 commits

Author SHA1 Message Date
rachel-fenichel
acae0e57ae C blocks consume other blocks. 2016-03-22 13:03:56 -04:00
rachel-fenichel
0178c4a259 revert bad logic 2016-03-22 13:03:47 -04:00
rachel-fenichel
4110635e18 Fix ghost block flashing 2016-03-21 17:13:49 -04:00
rachel-fenichel
1d5d89f9df Always disconnect the ghost. 2016-03-21 16:57:39 -04:00
rachel-fenichel
9758d50576 Merge branch 'develop' into feature/complicated_ghosts 2016-03-18 17:01:39 -07:00
rachel-fenichel
88a3d15518 Merge pull request #126 from rachel-fenichel/feature/no_ghost_events 
Don't fire events for ghost blocks.
 2016-03-18 13:51:59 -07:00
rachel-fenichel
60677297cf reuse ghost block instead of recreating 2016-03-16 14:45:17 -07:00
rachel-fenichel
eb45586c48 lint 2016-03-16 12:05:36 -07:00
rachel-fenichel
19bc2244b8 Correctly handle ghosts at the beginning of a stack 2016-03-16 12:01:43 -07:00
Rachel Fenichel
1d2f712456 WIP on ghosts for pants blocks 2016-03-16 11:12:30 -07:00
Rachel Fenichel
2103dd4ce2 Ghosts for pants block; conforms to blockly-style insertion rules. 2016-03-16 11:12:30 -07:00
Rachel Fenichel
2d2aca5d48 complicated ghosts 2016-03-16 11:12:30 -07:00
rachel-fenichel
dd57be8ed3 Don't fire events for ghost blocks. 2016-03-15 15:35:19 -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
Tim Mickel
210fd0d339 Merge pull request #113 from tmickel/feature/running-glows 
Glows on running blocks and (partially) stacks
 2016-03-15 10:18:15 -04:00
Neil Fraser
95fbc0bb49 Fix checkbox events. Fix block deletion while mutator is open. 2016-03-14 23:14:58 -07:00
Neil Fraser
72bb08a4ec Add undo/redo. 
Some bugs in undoing function argument changes.
 2016-03-14 23:14:05 -07:00
Neil Fraser
8fb1178ed8 Update message descriptions. 2016-03-14 16:00:25 -07:00
rachel-fenichel
7b77527d57 Merge pull request #284 from rachel-fenichel/feature/last_in_stack 
consider the last block on the stack when looking for places to attac…
 2016-03-14 13:29:11 -07:00
rachel-fenichel
74ea1f1ffe consider the last block on the stack when looking for places to attach a dragging stack. 2016-03-11 18:07:26 -08: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
Neil Fraser
06ff90bcaf Merge pull request #274 from picklesrus/bbox-develop 
Replace the call to getBBox() in getMainWorkspaceMetrics
 2016-03-11 14:24:01 -08:00
Neil Fraser
580ff24a2a Merge pull request #280 from rachel-fenichel/bugfix/fix_requires 
Require ConnectionDB where needed; recompile
 2016-03-11 14:09:16 -08:00
rachel-fenichel
50975170d7 Fix search for closest 2016-03-11 13:13:34 -08:00
rachel-fenichel
f978826f77 Require ConnectionDB where needed; recompile 2016-03-11 12:16:25 -08:00
Tim Mickel
b6ed46a9f7 Throw an exception for non-existing blocks in glowBlock 2016-03-11 13:27:20 -05: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
55784580e9 Group mutations into same event. 2016-03-06 18:32:20 -08:00
Neil Fraser
02d60a2dbe Group variable rename into same event. 2016-03-06 14:51:03 -08:00
Rachel Fenichel
5af8a2c8c4 snap to start of preexisting stack. 2016-03-04 14:52:37 -08:00
Tim Mickel
f2fb5d5aa4 Add SVG filter for glowing stack 2016-03-04 12:22:14 -05:00
Tim Mickel
c48c2234fb Add glowBlock method to WorkspaceSvg 2016-03-04 10:27:57 -05:00
Tim Mickel
348564cd76 Add glow property to block_svg and set colour 2016-03-04 10:21:10 -05:00
Neil Fraser
65af8e58d4 Merge branch 'master' into develop 2016-03-03 17:49:09 -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
39520b9f5e Add comment about iconX positioning 2016-03-03 18:15:01 -05:00
Tim Mickel
c85dbca3a6 Fix connections' XY in RTL 2016-03-03 17:45:15 -05:00
Tim Mickel
bd71d47bfd Flip value input X in RTL 2016-03-03 17:37:03 -05:00
Tim Mickel
470d10af10 Add RTL icon positioning and flip property 2016-03-03 17:32:22 -05:00
Tim Mickel
6eb905716f Fix horizontal RTL flyout positioning 
this.width_ offset was unnecessary and breaking things, because it was only calculated after the first reflow.
 2016-03-03 17:06:50 -05:00
rachel-fenichel
abd1b5c5b8 Merge pull request #266 from rachel-fenichel/feature/connection_db_testing 
Connection db testing
 2016-03-03 11:40:26 -08:00
Tim Mickel
4ba1f8143a Remove block_render_svg 2016-03-03 11:57:57 -05: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
Tim Mickel
2d35713e2a Handle nextConnection separately from endHat, fixing corner 2016-03-02 21:05:27 -05:00
Tim Mickel
f71e49ff76 Remove special rounding for endHats #96 2016-03-02 20:52:27 -05:00
Rachel Fenichel
76871c54e3 remove unused var 2016-03-02 11:25:09 -08:00
Neil Fraser
5097963cb1 Reduce code duplication in 'if' block. 2016-03-01 18:21:02 -08:00
Rachel Fenichel
6e30464108 ghost blocks on insertion on a previous connection 2016-03-01 16:48:48 -08:00
Rachel Fenichel
391e449c9c Merge branch 'develop' into feature/ghost_blocks 2016-03-01 15:18:49 -08:00