ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,973 Commits 3 Branches 499 Tags
a150bc99dbb71ce7e1f3f021b9213f4e5daf27ad
Commit Graph
4973 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ray Schamp a150bc99db Remove prune step from deployment for now 
It doesn't affect greenkeeper subdirectories, which are the ones that cause the most issues. And now the prune step itself is breaking builds. So until it works better, remove this step.
 2019-02-08 13:28:22 -05:00
Paul Kaplan 38fb199533 Merge pull request #4500 from mzgoddard/loading 
Set an initial message number to skip rendering a second time
 2019-02-08 13:25:54 -05:00
Paul Kaplan 232d6610ae Merge pull request #4519 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190207224121 
chore(package): update scratch-vm to version 0.2.0-prerelease.2019020…
 2019-02-08 13:24:50 -05:00
Paul Kaplan b0e2ea7d20 Merge pull request #4518 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190208165820 
chore(package): update scratch-render to version 0.1.0-prerelease.201…
 2019-02-08 13:23:48 -05:00
greenkeeper[bot] 5e3c251405 chore(package): update scratch-render to version 0.1.0-prerelease.20190208165820 
Closes #4513
 2019-02-08 16:59:54 +00:00
Paul Kaplan da65b41366 Merge pull request #4499 from LLK/multi-upload 
Multiple file upload for costumes, sounds, backdrops and sprites
 2019-02-08 10:47:15 -05:00
greenkeeper[bot] e20566a242 chore(package): update scratch-vm to version 0.2.0-prerelease.20190207224121 
Closes #4510
 2019-02-07 22:43:57 +00:00
Paul Kaplan 65f9f7f16d Merge pull request #4512 from LLK/revert-4501-greenkeeper/scratch-render-0.1.0-prerelease.20190206213754 
Revert "Update scratch-render to the latest version 🚀"
0.1.0-prerelease.20190207214203 		2019-02-07 16:24:15 -05:00
Paul Kaplan 71a251448c Revert "Update scratch-render to the latest version 🚀" 2019-02-07 16:22:41 -05:00
Paul Kaplan a5c6e09e44 Merge pull request #4508 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190207191220 
chore(package): update scratch-vm to version 0.2.0-prerelease.2019020…
0.1.0-prerelease.20190207194935 		2019-02-07 14:38:17 -05:00
greenkeeper[bot] 89b5cdf7c1 chore(package): update scratch-vm to version 0.2.0-prerelease.20190207191220 
Closes #4506
 2019-02-07 19:18:54 +00:00
Paul Kaplan 83ad459c53 Merge pull request #4505 from paulkaplan/fix-asset-downloading 
Use blob download instead of data-uri to enable large downloads
 2019-02-07 11:57:14 -05:00
Paul Kaplan 50b14524b2 Get the asset type correctly 2019-02-07 11:56:03 -05:00
Paul Kaplan 0c261e5597 Use blob download instead of data-uri to enable large downloads 
This was already being used for sb3s and sprite3s, but the code was repeated in different places. Make a single helper that downloads blobs, and make all download paths use it.
 2019-02-07 11:44:34 -05:00
Paul Kaplan 4699667257 Merge pull request #4504 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190207134238 
chore(package): update scratch-vm to version 0.2.0-prerelease.2019020…
0.1.0-prerelease.20190207141026 		2019-02-07 08:56:15 -05:00
greenkeeper[bot] e725541e68 chore(package): update scratch-vm to version 0.2.0-prerelease.20190207134238 
Closes #4503
 2019-02-07 13:54:02 +00:00
Paul Kaplan 7edef6c4b7 Merge pull request #4501 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190206213754 
Update scratch-render to the latest version 🚀
 2019-02-07 08:34:03 -05:00
chrisgarrity 8e1d7599b3 Merge pull request #4502 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1549534784 
Update scratch-blocks to the latest version 🚀
 2019-02-07 12:13:24 +01:00
greenkeeper[bot] 69ebefbf45 chore(package): update scratch-blocks to version 0.1.0-prerelease.1549534784 2019-02-07 10:46:40 +00:00
greenkeeper[bot] 1cb9ae9765 chore(package): update scratch-render to version 0.1.0-prerelease.20190206213754 2019-02-06 23:14:11 +00:00
Michael "Z" Goddard c9cfda8ca8 set an initial message number to skip rendering a second time 2019-02-06 16:53:14 -05:00
Paul Kaplan aeeb617067 Merge pull request #4497 from LLK/greenkeeper/scratch-l10n-3.1.20190206143031 
Update scratch-l10n to the latest version 🚀
 2019-02-06 16:27:11 -05:00
Paul Kaplan e0be81413f Merge branch 'develop' into greenkeeper/scratch-l10n-3.1.20190206143031 2019-02-06 16:27:00 -05:00
Paul Kaplan 6d3c4cd3b4 Merge pull request #4487 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1549376808 
Update scratch-blocks to the latest version 🚀
 2019-02-06 15:57:08 -05:00
