scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 15:02:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
966 commits 496 branches 1639 tags 1.4 GiB
Commit graph

966 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
635b40ec2b Log parsing errors 2017-05-11 02:22:12 -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
Christopher Willis-Ford
35d0544ce0 Respond to review comments 
- Pin `got` and `socket-io.client`
- Finish removing `removeSocket`-related code
 2017-05-05 10:37:29 -07:00
Ray Schamp
baee9a2793 Don't clean costume and sound lists 
They are already clean, since we don't store the data on them any more.
 2017-05-04 13:03:42 -04:00
Ray Schamp
efe31f4825 Fix costume deserialization 2017-05-04 12:41:54 -04:00
Ray Schamp
2181e51c38 Don't store costume data uris on costumes 2017-05-04 12:29:28 -04:00
Ray Schamp
c5cf6d9b40 Use asset id reference on sounds 2017-05-04 12:29:10 -04:00
Christopher Willis-Ford
e096f43487 DeviceManager: add more jsdoc, remove _sockets 
It turns out we don't need the Device Manager to centrally track each
socket, so this change removes the Device Manager's `_sockets` property
and related code.
 2017-05-03 16:28:06 -07: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
Christopher Willis-Ford
96c74867b5 Remove test for canceling a search 
When no Device Manager instance is present this test takes a long time
and can cause timeouts. We'll need to fake the HTTP requests if we want
to do this sort of test reliably.
 2017-04-28 15:06:42 -07:00
Christopher Willis-Ford
9a9c509e76 Implement a few tests for io/deviceManager 2017-04-28 14:50:57 -07:00
Christopher Willis-Ford
f3c6be2881 Add an I/O device to represent the Device Manager 2017-04-28 13:40:13 -07:00
Ray Schamp
4f59e98bc8 Merge branch 'develop' of https://github.com/LLK/scratch-vm into feature/serialization 
# Conflicts:
#	src/virtual-machine.js
 2017-04-27 17:53:30 -04:00
Ray Schamp
f785117e1d Lint and fix failing tests 2017-04-27 17:49:57 -04:00
Ray Schamp
c9ce6776aa Get SB3 imports working 
For now, store the md5 + extension on costumes in the VM. This way we can load them the same way as we load SB2 assets.
 2017-04-27 17:08:06 -04: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
b2ea201707 Don't include asset data in exported JSON 2017-04-26 17:45:36 -04:00
Ray Schamp
2a4af8a9ca Fix up most linting/merge errors 2017-04-26 16:50:53 -04:00
Ray Schamp
a4cdb027ab Merge branch 'develop' of github.com:morantsur/scratch-vm into feature/serialization 
# Conflicts:
#	src/playground/index.html
#	src/serialization/sb2.js
#	src/sprites/rendered-target.js
#	src/virtual-machine.js
#	test/unit/serialization_sb2.js
 2017-04-26 11:44:53 -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