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

2622 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
e44df6378b
Merge pull request #1277 from rschamp/fix-travis 
Remove cache from Travis, begin using npm ci
 2018-06-28 16:36:47 -04:00
Ray Schamp
bc7428ed07 Use production=false during install 
Otherwise dev dependency bins aren't present
 2018-06-28 11:22:35 -04:00
Ray Schamp
a8fd1f9c38 Set up package-lock support for greenkeeper 2018-06-28 10:52:04 -04:00
Ray Schamp
755cdd98e5 Remove cache from Travis, begin using npm ci 
We have thought about moving to use package-lock.json the way NPM suggests, and at the same time have begun having issues with Travis caches. To address both at the same time, remove the cache from Travis, and make up the time by moving to package-lock.json + npm ci for install.
 2018-06-28 10:52:04 -04:00
Andrew Sliwinski
c3a3dd8ad5
Merge pull request #1276 from thisandagain/bugfix/1275 
Update colors for extensions
 2018-06-28 10:26:18 -04:00
Andrew Sliwinski
840510c733 Update colors for extensions. Resolves GH-1275 2018-06-27 18:10:51 -04:00
Paul Kaplan
c3386ad84d
Merge pull request #1254 from paulkaplan/fix-undefined-block-parsing 
Skip unknown opcode blocks while parsing
 2018-06-27 17:01:00 -04:00
Karishma Chadha
92dfebdae6 Add variables from var_create events to appropriate target based on isLocal flag. 2018-06-27 16:32:10 -04:00
Eric Rosenbaum
aa400ea15b
Show extension status button via XML attr not button (#1270) 2018-06-27 15:53:18 -04:00
Paul Kaplan
0e3413e6bd Fix comment 2018-06-27 14:17:33 -04:00
Paul Kaplan
4967155285 Fix nits 2018-06-27 10:44:28 -04:00
Paul Kaplan
9f517bd483 Deal with comments attached to undefined blocks 
Also fix an issue where you couldn't save/load projects that had multiple comments linked to a single block.
 2018-06-26 16:41:10 -04:00
Paul Kaplan
e7e300caeb Skip unknown opcode blocks while parsing 2018-06-26 15:58:43 -04:00
Connor Hudson
326c41875e
Merge pull request #1255 from technoboy10/feature/extension-serialization 
Serialize extensions used in a project
 2018-06-26 09:49:19 -04:00
Connor Hudson
0bed25e01b Merge develop into feature/extension-serialization 2018-06-26 08:56:42 -04:00
greenkeeper[bot]
34fd7a1741 chore(package): update eslint to version 5.0.1 
Closes #1267
 2018-06-26 09:05:57 +00:00
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