scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-25 15:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
855 commits 495 branches 1642 tags 1.4 GiB
Commit graph

855 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christopher Willis-Ford
9d306962bd Fix socket.io-client dependency problems re: build 
The Socket.io client library pulls in some extra dependencies in a way
that isn't fully compatible with Webpack. Switching to their build
output file, instead of the file specified in their `package.json`,
makes those errors go away.
 2017-05-11 12:07:46 -07: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
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
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
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
Rasmus Haglund
b693d4f4ef Fix rounded get size reporting 2017-04-08 19:35:29 +02:00
SillyInventor
da6ce9182d Added testing to rendered-target 
Added a fake renderer with known predictable output
Added testing for most if not all functions
 2017-04-07 14:50:13 -04:00
Eric Rosenbaum
092084cc6b Merge pull request #513 from ericrosenbaum/feature/loudness 
Add loudness block
 2017-04-07 14:06:18 -04:00
Chris Willis-Ford
44623db5e3 Merge pull request #522 from presight/develop 
Fix so that size is set in float to ensure backward compatibility with Scratch 2.0
 2017-04-06 14:55:08 -07:00
Paul Kaplan
aa2e255add Merge pull request #526 from paulkaplan/report-sound-costume-data 
Report sound costume data
 2017-04-06 11:45:50 -04:00
Paul Kaplan
80e8003fb2 Add tests for rendered target 2017-04-06 09:46:40 -04:00
Paul Kaplan
8e84b2757e Report costume and sound data in sprite json 2017-04-06 09:37:39 -04:00
Chris Willis-Ford
79bf68aa61 Merge pull request #524 from rasmushaglund/fix-import-export 
Fixed xml import/export in Playground
 2017-04-05 16:09:57 -07:00
spenen
41082a76cd Fixed xml import/export in Playground 2017-04-05 20:23:16 +02:00
spenen
0f0292320b Added size to playground render info 2017-04-05 18:51:16 +02:00
spenen
8c7097f724 Fix #521 so that size is set in float to ensure backward compatibility with Scratch 2.0 2017-04-05 13:46:42 +02:00
Paul Kaplan
771f18e23b Merge pull request #516 from paulkaplan/add-sound-public-api 
Expose VM#addSound publicly
 2017-04-04 09:05:45 -04:00
Paul Kaplan
2d6eaae01e Update jsdoc 2017-04-03 16:00:58 -04:00