Commit graph

1155 commits

Author SHA1 Message Date
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
SillyInventor
3324f51193 Added some unit tests for some thread functions 2017-02-09 18:18:53 -05:00
Ray Schamp
292a930aa7 Merge pull request #429 from LLK/greenkeeper/webpack-dev-server-2.3.0
Update webpack-dev-server to the latest version 🚀
2017-02-09 16:30:05 -05:00
Eric Rosenbaum
cd750b5dda pass volume to audioengine playnote 2017-02-09 14:52:15 -05:00
SillyInventor
8354774fcf Switch from return null to return empty string in keyCodeToScratchKey 2017-02-09 14:09:01 -05:00
Chris Willis-Ford
cde9ebd6bf Merge pull request #442 from griffpatch/bug/PenColorOpacity
Bug pen opacity reset
2017-02-09 07:53:15 -08:00
morant
19275799df Load md5 information from sounds 2017-02-09 10:44:28 -05:00
Andrew Sliwinski
4bb5f30bd8 Merge pull request #410 from griffpatch/optimisation/only-check-for-compatability-once
Optimisation - Only check browser compatability once
2017-02-09 08:17:51 -05:00
Andrew Sliwinski
d650e5393e Merge pull request #439 from griffpatch/bug/StopThisScript
Implement "Stop this script" function
2017-02-09 08:10:00 -05:00
griffpatch
464722f7bd Feature - Fencing of sprites
This change requires that the pull request for scratch-render (Feature
fencing #82) be taken first
2017-02-09 10:02:45 +00:00
griffpatch
d740698e25 Merge remote-tracking branch 'refs/remotes/LLK/develop' into feature/fencing 2017-02-09 08:54:28 +00:00
griffpatch
a6c56a6e20 Merge remote-tracking branch 'refs/remotes/LLK/develop' into bug/PenColorOpacity 2017-02-09 08:51:10 +00:00
griffpatch
2ba177aa0f Bug - Return pen opacity to opaque
When setting the pen color using pen blocks, the opacity should be reset
to fully opaque if no alpha is supplied.
2017-02-09 08:50:37 +00:00
Ray Schamp
45f39c2ebd Merge pull request #440 from griffpatch/bug/CaseInsensitiveBroadcast
Bug caseinsensitivebroadcast
2017-02-08 10:28:02 -05:00
Ray Schamp
5ac63caccf Merge pull request #437 from LLK/greenkeeper/tap-10.1.0
Update tap to the latest version 🚀
2017-02-08 09:38:01 -05:00
griffpatch
276ae82769 Fixes Case Insensitive Broadcast Bug
Broadcasts are case sensitive #433
2017-02-08 10:05:48 +00:00
griffpatch
9cb595312e Implement "Stop this script" function
Existing implementation incorrectly terminates the entire thread.
See: http://llk.github.io/scratch-vm/#144142535
2017-02-08 09:44:10 +00:00
griffpatch
cf215bf0bc Fix for the "Empty or white space strings equal 0" bug
See: Empty or white space strings equal 0 #435
2017-02-08 08:38:50 +00:00
griffpatch
aecc3bf893 Merge remote-tracking branch 'refs/remotes/LLK/develop' into develop 2017-02-08 08:32:06 +00:00
griffpatch
7d69ecc005 Optimisation - Only check browser compatability once
Disable use of more accurate timer temporarilly due to performance.
However, with the rearrange and introduction of the 'nowObj' it turns
out most of the delay is in resolving 'self.performance'... so keeping
this cached in nowObj actually mitigates most of the delay.
2017-02-08 08:11:10 +00:00
griffpatch
57c222e94f Merge remote-tracking branch 'refs/remotes/LLK/develop' into optimisation/only-check-for-compatability-once 2017-02-08 08:04:47 +00:00
morant
ed978e3062 Read sprite costume names from JSON, and write currentCostume to JSON 2017-02-07 20:12:55 -05:00
morant
6b545ea16d Update isStage for each sprite when loading JSON, removing things copied from SB2 which are not relevant. 2017-02-07 18:38:44 -05:00