ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,948 Commits 3 Branches 499 Tags
e0be81413fe35b890a341fcb32c1a10e00a845f6
Commit Graph
4948 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
Paul Kaplan 361187dcaa Merge pull request #4481 from paulkaplan/hotfix/toolbox-language 
[develop] hotfix toolbox language
 2019-02-04 11:35:21 -05:00
Paul Kaplan 13e43ae73c Merge pull request #4471 from paulkaplan/dont-save-fonts 
Export costumes without inlined fonts for now
 2019-02-04 11:28:12 -05:00
Paul Kaplan c40b8c911d Merge pull request #4478 from paulkaplan/hotfix/toolbox-language 
[master] Hotfix/toolbox language
 2019-02-04 11:24:14 -05:00
Paul Kaplan 359c491093 Merge pull request #4433 from towerofnix/ctrl-s-to-save-2 
Control/Command+S to save
 2019-02-04 09:59:23 -05:00
Paul Kaplan 984eb1b073 Include a regression test for #4476 2019-02-04 09:46:58 -05:00
Paul Kaplan f270b36f64 Initialize locale on ScratchBlocks before initial workspace injection 
This fixes a problem where having a non-default locale set during the initial load would display the blocks in the default toolbox in the wrong language, because the toolbox recycling toggle in setLocale does not work on initial load because there is no editing target to refresh.
 2019-02-04 09:46:58 -05:00
Paul Kaplan 11083c1c9d Merge tag '0.1.0-prerelease.20190131130145' 
NPM version 0.1.0-prerelease.20190131130145 deployed to production 1/31/2019
 2019-02-04 09:45:26 -05:00
Luke Schlangen 4dc2501e5c add empty object to abject assign 2019-02-03 15:16:45 -06:00
Luke Schlangen 4db64ca560 add mode reducer unit tests 2019-02-03 12:12:56 -06:00
Luke Schlangen bf09d9c3d0 retain showBranding after SET_FULL_SCREEN 2019-02-03 11:55:32 -06:00
Paul Kaplan a4b00061b6 Merge pull request #4470 from paulkaplan/update-npm-tags 
Use "stable" tag on npm for master builds and "latest" for develop/smoke
 2019-02-02 13:24:45 -05:00
Florrie 528b3412d6 Use bowser for macOS detection 2019-02-01 17:00:52 -04:00
Paul Kaplan ae96163a41 Export costumes without inlined fonts for now. 
Since the common use-case is download/edit/re-upload, and we do not want to explode the storage size of assets (which are considerably larger with fonts inlined), just do what scratch2 did and do not inline the fonts. This is not ideal if kids want to use the costumes for other purposes, but until we can create a way to strip inlined fonts before uploading to the asset server, this is the conservative way to go.
 2019-02-01 14:27:02 -05:00
Paul Kaplan 349c96ed7f Use "stable" tag on npm for master builds and "latest" for develop/smoke 
This is different of what it is currently, where master/smoke goes to "latest" and develop goes to "develop"
 2019-02-01 14:19:58 -05:00
Paul Kaplan 55461a07a7 Merge pull request #4438 from apple502j/download-assets 
Export costumes and sounds!
 2019-02-01 14:04:47 -05:00
Paul Kaplan f41c5764ff Use more generic download-url and remove older download-text utility 2019-02-01 13:17:43 -05:00
Paul Kaplan a57f24fd00 Merge pull request #4463 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190130220715 
Update scratch-vm to the latest version 🚀
 2019-02-01 09:28:07 -05:00
Paul Kaplan 327eb91fc0 Call updateToolbox after adding new blocks from the backpack. 
This fixes the issue where you could not see any new variables or custom block callers, as well as fixing the issue where the toolbox did not update from then on.
 2019-01-31 16:42:56 -05:00
Paul Kaplan 704b52c944 Make uploaded sprites not draggable 2019-01-31 14:45:40 -05:00
chrisgarrity 0d283c529a Merge pull request #4462 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1548885087 
Update scratch-blocks to the latest version 🚀
0.1.0-prerelease.20190131130145 		2019-01-31 13:51:11 +01:00
greenkeeper[bot] 2e5afcfd06 chore(package): update scratch-vm to version 0.2.0-prerelease.20190130220715 2019-01-30 22:10:20 +00:00
greenkeeper[bot] db43827a8d chore(package): update scratch-blocks to version 0.1.0-prerelease.1548885087 2019-01-30 21:53:56 +00:00
Paul Kaplan db49359af7 Merge pull request #4449 from paulkaplan/improve-toolbox-perf 
Only update the toolbox when the blocks tab is visible.
 2019-01-30 15:01:01 -05:00
Paul Kaplan 719c5d3c6f Merge branch 'develop' into improve-toolbox-perf 2019-01-30 14:47:06 -05:00
Paul Kaplan 45659f23d6 Merge pull request #4457 from kchadha/update-project-changes-test 
Update project changes test
 2019-01-30 14:30:43 -05:00