ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,015 Commits 3 Branches 499 Tags
cae9d9a683b526fd03b65817cd4701780eeaeff5
Commit Graph
2711 Commits
Author SHA1 Message Date
Paul Kaplan cae9d9a683 Merge branch 'develop' into nj/ui-changes 2019-02-12 09:04:31 -05:00
Paul Kaplan 7563eddb2b Merge pull request #4509 from LLK/gif-upload 
Gif upload v1: sprites, costumes
 2019-02-11 10:12:40 -05:00
Paul Kaplan 1d617214b4 Simplify disposal method handling 2019-02-11 09:28:16 -05:00
Nikhil Jha fb9c3eed74 Merge branch 'develop' into nj/ui-changes 2019-02-08 20:21:32 -08:00
Paul Kaplan b618f2493c Fix backdrop uploading from gif 2019-02-08 13:56:00 -05:00
Paul Kaplan 8dad7d8ec0 Remove extra parens 2019-02-08 13:45:30 -05:00
Paul Kaplan a18ea5a92c Name uploaded backdrops based on the name 2019-02-08 13:44:10 -05:00
Paul Kaplan 7c1d720e17 Merge pull request #4485 from towerofnix/sort-of-variables 
Sort variable options in "of" block
 2019-02-08 13:37:27 -05:00
Paul Kaplan b29862fc96 Merge pull request #4498 from mzgoddard/lazy-text-encoder 
require text-encoding only if it is needed
 2019-02-08 13:27:19 -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 28635d8028 Remove namer from costume and sound upload helpers to reduce spaghetti 2019-02-08 13:18:57 -05:00
Paul Kaplan ba277a5238 Fix namer conventions to be less bizarre 2019-02-08 13:18:57 -05:00
Paul Kaplan 489467e63d Pass function for naming costumes, add integration tests 2019-02-08 13:18:57 -05:00
Paul Kaplan 88651e6e48 Gif upload v1: sprites, costumes 2019-02-08 13:18:57 -05: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
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
Nikhil Jha 781c682e60 Merge branch 'develop' into nj/ui-changes 2019-02-06 14:56:46 -08: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 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 8a46b8f71b Make file uploader call callback for each uploaded file 2019-02-06 12:09:32 -05:00
Florrie 9166cb12d5 Don't refer to scratchBlocksUtils from scratch-gui 2019-02-06 12:24:16 -04: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
Michael "Z" Goddard 66a9607bc7 require text-encoding only if it is needed 2019-02-06 10:32:12 -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
Florrie c6c5d61039 Sort variable options in "of" block 2019-02-04 16:03:44 -04: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 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 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 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
Luke Schlangen 4dc2501e5c add empty object to abject assign 2019-02-03 15:16:45 -06:00
Luke Schlangen bf09d9c3d0 retain showBranding after SET_FULL_SCREEN 2019-02-03 11:55:32 -06:00
Nikhil Jha 9232b1c656 Merge branch 'develop' into nj/ui-changes 2019-02-01 15:19:38 -08: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 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 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