scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-26 07:52:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
1227 commits 496 branches 1642 tags 1.4 GiB
Commit graph

1227 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
6fba4c61e3 Merge pull request #474 from LLK/greenkeeper/expose-loader-0.7.3 
chore(package): update expose-loader to version 0.7.3
 2017-02-20 16:45:05 -05:00
Ray Schamp
47953ab58f Merge pull request #475 from LLK/greenkeeper/webpack-dev-server-2.4.1 
chore(package): update webpack-dev-server to version 2.4.1
 2017-02-20 16:44:45 -05:00
Ray Schamp
bee8c8d50d Merge pull request #473 from LLK/greenkeeper/eslint-3.16.0 
Update eslint to the latest version 🚀
 2017-02-20 16:25:21 -05:00
Ray Schamp
feaec81d9d Merge pull request #469 from LLK/greenkeeper/tap-10.2.0 
Update tap to the latest version 🚀
 2017-02-20 16:24:35 -05:00
greenkeeper[bot]
867d3c79f5 chore(package): update eslint to version 3.16.0 
https://greenkeeper.io/
 2017-02-20 16:37:01 +00:00
griffpatch
c5eb8ece16 Handle actual looping cases 
And it starts to get a little less elegant :/
Wondering if this should not be handled better in another part of the
codebase?
We don't want to be duplicating existing code stepping functionality
locally at the end of the promise script really... What do you think?
 2017-02-20 09:40:32 +00:00
