Commit graph

705 commits

Author SHA1 Message Date
morant
19275799df Load md5 information from sounds 2017-02-09 10:44:28 -05: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
morant
0dc1883e9f Write costumes and sounds to JSON on save 2017-02-07 18:15:11 -05:00
morant
e16f2924a3 Merge branch 'develop' of https://github.com/LLK/scratch-vm into develop 2017-02-07 09:53:17 -05:00
Ray Schamp
8c7ca9580e Merge pull request #431 from LLK/greenkeeper/eslint-3.15.0
Update eslint to the latest version 🚀
2017-02-06 10:42:56 -05:00
Eric Rosenbaum
92affb05f0 Merge pull request #432 from thisandagain/bugfix/coverage
Add basic test coverage for the sound blocks
2017-02-03 17:58:33 -05:00
Andrew Sliwinski
92ff57de7d Add basic test coverage for the sound blocks 2017-02-03 17:39:36 -05:00
greenkeeper[bot]
284357941b chore(package): update eslint to version 3.15.0
https://greenkeeper.io/
2017-02-03 22:04:26 +00:00
Andrew Sliwinski
eda2cf578e Merge pull request #428 from LLK/greenkeeper/tap-10.0.2
Update tap to the latest version 🚀
2017-02-03 08:26:25 -05:00
greenkeeper[bot]
7612a46c61 chore(package): update tap to version 10.0.2
https://greenkeeper.io/
2017-02-02 23:33:29 +00:00
Eric Rosenbaum
46c0859ae9 Merge pull request #424 from ericrosenbaum/sound
Refactor sound engine
2017-02-02 17:45:45 -05:00
Eric Rosenbaum
9741dc2e35 Merge branch 'develop' of https://github.com/LLK/scratch-vm into sound 2017-02-02 16:37:07 -05:00
Andrew Sliwinski
8ff21a3822 Merge pull request #426 from LLK/greenkeeper/tap-10.0.1
Update tap to the latest version 🚀
2017-02-02 07:59:57 -05:00
greenkeeper[bot]
6ca8814a2f chore(package): update tap to version 10.0.1
https://greenkeeper.io/
2017-02-02 06:26:51 +00:00
Ray Schamp
597006bc6e Merge pull request #423 from LLK/greenkeeper/initial
Update dependencies to enable Greenkeeper 🌴
2017-02-01 17:37:22 -05:00
Ray Schamp
98a12f1388 Replace broken DavidDM badges with Greenkeeper 2017-02-01 16:27:56 -05:00
Ray Schamp
727fcc7875 Lint for eslint-config-scratch@3 2017-02-01 16:27:55 -05:00
Ray Schamp
a6568c4bf2 Update webpack config for webpack 2
* `module.loaders` -> `module.rules`
* loaders need `-loader` suffix
* `json-loader` is enabled by default
* `UglifyJsPlugin`'s `compress.warning` setting is false by default
2017-02-01 16:27:55 -05:00
Eric Rosenbaum
123b9ce06f remove build files that were un-ignored 2017-02-01 12:02:20 -05:00
greenkeeper[bot]
0d38d1d245 docs(readme): add Greenkeeper badge
https://greenkeeper.io/
2017-02-01 15:19:47 +00:00
greenkeeper[bot]
82acfddeb5 chore(package): update dependencies
https://greenkeeper.io/
2017-02-01 15:19:46 +00:00
Eric Rosenbaum
0947775a31 Merge branch 'develop' of https://github.com/LLK/scratch-vm into sound 2017-02-01 10:18:01 -05:00
Andrew Sliwinski
073ffda0fb Merge pull request #422 from CSnap/tan_fix
Added new util function that sends tan function infinities correctly
2017-02-01 09:12:42 -05:00
SillyInventor
1ac89f5aa4 Added new util function that sends tan function infinities correctly
Changed mathop to call new math util
Changed sin & cos to round correctly (to get 0)
Added testing for the new math util function
Added testing for the new mathop functions
2017-01-31 19:05:54 -05:00
Eric Rosenbaum
53127f6320 use customstate for sound volume, instrument, effects 2017-01-31 18:33:32 -05:00
Eric Rosenbaum
95e29ed66a move sound-related code out of rendered target 2017-01-31 18:32:46 -05:00
Andrew Sliwinski
fff63e3af2 Merge pull request #414 from thisandagain/bugfix/413
Bugfix - Continue import if opcode is not found during SB2 import
2017-01-30 15:36:24 -05:00
Andrew Sliwinski
c2a488a197 Merge pull request #408 from griffpatch/optimisation/avoid-negative-index-lookups
Optimisation - Avoid negative index lookups #407
2017-01-30 15:06:02 -05:00
Andrew Sliwinski
249c0d6dca Merge pull request #409 from griffpatch/optimisation/remove-redundant-lookups
Optimisation - Remove redunant lookups
2017-01-30 15:04:42 -05:00
Andrew Sliwinski
bb7c411edb Merge pull request #411 from griffpatch/optimisation/reuseStackForNextBlock
Optimisation - Recycle Stack Frame for cosecutive block execution
2017-01-30 15:03:39 -05:00
Andrew Sliwinski
7c18b33f99 Continue import if opcode is not found during SB2 import. Resolves GH-413 2017-01-30 14:32:32 -05:00
Eric Rosenbaum
f7a3a8dbbe merge 2017-01-30 11:40:20 -05:00
Eric Rosenbaum
2d8491123e Merge branch 'develop' of https://github.com/LLK/scratch-vm into sound 2017-01-30 11:28:52 -05:00
Eric Rosenbaum
dd30e07052 comments on getSoundIndex 2017-01-30 10:56:50 -05:00
Eric Rosenbaum
9d8819ddc7 audio engine handles rest block 2017-01-30 10:56:31 -05:00
Eric Rosenbaum
cb4209b27a target handles playnote via audio engine 2017-01-30 10:56:06 -05:00
Eric Rosenbaum
5966a46bbd target manages instrument setting 2017-01-30 10:54:24 -05:00
Eric Rosenbaum
4e4b0b86e1 target manages audio effect values 2017-01-30 10:53:12 -05:00
Eric Rosenbaum
01e237a2d5 audio engine loads all sounds 2017-01-30 10:50:28 -05:00
Eric Rosenbaum
4e57ab561d move playsound function to target 2017-01-30 10:45:15 -05:00
Eric Rosenbaum
d5e0d433aa include md5 in sprite sound object 2017-01-30 10:43:28 -05:00
griffpatch
fbf2c0c345 Optimisation - Recycle Stack Frame for cosecutive blocks
This saves popping, destroying, recreating, and pushing the stack frame,
and then reassigning the warp mode attribute for every block to block
step in the execution.
2017-01-28 17:06:07 +00:00
griffpatch
76c9c993f2 Optimisation - Remove redunant lookups
It's surprising how much time it takes to do an object member lookup, so
reducing these is a great idea.
2017-01-28 16:33:20 +00:00
Andrew Sliwinski
824628220c Merge pull request #406 from griffpatch/bugfix/end-warp-bug
Runtime does not exit warp mode if at end of loop #398
2017-01-28 09:56:04 -05:00
griffpatch
bd9159b9fb More negative index checks 2017-01-28 14:39:22 +00:00
griffpatch
a25e117412 optimisation/avoid negative index lookups #407
Run-time Optimisation

The thread.stackFrames array is accessed all the time to retrieve the
'parent' stack frame. This is done using as index of [this.stack.length
- 1]. However, a lot of the time this evaluated to [-1]. Although this
results in null, which is fine, to get to this javascript actually
defers from a numeric array lookup to an object lookup using the string
"-1". This is roughly 100 times slower to compute and so a simple catch
for negative indexes is well worth the extra check.
2017-01-28 14:38:13 +00:00
griffpatch
6f8eaaa101 Merge remote-tracking branch 'refs/remotes/LLK/develop' into optimisation-root 2017-01-28 14:17:03 +00:00
griffpatch
c6a872ef4a Fix whitespace issues 2017-01-28 14:11:48 +00:00
griffpatch
5f100129b6 Fix for ending warp bug
When popping down the stack frame it is assumed that you keep using the
previous warp state rather than looking at the warp state of the level
you just popped out to. This causes the loss of screen updates if the
warping block was the last statement in a loop as the loop does not obey
it's 'non warp' status.
2017-01-28 14:03:29 +00:00