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

999 commits

This branch
This branch
All branches
Author SHA1 Message Date
rachel-fenichel
442e35cf04 Merge pull request #127 from rachel-fenichel/feature/complicated_ghosts 
Reconnect blocks after a ghost disappears.
 2016-03-28 11:28:51 -07:00
rachel-fenichel
8c44d5f4fb Make tests work. 
We really need to have mocks for testing at this point.
 2016-03-28 11:27:44 -07:00
rachel-fenichel
9337dc694f Merge branch 'develop' into feature/complicated_ghosts 2016-03-28 11:24:00 -07:00
Katelyn Mann
b11bd4fb71 Remove Blockly.removeAllRanges and replace it with calls to add/remove 
css to mark text as unselectable instead.  I can't prove this is
significantly faster with numbers since the call to setup the time out
costs ~.1ms and the call when the timer fires is ~.05.  This happens on almost
every mouse event though.  Plus, it seems to remove a flicker of highlighting when
frames are skipped and keeps scrolling via the scrollbar from highlighting.
 2016-03-28 10:06:43 -07:00
Niklas Laxström
aef7720fc1 Localisation updates from https://translatewiki.net. 2016-03-28 10:06:29 +02:00
Neil Fraser
a4bba21bd7 Merge branch 'develop' 2016-03-27 02:21:14 -07:00
Neil Fraser
c1872750ae Fix recursive undo/redo loop in logic_compare and logic_ternary blocks. 2016-03-27 02:20:30 -07:00
Neil Fraser
e7fcc39e78 Remove redundant movable check from checkType. 2016-03-27 01:46:53 -07:00
Neil Fraser
b8d48ebabe Destroy attached shadow block when input is destroyed. 2016-03-26 19:37:12 -07:00
Neil Fraser
64dadc2482 Merge branch 'develop' 2016-03-25 19:04:23 -07:00
Neil Fraser
0626724277 Merge branch 'master' into develop 2016-03-25 19:03:37 -07:00
Neil Fraser
05fc1ad91b Add workspace.clearUndo 2016-03-25 19:03:18 -07:00
Neil Fraser
db980dbf94 Merge branch 'develop' 2016-03-24 21:32:02 -07:00
Neil Fraser
65a25ffb7e Don't offer to cleanup blocks in non-scrolling workspace. 2016-03-24 21:31:13 -07:00
Neil Fraser
4585e21d9f Allow checkmark customization. 
Issue 295.
 2016-03-24 17:18:21 -07:00
Neil Fraser
ad37d69af9 Merge branch 'master' into develop 2016-03-24 16:57:11 -07:00
Neil Fraser
a2176e43d9 Merge pull request #298 from google/develop 
Undo/Redo
 2016-03-24 16:56:58 -07:00
Neil Fraser
82fdb5805b Fix leaky group. Recompile. 2016-03-24 16:54:53 -07:00
Neil Fraser
e0ebce1b60 Fix undoing function argument changes. 2016-03-24 15:30:29 -07:00
rachel-fenichel
8401d91071 Fix bugs with first in stack, again 2016-03-22 17:12:00 -04:00
Neil Fraser
39fbd24659 Remove setProcedureParameters from API (use domToMutation instead). 2016-03-22 10:48:13 -07:00
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
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
cd3b563e54 Merge pull request #292 from rachel-fenichel/cleanup/constants 
Move constants to their own file
 2016-03-18 14:36:17 -07:00
rachel-fenichel
b37efe829e Move constants to their own file 2016-03-18 14:35:18 -07:00
Neil Fraser
a7892d1aee Raise error if statement block returns tuple. 2016-03-18 14:17:31 -07:00
rachel-fenichel
26d3b2392c Merge pull request #129 from rachel-fenichel/bugfix/closest_ghost 
Don't consider ghosts when looking for the closest connection.
 2016-03-18 14:14:40 -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
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
Neil Fraser
6ae436a153 Add undo/redo context menu options on workspace. 2016-03-17 14:44:26 -07:00
Neil Fraser
a7d181a58a Merge branch 'master' into develop 2016-03-17 13:38:13 -07:00
Niklas Laxström
702dbc36b9 Localisation updates from https://translatewiki.net. 2016-03-17 08:44:28 +01:00
Neil Fraser
0b5338b707 Simplify function statement toggle reconnection. 2016-03-16 23:11:55 -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
Neil Fraser
2b96d7a756 Don't select blocks if readOnly is changed. 2016-03-16 19:10:36 -07:00
Neil Fraser
3bf04aedc6 Add toJson to events. 2016-03-16 17:55:44 -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
cae688ee7d Merge pull request #123 from tmickel/upstream-march-15 
Upstream merge March 15 & remove Lua generators
 2016-03-16 10:58:31 -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
rachel-fenichel
dd57be8ed3 Don't fire events for ghost blocks. 2016-03-15 15:35:19 -07:00