ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,835 Commits 3 Branches 499 Tags
bf5f30de4ad02e5726bb514700592efc680db0eb
Commit Graph
3835 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Sliwinski bf5f30de4a Merge branch 'develop' into greenkeeper/scratch-l10n-3.0.20181024221158 2018-10-25 09:41:48 -04:00
Andrew Sliwinski f3813427ab Merge pull request #3513 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1540417094 
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
 2018-10-25 09:35:08 -04:00
Ray Schamp 99caafa4d0 Merge pull request #3491 from rschamp/storage-no-cache 
Use assets stored in the vm instead of storage
 2018-10-25 11:13:41 +01:00
Ray Schamp 67722bb94e Update scratch-vm 
This version is needed to work with the other storage changes made to GUI
 2018-10-25 11:04:25 +01:00
Ray Schamp 5be07124a3 Fix merge error 
Good catch @kchadha!
 2018-10-25 11:03:16 +01:00
Ray Schamp d52aba0b4e Rename cacheAsset to better reflect what it does 2018-10-25 11:03:16 +01:00
Ray Schamp 60ca790b69 Lint 2018-10-25 11:03:16 +01:00
Ray Schamp e331232b00 Retrieve assets from the VM rather than storage 2018-10-25 11:03:16 +01:00
Ray Schamp 1a0bf07ea6 Stop using builtinHelper.cache 
And start just creating assets to hand to the VM. Towards https://github.com/LLK/scratch-vm/issues/1577
 2018-10-25 11:03:16 +01:00
Ray Schamp f64243d553 Merge pull request #3505 from chrisgarrity/issue/fix-translation-issues 
Add @babel/cli for generating translation strings
 2018-10-25 10:20:22 +01:00
