scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
1343 commits 495 branches 1637 tags 1.3 GiB
Commit graph

1343 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karishma Chadha
34b0aff637 Bugfix for scratch-gui issue #994, where executing a broadcast block from the flyout was creating a conflicting variable, causing a fatal error. 2017-12-04 18:01:29 -05:00
Paul Kaplan
0722708004
Merge pull request #817 from sjhuang26/develop 
Fix ask-and-wait in stage
 2017-12-01 11:53:37 -05:00
Paul Kaplan
a9e95f3b01
Merge pull request #829 from kchadha/broadcast-message-typed-variable 
Broadcast message functionality
 2017-12-01 11:51:38 -05:00
Karishma Chadha
aab4a45622 Minor Refactoring/cleanup. 2017-12-01 11:27:54 -05:00
Karishma Chadha
80da989f01 SB2 Import for Broadcast Blocks (not including the input field functionality for 'broadcast' and 'broadcast and wait 
'). Currently we also cannot import projects where messages and variables share names.
 2017-12-01 10:29:32 -05:00
Karishma Chadha
e5378d323d Adding unit tests for new lookupOrCreate funciton, fixing a bug that came up during testing (using lookupVariableById on a null target). Skipping integration tests that do not work right now because SB2 import of broadcast message blocks has not been implemented yet. 2017-11-29 10:43:07 -05:00
Karishma Chadha
b674a0c047 Code cleanup and refactoring, and getting scratch3_event broadcast functionality to look up the variable name instead of getting it ad-hoc. 2017-11-28 22:33:27 -05:00
Eric Rosenbaum
63698dad8a
Merge pull request #826 from ericrosenbaum/bugfix/check-note-buffers 
Check for instrument sample before playing
 2017-11-28 13:39:49 -05:00
Eric Rosenbaum
773c167987 Check for instrument sample before playing 2017-11-28 13:15:48 -05:00
Andrew Sliwinski
421a92cad1
Merge pull request #823 from cwillisf/add-browser-field 
Add browser field
 2017-11-28 07:43:57 -05:00
Christopher Willis-Ford
88dada5cb8 Use UMD for web ouput 
UMD output seems to be working well for the storage module; this change
adjusts the web-targeted build outputs of this module to use it as well.
Also, common output properties are now specified in the base config and
removed from each individual config.
 2017-11-27 20:07:31 -08:00
Christopher Willis-Ford
12acdefb5a Add "browser" field to package.json 
This informs webpack (say, in `scratch-gui`) about the web-targeted
build output so that it can resolve dependencies correctly. This fixes
build problems that became evident after merging #805.
 2017-11-27 19:15:05 -08:00
Eric Rosenbaum
6dffc0e512
Merge pull request #820 from ericrosenbaum/bugfix/extension-menu-values 
Convert music extension menu values to string
 2017-11-27 17:10:23 -05:00
Andrew Sliwinski
519d41d966
Merge pull request #805 from thisandagain/bugfix/802 
Replace 'got' module with 'nets'
 2017-11-27 15:17:04 -05:00
Andrew Sliwinski
b78bdb4c93 Address feedback from review 2017-11-27 15:00:53 -05:00
Eric Rosenbaum
7e87f314fb Convert menu values to string 2017-11-27 10:06:42 -05:00
sjhuang26
f610816e72
Added wasStage parameter 2017-11-24 21:28:48 -05:00
Karishma Chadha
0a15190b85 Broadcast message functionality (works with creating new messages, and switching back and forth between them as well). This commit includes a temporary workaround for the issue where the default broadcast message, 'message1' wasn't triggering a var_create event (filed in LLK/scratch-blocks#1258). 2017-11-21 16:48:48 -05:00
Andrew Sliwinski
621087904d
Merge pull request #811 from LLK/greenkeeper/copy-webpack-plugin-4.2.1 
chore(package): update copy-webpack-plugin to version 4.2.1
 2017-11-21 12:30:44 -05:00
Eric Rosenbaum
5fbfecb1a9
Note player (#806) 
* Move drums into their own folder

* Load instrument samples

* Play notes

* Concurrency limit is shared across drums and instruments

* Increase MIDI note range

* Set instrument directly on musicState object

* JSDoc

* Clean up the play note functions and add comments

* Cleanup

* Check for audioEngine in playDrumNum

* JSDoc and comments

* Round the instrument number

* Fix unit test for set instrument

* Comment fixes

* Nit (condense onto single line)
 2017-11-21 10:36:28 -05:00
DD Liu
58dd57fe48
Merge pull request #784 from fsih/perSpriteMonitors 
Execute monitors on a given target ID when block is sprite-specific
 2017-11-21 10:23:53 -05:00
Andrew Sliwinski
f8a1f244fa
Merge pull request #794 from LLK/greenkeeper/expose-loader-0.7.4 
Update expose-loader to the latest version 🚀
 2017-11-20 20:34:20 -05:00
Andrew Sliwinski
51bd0349b0
Merge branch 'develop' into greenkeeper/expose-loader-0.7.4 2017-11-20 20:14:03 -05:00
Andrew Sliwinski
8395fffe52
Merge pull request #809 from LLK/greenkeeper/worker-loader-1.1.0 
chore(package): update worker-loader to version 1.1.0
 2017-11-20 20:12:45 -05:00
Andrew Sliwinski
669b0ebe17
Merge pull request #808 from LLK/greenkeeper/script-loader-0.7.2 
chore(package): update script-loader to version 0.7.2
 2017-11-20 20:11:44 -05:00
Andrew Sliwinski
8e154474b7
Merge branch 'develop' into greenkeeper/script-loader-0.7.2 2017-11-20 20:11:30 -05:00
Andrew Sliwinski
fef8f23a57
Merge pull request #690 from LLK/greenkeeper/eslint-config-scratch-5.0.0 
Update eslint-config-scratch to the latest version 🚀
 2017-11-20 20:09:24 -05:00
Andrew Sliwinski
a73ef6819f Resolve merge conflicts 2017-11-20 17:39:07 -05:00
DD
ec9d8094bd fix review comments 2017-11-20 17:23:59 -05:00
Andrew Sliwinski
d5acdbe983
Merge pull request #727 from LLK/greenkeeper/socket.io-client-2.0.4 
Update socket.io-client to the latest version
 2017-11-20 17:08:33 -05:00
Andrew Sliwinski
ea63fee483
Merge pull request #804 from LLK/greenkeeper/promise-8.0.1 
chore(package): update promise to version 8.0.1
 2017-11-20 17:06:36 -05:00
Andrew Sliwinski
a8c629dc9b Replace 'got' module with 'nets'. Resolves GH-802 2017-11-20 17:04:17 -05:00
Andrew Sliwinski
140570d195
Merge pull request #803 from LLK/greenkeeper/gh-pages-1.1.0 
chore(package): update gh-pages to version 1.1.0
 2017-11-20 16:41:17 -05:00
Eric Rosenbaum
614708d48c
Merge pull request #785 from ericrosenbaum/feature/load-drums-from-storage 
Load drum sounds from storage and play them
 2017-11-20 13:56:23 -05:00
Eric Rosenbaum
b6cf12202c Rename unit test file 2017-11-20 13:50:46 -05:00
Eric Rosenbaum
1e00a0c252 Comment for no-op above concurrency limit 2017-11-20 13:44:44 -05:00
Eric Rosenbaum
c3a72560f9 Clarify @TODO comment about extension status indicator 2017-11-20 13:42:35 -05:00
DD
6d26023104 revert unnecessary changes' 
:
 2017-11-20 13:00:37 -05:00
griffpatch
6ed2ca6caa Cache Block Inputs & Procedure Definitions 
* Cache Block Inputs & Procedure Definitions

* @mzgoddard requested changes on this pull request

* Move all caching into a single reusable field _cache.
* Invalidate 'all' caches on any change.
* Use 'typeof' instead of hasOwnProperty.
* Take caching out of Block and use lookup instead.
 2017-11-20 10:22:51 -05:00
greenkeeper[bot]
e052f1d53b chore(package): update expose-loader to version 0.7.4 2017-11-18 07:41:49 +00:00
greenkeeper[bot]
0959c4dbd5 chore(package): update gh-pages to version 1.1.0 
Closes #559
 2017-11-17 21:59:41 +00:00
Paul Kaplan
8ce20fd308
Merge pull request #792 from paulkaplan/fix-webpack-dev-server 
Only uglify if building for production.
 2017-11-17 12:32:41 -05:00
Paul Kaplan
d83f32c578 Use production=false in install step 2017-11-17 11:48:22 -05:00
Paul Kaplan
a036564a60 Add node env to travis 2017-11-17 10:06:38 -05:00
Paul Kaplan
26771e9e0c Only uglify if building for production. 
Uglify was trying to run always, including the dev-server output, which
included es6 that broke uglifier.
 2017-11-17 09:59:09 -05:00
greenkeeper[bot]
8963d0222f chore(package): update copy-webpack-plugin to version 4.2.1 
Closes #682
 2017-11-17 14:24:32 +00:00
DD Liu
2d9722e69c
Merge pull request #787 from fsih/deleteMonitorBlocks 
Delete monitor block when variable is deleted
 2017-11-16 17:20:26 -05:00
DD
255e160ebb Change it so we dont have to do string manipulation on IDs to get data out of events 2017-11-16 17:19:51 -05:00
Paul Kaplan
bbb8904467
Merge pull request #789 from paulkaplan/custom-procedure-update 
Update naming and implementation for custom procedure blocks
 2017-11-16 17:07:03 -05:00
Paul Kaplan
91c93830a8 Fix tests 2017-11-16 14:23:56 -05:00