Commit graph

868 commits

Author SHA1 Message Date
DD Liu
2a7f3edda6 Fix some issues: 1. Monitors not running anymore if you change categories 2. Visual reports not showing 3. threads acquiring properties of old thread when restarting thread 2017-05-11 17:12:19 -04:00
DD Liu
6b774c58f5 Update some comments 2017-05-11 15:23:11 -04:00
DD Liu
7841d44ccf Move the block.isMonitored below the block is undefined check 2017-05-11 10:33:46 -04:00
DD Liu
1ea69dd504 Rename functions to be less wordy 2017-05-11 10:20:33 -04:00
DD Liu
b2e0a632e3 add add monitor action 2017-05-10 17:00:08 -04:00
DD Liu
b1355c6b0b Fire remove monitors VM event 2017-05-10 15:47:06 -04:00
DD Liu
138b4631e1 Merge branch 'develop' into updateMonitorsAction 2017-05-10 14:21:31 -04:00
DD Liu
4687fe41fe don't show green flag when monitor running 2017-05-10 14:06:02 -04:00
DD Liu
777d1f3824 add comment to monitor block listener filtering of events 2017-05-10 11:27:55 -04:00
DD Liu
4045ae7338 Merge pull request #558 from fsih/monitors
Will run blocks with boxes checked next to them once per frame in the playground, once the code to emit checkbox events is in scratch-blocks
2017-05-10 11:27:17 -04:00
DD Liu
97bfc90351 add comment to monitor block listener filtering of events 2017-05-10 11:22:03 -04:00
DD Liu
4ae1321252 indicate show visual report or update monitor on the thread 2017-05-09 17:34:13 -04:00
DD Liu
35a208d1d3 make it possible for VM to emit update monitors action 2017-05-09 12:10:11 -04:00
DD Liu
26a5098347 don't show visual report when monitor is running 2017-05-08 16:51:45 -04:00
DD Liu
706e112082 Add a block container for monitors that will run in the sequencer 2017-05-08 15:45:55 -04:00
Chris Willis-Ford
5f7eb923bd Merge pull request #555 from rasmushaglund/clone-fix3
Copy _customState for now until blocks have init functions
2017-05-08 10:19:27 -07:00
Rasmus Haglund
d0f1b77209 Copy _customState for now until blocks have init functions 2017-05-05 21:58:18 +02:00
Chris Willis-Ford
75a9ad4675 Merge pull request #551 from cwillisf/minor-pin-scratch
Minor-pin all Scratch 3.0 prerelease modules
2017-05-03 11:27:12 -07:00
Christopher Willis-Ford
44ae4fed54 Minor-pin all Scratch 3.0 prerelease modules
Pin these modules to 0.*-prerelease.* to avoid problems when we
eventually bump to 1.x
2017-05-01 15:24:07 -07:00
Paul Kaplan
9fce03b16f Merge pull request #547 from paulkaplan/fix-add-sprite-refresh
Fix sprite not drawing after being added
2017-04-27 12:39:59 -04:00
Paul Kaplan
c891268672 Fix sprite not drawing after being added 2017-04-27 11:10:22 -04:00
Ray Schamp
b5f5c3592a Merge pull request #539 from rschamp/root-es6
Use ES6 linting rules in the project root
2017-04-26 10:08:06 -04:00
Ray Schamp
bafdf8d9f2 Use ES6 linting rules in the project root
Update all tests for `no-var` and `prefer-arrow-callback` (using `--fix`)
2017-04-24 15:37:58 -04:00
Ray Schamp
5f59d1e7e5 Merge pull request #544 from LLK/greenkeeper/babel-loader-7.0.0
Update babel-loader to the latest version 🚀
2017-04-24 12:33:52 -04:00
Ray Schamp
83ae96b51b Merge pull request #542 from a49594a/patch-1
Fix missing right quote marks in `blockToXML`
2017-04-24 12:23:55 -04:00
Andrew Sliwinski
8dc94391b0 Merge pull request #527 from CSnap/add_testing
Added testing to rendered-target
2017-04-24 10:15:55 -04:00
SillyInventor
a158db8aff Implemented Proposed Fixes
Moved 'fake renderer' to fixtures
Fixed spacing after ()
Removed extra line break
2017-04-24 10:04:06 -04:00
Chris Willis-Ford
b1df6c0bd6 Merge pull request #541 from cwillisf/storage-internal-constants
Get `Asset` and `AssetType` from storage instance
2017-04-21 13:39:52 -07:00
greenkeeper[bot]
1cb4c33178 chore(package): update babel-loader to version 7.0.0
https://greenkeeper.io/
2017-04-21 20:25:30 +00:00
john
e91865fc21 the right quots is mission in blockToXML
the right quote is mission in blockToXML, and it will result in the following code execution errors

        vm.on('workspaceUpdate', function (data) {
            workspace.clear();
            var dom = Blockly.Xml.textToDom(data.xml);
            Blockly.Xml.domToWorkspace(dom, workspace);
        });
