scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-27 08:22:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2456 commits 495 branches 1644 tags 1.4 GiB
Commit graph

2456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mx Corey Frang
236f914f55 delete clone should not stop sound (#1269) 2018-06-25 15:44:39 -04:00
Michael "Z" Goddard
0dffc65ce9 stop drum immediately if it is still starting (#1266) 2018-06-25 15:31:35 -04:00
kchadha
d187517d85
Merge pull request #1256 from kchadha/sprite-save-load 
Sprite save load
 2018-06-25 11:21:01 -04:00
Karishma Chadha
55a5592ab6 Add optional type param to export sprite API. 2018-06-25 09:23:04 -04:00
Karishma Chadha
f06b8a3943 Clean up calls to fixUpVariableReferences 2018-06-25 09:11:48 -04:00
Ray Schamp
e90b344b15
Merge pull request #1264 from LLK/unrevert-audio 
Re-apply audio engine updates
 2018-06-22 09:53:24 -04:00
Ray Schamp
96dd18cf44
Merge pull request #1263 from gnarf/fix-load-sounds-problems 
Fix sound issue
 2018-06-22 09:51:27 -04:00
Corey Frang
4431b43e45 A few leftover loadSound that werent updated 2018-06-22 09:45:23 -04:00
Ray Schamp
b5b24610c7
Merge pull request #1262 from rschamp/revert-audio 
Revert #1260, #1258, #1239
 2018-06-22 09:45:16 -04:00
Ray Schamp
9afe401dca Revert "Revert #1260, #1258, #1239" 
This reverts commit 28f90648b0.
 2018-06-22 09:33:08 -04:00
Ray Schamp
28f90648b0 Revert #1260, #1258, #1239 
This reverts commits
c268bbae47
61dacfc915
30b8cb8eb1
 2018-06-22 09:30:17 -04:00
Mx Corey Frang
ea3a23e37c
Fix before_deploy script to properly quote (#1261) 2018-06-21 17:53:45 -04:00
Michael "Z" Goddard
c268bbae47 add decoded SoundPlayer's to a Sprite's SoundBank (#1260) 2018-06-21 17:23:33 -04:00
Michael "Z" Goddard
30b8cb8eb1
Merge pull request #1239 from gnarf/soundbank 
Use new scratch-audio SoundBank in vm / sounds
 2018-06-21 17:14:27 -04:00
Corey Frang
14f8c44ad9 Stop all sounds by clones when disposed 2018-06-21 17:00:03 -04:00
Corey Frang
c087cf326a soundbank tests 2018-06-21 17:00:03 -04:00
Michael "Z" Goddard
61dacfc915
Merge pull request #1258 from mzgoddard/green-music-extension 
Use new scratch-audio APIs in music extension
 2018-06-21 16:59:42 -04:00
Michael "Z" Goddard
7e48bed0ab
use scratch-audio EffectChain and SoundPlayer in music extension 
- Use AudioEngine to decode sounds
- Store players instead of buffers
- Use SoundPlayer stop event to track concurrency
 2018-06-21 16:53:45 -04:00
Connor Hudson
befcbec393 Create extensions list in serialize function 
Removed runtime argument from serializeTarget call because it wasn't used
 2018-06-21 15:01:00 -04:00
Connor Hudson
026dd96491 Modify serializeTarget function to take an extension set as an argument 
This allows the serialize function to build a list of all extensions used
 2018-06-21 15:00:17 -04:00
Connor Hudson
17679340f9 Return extension ids from serializeBlocks instead of modifying Set passed to it 2018-06-20 15:42:56 -04:00
kchadha
39c27d82ef
Merge pull request #1248 from towerofnix/sprite-quad-fix 
Fix new sprites only showing up in the top-right quadrant
 2018-06-20 14:40:11 -04:00
Connor Hudson
15de2eaa68 Remove extension deserialization 2018-06-20 14:33:01 -04:00
Karishma Chadha
b40ac54fdd Remove stray newline. 2018-06-20 13:37:31 -04:00
Karishma Chadha
b75a779540 Call fixUpVariableReferences in installTargets, before emitting the workspace update. 2018-06-20 12:12:33 -04:00
Karishma Chadha
889443fcef fixUpVariableReferences should handle conflicting local variables that don't have blocks referencing them. Add unit tests for the function. 2018-06-20 12:07:42 -04:00
Karishma Chadha
073bb37c30 Add a test for 'getAllVariableAndListReferences' function. 2018-06-20 10:32:36 -04:00
chrisgarrity
f0951d16fa
Merge pull request #1246 from chrisgarrity/feature/translate-labels 
Localize category labels
 2018-06-20 08:33:44 -04:00
Connor Hudson
68215664ec Merge branch 'develop' into feature/extension-serialization 2018-06-19 17:01:13 -04:00
Karishma Chadha
9646e3d11e Refactor and move variable reference fixup function into target. 2018-06-19 15:31:08 -04:00
Karishma Chadha
f2aacbc79c Fix up variable references after deserializing a .sprite2 or .sprite3 to avoid conflicts with pre-existing variables. 2018-06-19 14:02:54 -04:00
Paul Kaplan
6e2af4f3cc
Merge pull request #1244 from paulkaplan/sharing-apis 
Add shareSound and shareCostume APIs with unit tests to the VM
 2018-06-19 11:31:00 -04:00
Karishma Chadha
5cc48b6ef3 Provide global vars to sb2 import when deserializing a single sprite. 2018-06-19 08:52:22 -04:00
Karishma Chadha
86a8d93eb6 Sprite3 Export/Import. 2018-06-19 08:51:16 -04:00
kchadha
b6b501f761
Merge pull request #1243 from LLK/greenkeeper/scratch-parser-4.2.0 
Update scratch-parser to the latest version 🚀
 2018-06-19 08:08:45 -04:00
Florrie
0527fcde64 Fix new sprites only showing up in the top-right quadrant 2018-06-18 17:20:59 -03:00
Connor Hudson
aa16930e34 Add initial implementation of extension serialization/deserialization 2018-06-18 15:00:33 -04:00
Evelyn Eastmond
d09c3f0418 MicroBit extension, Scratch Link first draft. (#1230) 
* First microbit gui tests

* Fixed JSONRPC inheritance.  Renamed ScratchBLE/ScratchBT files.  Removed ScratchBT test code from Microbit extension.  Renamed addLine to log.

* Fixed log comments.  Removed addLine from Microbit.

* Adding auto-connect to Microbit at extension loading.  Adding hack for displayText block to Scratch-Link.

* Resolved merge conflicts and brought in latest microbit extension example code.

* Updated microbit write tests for displayText and displaySymbol blocks.  Some linting.

* Some linting and adding of BLE Characteristic consts.

* Linting fixes.

* Moving micro:bit device connection code all to the MicroBit class, decoupling Scratch3MicroBitBlocks from connection code.

* Removing old disconenct handlers from MicroBit class.  Moved service into new BLEUUID data structure.

* Renamed _write to _send.  Moved all BLE encoding concerns to the _send method.

* Using the util log.  Some linting.

* Added _read method to MicroBit class.  Renamed _send to _write.

* Some linting and formatting comments.

* First pass at peripheral chooser pattern for ScratchBLE.

* Testing characteristicDidChange events, and some changes to ScratchBLE on ready events.

* Refactoring work on PeripheralChooser and ScratchBLE.

* Some variable renaming and method signature stubs.

* Peripheral chooser method signatures.

* Moved base64 encoding/decoding to util.  Some method signature formatting.

* Adding test stubs for new util and io classes.

* Adding test stub for MicroBit extension.

* Clean up for PR.

* Clean up for PR.

* Final cleanup for PR.

* Removed logging to console.

* Adding 'btoa' and 'atob' node modules and using them in Base64Util.
 2018-06-18 14:56:51 -04:00
Andrew Sliwinski
cda47fb3a7
Update TRADEMARK 2018-06-18 13:13:09 -04:00
chrisgarrity
1e3907e922 Localize category labels 
Added formatMessage to the name attribute for:
* music
* pen
* translate
* video motion

Skipped speak extension - trademarked name
Skipped extensions that are not yet localized at all.
 2018-06-18 11:37:10 -04:00
Paul Kaplan
1dcd174dea Add shareSound and shareCostume APIs with unit tests to the VM 2018-06-18 10:39:22 -04:00
greenkeeper[bot]
b1dacd4b59 fix(package): update scratch-parser to version 4.2.0 2018-06-18 13:49:58 +00:00
kchadha
da30abbfb5
Merge pull request #1240 from kchadha/block-comment-disappearing-bugfix 
Add comment id to block when converting from XML to vm representation.
 2018-06-15 17:36:48 -04:00
kchadha
35366d90d1
Merge pull request #1241 from kchadha/comment-serialization-dedupe 
Clean up comment serialization
 2018-06-15 16:14:07 -04:00
Karishma Chadha
f3d49f75c8 Clean up comment serialization, add tests for new and old serialization (old is still valid, just more verbose). 2018-06-15 14:57:49 -04:00
Karishma Chadha
76b423e481 Make sure to set comment property of block when creating a new block via XML using the adapter. Update unit tests. 2018-06-15 13:58:03 -04:00
kchadha
29b79878bc
Merge pull request #1236 from kchadha/comment-save-load 
Comment Save & Load
 2018-06-14 18:42:19 -04:00
Karishma Chadha
861d801d88 Add tests for comment save and load. 2018-06-14 16:58:03 -04:00
kchadha
529d271186
Merge pull request #1235 from kchadha/xml-escape-comments 
XML escape comment text.
 2018-06-14 14:46:02 -04:00
Karishma Chadha
e2eadbf603 Comment save and load. 2018-06-14 14:11:20 -04:00