From e19c1942c3fa81c9babf61960993817e7fa29fec Mon Sep 17 00:00:00 2001 From: Eric Rosenbaum Date: Tue, 13 Sep 2016 18:09:43 -0400 Subject: [PATCH] Merge remote-tracking branch 'LLK/develop' into develop # Conflicts: # src/index.js # src/sprites/clone.js # src/worker.js --- assets/scratch_cat.svg | 42 + assets/stage.png | Bin 0 -> 1346 bytes playground/index.html | 33 +- playground/playground.css | 36 +- playground/playground.js | 44 +- src/blocks/scratch3_control.js | 16 +- src/blocks/scratch3_event.js | 17 +- src/blocks/scratch3_looks.js | 131 +- src/blocks/scratch3_motion.js | 68 +- src/blocks/scratch3_operators.js | 30 +- src/blocks/scratch3_sensing.js | 33 +- src/engine/adapter.js | 12 +- src/engine/blocks.js | 35 +- src/engine/execute.js | 118 +- src/engine/runtime.js | 85 +- src/engine/thread.js | 6 + src/import/sb2import.js | 20 +- src/index.js | 182 +- src/io/keyboard.js | 25 +- src/io/mouse.js | 33 +- src/sprites/clone.js | 70 +- src/util/cast.js | 17 + src/util/color.js | 71 +- src/util/timer.js | 64 +- src/util/xml-escape.js | 21 + src/worker.js | 276 - test/unit/blocks.js | 61 + vm.js | 9658 ++++++++++++++++++++---------- vm.min.js | 12 +- vm.worker.js | 1169 ---- webpack.config.js | 3 +- 31 files changed, 7363 insertions(+), 5025 deletions(-) create mode 100644 assets/scratch_cat.svg create mode 100644 assets/stage.png create mode 100644 src/util/xml-escape.js delete mode 100644 src/worker.js delete mode 100644 vm.worker.js diff --git a/assets/scratch_cat.svg b/assets/scratch_cat.svg new file mode 100644 index 00000000..82345546 --- /dev/null +++ b/assets/scratch_cat.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/stage.png b/assets/stage.png new file mode 100644 index 0000000000000000000000000000000000000000..c60861c2bd315d6eaffdb9dfb632abb49e1102d4 GIT binary patch literal 1346 zcmeAS@N?(olHy`uVBq!ia0y~yV0-|?85~SN5r)wHmdKI;Vst00K&1Q~&?~ literal 0 HcmV?d00001 diff --git a/playground/index.html b/playground/index.html index 73182ec3..dacd4c4f 100644 --- a/playground/index.html +++ b/playground/index.html @@ -10,18 +10,21 @@

Scratch VM Playground

- - -

- Renderer
- VM Threads
- VM Block Representation
- Import/Export -

+
+ + +
+
+
- Render
- + Renderer
+
Thread explorer @@ -32,14 +35,14 @@

         
- Import/Export - -
+ Import/Export
+ Project ID: +

  -

+

@@ -751,7 +754,7 @@ - +