2017-04-21 16:36:33 +08:00
Ray Schamp
a1c1e8f7ba Merge pull request #540 from LLK/greenkeeper/webpack-2.4.1
chore(package): update webpack to version 2.4.1
2017-04-20 19:29:39 -04:00
greenkeeper[bot]
306e62b8b1 chore(package): update webpack to version 2.4.1
Closes #509

https://greenkeeper.io/
2017-04-20 19:26:03 -04:00
Christopher Willis-Ford
c750f53c81 Get Asset and AssetType from storage instance 2017-04-20 16:12:17 -07:00
Ray Schamp
f8c898fc43 Merge pull request #534 from rschamp/es6
Use ES6, convert to ES6-style classes
2017-04-20 17:06:29 -04:00
Ray Schamp
9c34b692c0 Fix ES6 lint after merge 2017-04-19 17:54:52 -04:00
Ray Schamp
e96807b399 Merge branch 'develop' of https://github.com/LLK/scratch-vm into es6
# Conflicts:
#	src/import/sb2import.js
#	src/virtual-machine.js
#	webpack.config.js
2017-04-19 17:54:31 -04:00
Ray Schamp
d2343e3601 Fix up some auto-converted weirdness 2017-04-19 17:36:33 -04:00
Chris Willis-Ford
204aa65a71 Merge pull request #529 from cwillisf/standardize-settings
Standardize repository settings
2017-04-19 09:51:53 -07:00
Paul Kaplan
8a4c3af18a Merge pull request #535 from paulkaplan/isolate-import
Separate downloading from installation of sprite info
2017-04-19 11:40:30 -04:00
Paul Kaplan
4b5e7a57a5 Fix binding issues 2017-04-19 08:53:07 -04:00
Paul Kaplan
f161640876 Update tests 2017-04-18 11:55:38 -04:00
Paul Kaplan
d86fe6a075 Do not add targets to runtime until they are fully loaded 2017-04-18 09:27:58 -04:00
Ray Schamp
7dc9fad41e Update to Node 6 LTS 2017-04-17 20:03:28 -04:00
Ray Schamp
9be29439b1 Fix webpack for ES6 2017-04-17 19:55:34 -04:00
Ray Schamp
a4f095db5e Use ES6 style classes 2017-04-17 19:42:48 -04:00
Ray Schamp
4455b0694f Fix remaining no-var and no-use-before-define's 2017-04-17 17:15:19 -04:00
Ray Schamp
e01c4ae108 Pass with --fix 2017-04-17 15:10:04 -04:00
Ray Schamp
f646a61c5b Use es6 lint rules 2017-04-17 15:09:57 -04:00
Christopher Willis-Ford
0402b7ed8e Standardize repository settings
Set dev tool to `cheap-module-source-map`.
2017-04-11 11:38:58 -04:00
Chris Willis-Ford
0bcc33cf4c Merge pull request #528 from rasmushaglund/fix-rounded-get-size
Fix rounded get size reporting
2017-04-10 10:42:11 -07:00