DD Liu f4a94b3715 chore(package): update scratch-render to version 0.1.0-prerelease.20181024220305 (#3507) 
Closes #3504
 2018-10-24 22:30:02 -04:00
greenkeeper[bot] 0c3bb0744c chore(package): update scratch-l10n to version 3.0.20181024221158 2018-10-24 22:18:39 +00:00
DD Liu 2035bd5781 chore(package): update scratch-paint to version 0.2.0-prerelease.20181024214759 (#3503) 
Closes #3498
 2018-10-24 18:10:00 -04:00
greenkeeper[bot] 49e68ea543 chore(package): update scratch-svg-renderer to version 0.2.0-prerelease.20181024192149 (#3496) 2018-10-24 17:52:06 -04:00
chrisgarrity f88d2b75f5 Add @babel/cli for generating translation strings 2018-10-24 17:47:14 -04:00
greenkeeper[bot] 3a49550217 chore(package): update scratch-blocks to version 0.1.0-prerelease.1540417094 
Closes #3502
 2018-10-24 21:40:41 +00:00
Andrew Sliwinski 52f050e789 Merge pull request #3497 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1540403722 
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
 2018-10-24 15:47:58 -04:00
greenkeeper[bot] a65c39a4f9 chore(package): update scratch-blocks to version 0.1.0-prerelease.1540403722 
Closes #3494
 2018-10-24 19:03:00 +00:00
Benjamin Wheeler 4ab73a77ee Merge pull request #3461 from benjiwheeler/remix 
can remix, can save as copy; project state names are more consistent
 2018-10-24 13:24:25 -04:00
Andrew Sliwinski 44daf84146 Merge pull request #3492 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1540395268 
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
 2018-10-24 12:58:11 -04:00
Andrew Sliwinski 3c01eb221b Merge pull request #3486 from ericrosenbaum/bugfix/unique-tutorial-ids 
Make tutorial ids unique
 2018-10-24 12:47:15 -04:00
Ben Wheeler 5f19b7e272 updated to conform to merged changes to error handling 2018-10-24 11:51:53 -04:00
Paul Kaplan e2f1e37e3a Merge pull request #3478 from LLK/tutorial-tags 
Add tutorial filters and tags, and fix translated search in libraries
 2018-10-24 11:45:58 -04:00
greenkeeper[bot] 718b703bbe chore(package): update scratch-blocks to version 0.1.0-prerelease.1540395268 
Closes #3475
 2018-10-24 15:42:32 +00:00
Ben Wheeler 80f4e01d47 remix and save as a copy functionality 
made remixing, saving as copy states; made project state naming more consistent

changed meaning of canCreateNew to true creation

fixed project-saver-hoc test

removed Remix option from standalone player menu; renamed canSaveAsCopy to canCreateCopy

added parenthesis missing from rebase

fixed create new test
 2018-10-24 11:29:35 -04:00
Benjamin Wheeler 4fd0019d5d Merge pull request #3436 from benjiwheeler/project-state-error 
use project state error for project state related errors
 2018-10-24 11:17:48 -04:00
Benjamin Wheeler 9b5139977b Merge pull request #3490 from benjiwheeler/connection-modal-quick-fix 
added missing onOpenConnectionModal
 2018-10-24 11:16:49 -04:00
Ben Wheeler 7b100b2582 added missing onOpenConnectionModal 2018-10-24 09:41:54 -04:00
Ray Schamp 886e5dcdff Merge pull request #3488 from LLK/greenkeeper/scratch-storage-1.1.0 
Update scratch-storage to the latest version 🚀
 2018-10-24 13:06:26 +01:00
greenkeeper[bot] 7bffc808be chore(package): update scratch-storage to version 1.1.0 2018-10-24 10:56:21 +00:00
Eric Rosenbaum d6cb0aa7ed make tutorial ids unique 2018-10-23 20:48:11 -04:00
kosiecki17 214ec26796 Adding HoC Tutorials (#3479) 
* Adding 2 HoC Tutorials

* HoC Tutorials

* HoC Tutorials
 2018-10-23 18:05:01 -04:00
Andrew Sliwinski 23a9458e20 Merge pull request #3480 from LLK/greenkeeper/scratch-audio-0.1.0-prerelease.20181023202904 
chore(package): update scratch-audio to version 0.1.0-prerelease.2018…
 2018-10-23 17:15:41 -04:00
Andrew Sliwinski 6f5216d14c Merge pull request #3476 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181023192708 
Update scratch-vm to the latest version 🚀
 2018-10-23 16:50:02 -04:00
Andrew Sliwinski 7a444f5d4e Merge pull request #3477 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20181023192935 
Update scratch-render to the latest version 🚀
 2018-10-23 16:49:45 -04:00
greenkeeper[bot] f07ed5fd2c chore(package): update scratch-audio to version 0.1.0-prerelease.20181023202904 
Closes #3474
 2018-10-23 20:31:19 +00:00
Eric Rosenbaum 31909d797f Move connection modal into redux (#3459) 
* Connection Modal loads its own data

* Connection does not update flyout status buttons

* WIP moving connection modal into redux

* Lint fix and remove unused prop

* Close modal even if exception on disconnect
 2018-10-23 16:27:27 -04:00
Paul Kaplan db1d5bd25f Merge pull request #3473 from paulkaplan/switch-to-code-after-sprite 
Make sure to switch back to code when adding new sprites
 2018-10-23 16:21:16 -04:00
Paul Kaplan 25249f9ffd Go back to the code tab after restoring a deleted sprite as well 2018-10-23 15:48:42 -04:00
Paul Kaplan 9ff25ab93e Add tutorial filters and tags, and fix translated search in libraries 2018-10-23 15:34:43 -04:00
greenkeeper[bot] aa9007450c chore(package): update scratch-render to version 0.1.0-prerelease.20181023192935 2018-10-23 19:31:12 +00:00
greenkeeper[bot] b041d0e00b chore(package): update scratch-vm to version 0.2.0-prerelease.20181023192708 2018-10-23 19:29:43 +00:00
chrisgarrity 837f99d955 Merge pull request #3458 from chrisgarrity/issue/3439-sprite-tooltips 
Override default tooltip location
 2018-10-23 13:26:33 -04:00
Paul Kaplan 57aed74998 Merge pull request #3470 from paulkaplan/fix-dragging-tiles 
Fix dragging tiles
 2018-10-23 12:21:52 -04:00
Paul Kaplan b12ea50c3d Make sure to switch back to code when adding new sprites 2018-10-23 12:16:47 -04:00
Ben Wheeler 885d0b5453 error can be object or string 2018-10-23 12:05:41 -04:00
Eric Rosenbaum 133a86a110 Add a space after ‘apple’ in the join block (#3467) 
* Add a space after ‘apple’ in the join block

* Fix integration test
 2018-10-23 11:53:26 -04:00
Paul Kaplan f6b5253550 Update snapshots 2018-10-23 11:52:35 -04:00
Paul Kaplan 2d39518858 Make sure the image itself is not draggable on sprite tilese 2018-10-23 11:44:48 -04:00
Paul Kaplan 2269964004 Fix the getCostumeUrl reference that was left over 2018-10-23 11:44:36 -04:00