griffpatch
362a231279 bug - escape from conditional branches 
Execution bug: can't escape from conditional branches that end with a
Promise-resolution-terminating command block (see #464)
 2017-02-20 08:20:21 +00:00
griffpatch
682dec493f Merge remote-tracking branch 'refs/remotes/LLK/develop' into bug/escapeFromConditionalBranches 2017-02-20 08:16:41 +00:00
greenkeeper[bot]
0118a19cd5 chore(package): update webpack-dev-server to version 2.4.1 
Closes #470

https://greenkeeper.io/
 2017-02-19 22:15:28 +00:00
greenkeeper[bot]
d7bff34a66 chore(package): update tap to version 10.2.0 
https://greenkeeper.io/
 2017-02-19 01:19:16 +00:00
Andrew Sliwinski
401fd78fd0 Merge pull request #463 from CSnap/sequencerTesting 
Adding Sequencer Unit Tests
 2017-02-18 10:24:52 -05:00
Andrew Sliwinski
c9f656f79e Merge pull request #465 from LLK/greenkeeper/tap-10.1.2 
Update tap to the latest version 🚀
 2017-02-18 10:15:27 -05:00
greenkeeper[bot]
9f364b93eb chore(package): update tap to version 10.1.2 
https://greenkeeper.io/
 2017-02-18 02:13:29 +00:00
Chris Willis-Ford
ddee4186b8 Merge pull request #460 from cwillisf/update-readme-playground 
Update playground paths in README.md
 2017-02-17 15:25:42 -08:00
Chris Willis-Ford
1671cbe1b0 Merge pull request #457 from cwillisf/fix-cachalot 
Match Scratch 2.0 order of execution
 2017-02-16 12:59:48 -08:00
SillyInventor
2fc2ee2c4b Adding sequencer unit tests for each function 2017-02-16 14:30:00 -05:00
griffpatch
a141bfb1b9 Fix lint issues 2017-02-16 10:54:17 +00:00
griffpatch
b9ebf92d68 Merge remote-tracking branch 'refs/remotes/LLK/develop' into optimise/reduceGetBlockCalls 2017-02-16 09:57:28 +00:00
Christopher Willis-Ford
af77098161 Update playground paths in README.md 
A recent change moved the location of the playground source files and
the URL used to access the playground when running the dev server. This
change updates README.md to reflect the new locations.
 2017-02-15 15:31:20 -08:00
griffpatch
7bc141e76e Feature Fencing 
This is a re-comit after the previous pull was reverted.
 2017-02-15 15:59:54 +00:00
griffpatch
61d1872642 Merge remote-tracking branch 'refs/remotes/LLK/develop' into develop 2017-02-15 15:51:10 +00:00
Ray Schamp
b4c98d30c6 Merge pull request #458 from LLK/revert-452-feature/fencing 
Revert "Feature fencing"
 2017-02-15 09:44:34 -05:00
Ray Schamp
39158c9d48 Revert "Feature fencing" 2017-02-15 09:40:10 -05:00
griffpatch
a2c43a80ab Merge remote-tracking branch 'refs/remotes/LLK/develop' into develop 2017-02-15 08:50:03 +00:00
Andrew Sliwinski
74f7c4f5b1 Merge pull request #456 from LLK/greenkeeper/tap-10.1.1 
Update tap to the latest version 🚀
 2017-02-14 21:00:21 -05:00
Chris Willis-Ford
ad4fe785a7 Merge pull request #452 from griffpatch/feature/fencing 
Feature fencing
 2017-02-14 16:55:38 -08:00
Christopher Willis-Ford
3b3daf8aca Add hat execution order test 2017-02-14 16:33:42 -08:00
greenkeeper[bot]
fba054cc68 chore(package): update tap to version 10.1.1 
https://greenkeeper.io/
 2017-02-14 19:26:13 +00:00
greenkeeper[bot]
a69950add4 chore(package): update expose-loader to version 0.7.3 
Closes #454

https://greenkeeper.io/
 2017-02-14 18:57:35 +00:00
griffpatch
75e3f6002b Fencing - Take 3 
Dependant on scratch-render pull request.
 2017-02-14 09:12:35 +00:00
Christopher Willis-Ford
18107cde7b Reverse target iteration in allScriptsDo 
The `allStacksAndOwnersDo` function in Scratch 2.0 runtime iterates
targets in reverse and projects sometimes rely on that for correct
initialization. If, for example, each sprite runs a "go back 999 layers"
or "go to front" block as its first action, the order of execution will
determine the ordering of the layers.

This change makes Scratch 3.0 match the Scratch 2.0 execution order.
 2017-02-13 14:45:29 -08:00
Christopher Willis-Ford
bd76395676 Minor cleanup around cloning methods 2017-02-13 14:44:51 -08:00
griffpatch
75a1542fc3 Merge remote-tracking branch 'refs/remotes/origin/develop' into optimise/reduceGetBlockCalls 2017-02-11 15:39:33 +00:00
griffpatch
1cb35c6ef1 Merge remote-tracking branch 'refs/remotes/LLK/develop' into develop 2017-02-11 15:39:00 +00:00
griffpatch
9aa81d6776 Merge remote-tracking branch 'refs/remotes/LLK/develop' into feature/fencing 2017-02-11 14:30:59 +00:00
griffpatch
4d63dcac3b Rename fencing method 2017-02-11 14:30:18 +00:00
griffpatch
ea59f8cd66 Reduce calls to getBlock 2017-02-11 14:26:23 +00:00
Chris Willis-Ford
6038722a79 Merge pull request #451 from cwillisf/cleaner-playground 
Use Webpack to generate the whole playground
 2017-02-10 16:11:02 -08:00
Christopher Willis-Ford
243d68f88b Use Webpack to generate the whole playground 
The previous configuration mixed Webpack output with static content in
order to create the playground. This change moves that static content
from `/playground/` into `/src/playground/` and adds a Webpack rule to
copy it into the playground as part of the build.

On the surface this might seem unnecessary, but it provides at least two
benefits:
- It's no longer possible to accidentally load stale build output
  through `webpack-dev-server` in the event of a misconfiguration. This
  was very easy in the previous configuration, and might in fact be the
  only way that `webpack-dev-server` ever worked for this repository.
- It's simpler to ensure that various rules apply to the hand-authored
  content and not build outputs. This includes lint rules, `.gitignore`,
  IDE symbol search paths, etc.
 2017-02-10 14:21:37 -08:00
Eric Rosenbaum
99be466aa7 Merge pull request #444 from ericrosenbaum/bugfix/playnote-volume 
Pass volume to audioengine playnote
 2017-02-10 14:09:55 -05:00
Ray Schamp
fb181d5ce3 Merge pull request #447 from CSnap/fix_keyPressToUpperCase 
Switch From Return Null to Return Empty String in keyCodeToScratchKey
 2017-02-10 14:00:50 -05:00
Andrew Sliwinski
57514f6f12 Merge pull request #449 from CSnap/threadTesting 
Added Remaining Thread Tests
 2017-02-10 13:17:14 -05:00
SillyInventor
e8949dcdf5 Added remaining tests 2017-02-10 13:06:39 -05:00
Andrew Sliwinski
36423a2eee Merge pull request #445 from CSnap/threadTesting 
Added some unit tests for some thread functions
 2017-02-10 08:49:37 -05:00
Andrew Sliwinski
01abda152e Merge pull request #438 from griffpatch/bug/WhiteSpaceEqualsZero 
Fix for the "Empty or white space strings equal 0" bug
 2017-02-10 08:30:53 -05:00
griffpatch
3f79712fb1 Merge remote-tracking branch 'refs/remotes/LLK/develop' into develop 2017-02-10 08:18:47 +00:00
griffpatch
246ff28363 Merge remote-tracking branch 'refs/remotes/LLK/develop' into bug/WhiteSpaceEqualsZero 2017-02-10 08:02:43 +00:00
griffpatch
ad5bc1afbd Pull white space checks into function 
Clean up code by pulling white space checks into a seperate helper
function
 2017-02-10 08:02:11 +00:00
griffpatch
338b2f3458 Merge remote-tracking branch 'refs/remotes/LLK/develop' into bug/WhiteSpaceEqualsZero 2017-02-10 07:43:44 +00:00
Magmaboat
85eee4f18e Perform hasOwnProperty validation 2017-02-09 21:12:47 -05:00