Commit graph

1933 commits

Author SHA1 Message Date
Ray Schamp
ea87d92245
Merge pull request #1143 from LLK/revert-1105-dynamic-load-music
Revert "Dynamically load music extension manifest"
2018-05-11 11:06:11 -04:00
Ray Schamp
1934fd427a
Revert "Dynamically load music extension manifest" 2018-05-11 11:04:43 -04:00
chrisgarrity
1d98a7b5fe
Merge pull request #1142 from chrisgarrity/update-tx
Update tx/config for Scratch 3.0
2018-05-11 10:02:10 -04:00
Eric Rosenbaum
73079c56b4
Merge pull request #1141 from ericrosenbaum/feature/extension-id-in-toolbox
Add extension id to toolbox category XML
2018-05-11 09:30:05 -04:00
chrisgarrity
6c7bc93a23 Update tx/config for Scratch 3.0 2018-05-11 08:20:20 -04:00
Eric Rosenbaum
bdda3bc2c9 Add extension id to toolbox category XML 2018-05-10 15:41:44 -04:00
Paul Kaplan
b7f3a06fa0
Merge pull request #1133 from paulkaplan/show-hide-vars
Add implementations for hiding and showing variables and lists.
2018-05-10 15:34:21 -04:00
Andrew Sliwinski
0b7aa6ddf6
Merge pull request #1136 from thisandagain/feature/localize
Add localization support to music and video sensing extensions
2018-05-10 15:27:37 -04:00
Andrew Sliwinski
3eefddcde2 Fix typo and add clarification to translation note 2018-05-10 15:25:55 -04:00
Andrew Sliwinski
d5705f6eae Fix typo 2018-05-10 13:58:09 -04:00
DD Liu
5c003641f9
Merge pull request #1126 from fsih/fixQuirksOnLoadCostume
Run quirks mode fixes on costumes loaded from sb2s
2018-05-10 13:42:48 -04:00
Andrew Sliwinski
1995753e94 Add localization support to music and video sensing extensions 2018-05-10 13:41:41 -04:00
DD
589dd7d5e0 Attach the svg renderer instead of providing it in order to fix VM tests 2018-05-10 12:03:38 -04:00
Ray Schamp
6ffc206d10
Merge pull request #1134 from LLK/do-deploy
Actually do the deploy
2018-05-09 16:47:32 -04:00
Ray Schamp
feb90f1f8c
Actually do the deploy
Now that the release stage is only created for master and develop, allow the deploy to run on any branch. This way we can control which branches get deployed from the stage condition alone.
2018-05-09 16:47:06 -04:00
DD
aae1e083bc Switched textEncoder to costumeAsset.encodeTextData, and pass in version as an argument instead of in costume 2018-05-09 15:48:49 -04:00
Paul Kaplan
47e2264eba Add opcodes for hiding and showing variables and lists.
Note: to get them back into the toolbox, we need to change that in blocks.
2018-05-09 14:25:15 -04:00
Paul Kaplan
f3404f4275
Merge pull request #1128 from paulkaplan/sb2-monitors
Import monitors from sb2 files.
2018-05-09 13:52:29 -04:00
Paul Kaplan
6c9ecd9065 Return a new copy of the list for monitors when changes occur 2018-05-09 13:42:53 -04:00
Paul Kaplan
7d0121bc44 Return lists as arrays if running for monitors.
This is a strange quirk of the way the list blocks work, they get joined into a string for interoperability within other other scratch blocks. But for monitors, we need it to stay an array.
2018-05-09 12:24:01 -04:00
Paul Kaplan
36a01cf0cb Fix clearing monitor state 2018-05-09 12:06:24 -04:00
Paul Kaplan
6793349898 Do not stringify reported monitor values.
Consulted @fsih, should be fine since formatting is being handled in the GUI anyway.
2018-05-09 11:39:14 -04:00
Paul Kaplan
cc1314d289 Clear out monitor state on vm.clear
Fixes https://github.com/LLK/scratch-gui/issues/1848
2018-05-09 11:34:01 -04:00
Paul Kaplan
f01558b74e Address comments from @kchada review 2018-05-09 11:08:49 -04:00
Paul Kaplan
aa24d118c8 Fix lint error 2018-05-09 10:55:47 -04:00
Paul Kaplan
9e372916a8 Add comment about sensing block id oddness 2018-05-09 10:52:00 -04:00
kchadha
13d1218876
Merge pull request #1127 from kchadha/update-scratch-parser
Update scratch-parser.
2018-05-09 10:15:26 -04:00
kchadha
cf8ad388de
Merge pull request #1122 from Kenny2github/develop
Handle random backdrop menu option
2018-05-09 10:12:05 -04:00
Karishma Chadha
3e2dd67fda Update scratch-parser version and pin to specific version. 2018-05-09 09:54:38 -04:00
Ray Schamp
5875476228
Merge pull request #1131 from rschamp/no-release-on-pr-builds
Don't run release stage for PR builds
2018-05-09 09:53:03 -04:00
Ray Schamp
968927511a Don't run release stage for PR builds 2018-05-09 09:49:30 -04:00
Paul Kaplan
e0db8529bf Add an sb2 import test for importing monitors.
Checks for
- monitor types set correctly (all 4)
- monitor visibility set correctly
- monitor threads not running if not visible
- monitor positioning imported
- monitor width/height for lists
- custom monitor slider range
- sprite specificity
2018-05-09 09:33:28 -04:00
Paul Kaplan
db646fd3c2 Remove monitors from sb2 fixtures that expect no threads to stay running 2018-05-09 08:44:03 -04:00
Ray Schamp
af174c5782
Merge pull request #1130 from rschamp/conditional-release
Make Travis release stage conditional by branch
2018-05-08 23:54:55 -04:00
Ray Schamp
756b7941af Make release stage conditional by branch
If the branch isn't a release branch, don't even try to do the release stage.  This should speed up PR tests.
2018-05-08 23:51:50 -04:00
Ray Schamp
ac6e73c947
Merge pull request #1129 from rschamp/node8
Clean up Travis config
2018-05-08 23:36:08 -04:00
Kenny2github
8e9f9e0a30 Add one to index if random costume is current costume 2018-05-09 08:13:04 +08:00
Ray Schamp
bfde3f476c Specify Node 8 in build stages 2018-05-08 19:38:05 -04:00
Ray Schamp
4dca1b29aa Don't use NODE_ENV=production for the matrix
This is something we want enabled for all builds, so it should be a global. This should simplify the matrix. The builds without an NPM_SCRIPT didn't do anything anyway.
2018-05-08 19:37:09 -04:00
Ray Schamp
a12e4dfbae Update Travis Node to 8
The peer dependency fix seemed to work, but we want to be up to 8 on all our repos anyway so do that.
2018-05-08 19:36:01 -04:00
Ray Schamp
aad5131f93 Update remaining peer dependency 2018-05-08 19:35:29 -04:00
Ray Schamp
c705be4cfa Update expose-loader dependency instead
It doesn't make sense that webpack 4 has made Node 6 builds. Maybe it's due to peer dependencies on the install step?
2018-05-08 19:27:26 -04:00
Ray Schamp
6da5da7c38 Bump Travis to Node 8
Tests fail otherwise, with the new version of webpack?
2018-05-08 18:53:36 -04:00
DD
b9ce26918d Fix review comments 2018-05-08 18:30:52 -04:00
Paul Kaplan
13dfef553e Fix default value for monitor record 2018-05-08 17:30:39 -04:00
Paul Kaplan
26cfbfe588 Fix stage checking 2018-05-08 17:15:54 -04:00
Paul Kaplan
4713f47fb7 Import monitors from sb2 files.
Paired with @kchadha on all of this.
2018-05-08 17:06:19 -04:00
DD
928245d5c9 Fix Edge 2018-05-08 14:25:32 -04:00
DD
296af1a079 Run quirks mode fixes on costumes loaded from sb2s 2018-05-08 12:03:34 -04:00
Ray Schamp
22852aeab4
Merge pull request #1119 from mzgoddard/recycle-args
Recycle block args
2018-05-08 12:00:29 -04:00