Paul Kaplan adc92b9893 Merge pull request #4494 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190205221329 
chore(package): update scratch-vm to version 0.2.0-prerelease.2019020…
 2019-02-06 15:56:56 -05:00
greenkeeper[bot] de01ef9dca chore(package): update scratch-l10n to version 3.1.20190206143031 2019-02-06 14:36:23 -05:00
greenkeeper[bot] f8e41728ee chore(package): update scratch-vm to version 0.2.0-prerelease.20190205221329 
Closes #4480
 2019-02-06 14:36:07 -05:00
greenkeeper[bot] 56ef4eee02 chore(package): update scratch-blocks to version 0.1.0-prerelease.1549376808 2019-02-06 14:35:34 -05:00
Paul Kaplan 6ede63433d Merge pull request #4495 from paulkaplan/dynamic-wait-for-loader 
Wait until loader becomes stale to continue in project loader tests
 2019-02-06 14:34:14 -05:00
Paul Kaplan 65756fcc50 Load files one at a time to enforce load order 2019-02-06 14:32:17 -05:00
Karishma Chadha aa7d52553a Merge pull request #4486 from kchadha/xml-escape 
Escape special characters in toolbox xml
 2019-02-06 14:22:19 -05:00
Paul Kaplan 15642ba661 There is no loading screen for blocks example, dont wait for it 2019-02-06 14:21:20 -05:00
Paul Kaplan 7eabc4d9cd Add integration tests for multiple file upload 
Including sprites, backdrops, costumes and sounds inputs
 2019-02-06 12:09:43 -05:00
Paul Kaplan 8a46b8f71b Make file uploader call callback for each uploaded file 2019-02-06 12:09:32 -05:00
Paul Kaplan 35413c6383 Include the waitUntilGone helper in the other project load tests 2019-02-06 11:20:24 -05:00
Paul Kaplan 8daed6d14c Wait until loader becomes stale to continue in project loader tests 2019-02-06 11:10:09 -05:00
Paul Kaplan 1f2f41b597 Merge pull request #4493 from paulkaplan/fix-see-inside-toolbox 
Fix "See Inside" not showing variables
 2019-02-06 10:37:22 -05:00
Paul Kaplan e939f33650 Merge pull request #4490 from JinXJinX/develop 
Fix issue #4431 by change 'dserver' to 'server'
 2019-02-06 09:48:31 -05:00
Paul Kaplan 6dd6c68595 Add an integration test for toolbox updating after see-inside. 
I needed to update the player css because the editor side wasn't large enough to be useable.
 2019-02-06 09:42:37 -05:00
Paul Kaplan ebbf292ffd Fix toolbox updating after see-inside. 
We can't rely on refreshWorkspace always causing a toolbox update, so make sure to update the toolbox manually if it is needed.
 2019-02-05 16:35:30 -05:00
Paul Kaplan fe0c5d53d4 Merge pull request #4467 from paulkaplan/fix-backpack-code-updating 
Call updateToolbox after adding new blocks from the backpack.
 2019-02-05 12:07:18 -05:00
Xu Jing 42baacf688 fix(Typo): change 'dserver' to 'server' 2019-02-05 11:53:10 -05:00
Karishma Chadha fcf0f4e31d Merge pull request #4465 from LLK/paulkaplan-patch-2 
Make uploaded sprites not draggable
 2019-02-05 11:00:27 -05:00
chrisgarrity 865f4306c6 Merge pull request #4477 from chrisgarrity/override-blocksdrag-zindex 
Move blocks z-index up to match gui
 2019-02-05 13:10:59 +01:00
Karishma Chadha c062d0589b Escape special characters in user defined strings that can appear in the toolbox xml. 2019-02-04 21:31:37 -05:00
Paul Kaplan 52a6136caa Merge pull request #4475 from LukeSchlangen/fix/mode-reducer 
Retain showBranding mode property after SET_FULL_SCREEN action is dispatched
 2019-02-04 14:33:48 -05:00
chrisgarrity c9b3f831c4 Move blocks z-index up to match gui 
Override the z-index for the blocks drag layer. At 1000, it will be over everything in the gui other than the navbar itself (monitors on the stage, tutorials, alerts, dropdown menus, etc.)
 2019-02-04 18:37:32 +01:00
Luke Schlangen 7494482c9e remove isAdmin from mode reducer 2019-02-04 11:24:42 -06:00
Paul Kaplan 05172c861d Merge pull request #4483 from paulkaplan/hotfix/fix-tests 
[develop] Hotfix/fix tests
 2019-02-04 11:54:04 -05:00
Paul Kaplan 4ae4000682 Remove beforeunload callback that was breaking tests 2019-02-04 11:51:10 -05:00