ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,596 Commits 3 Branches 499 Tags
ca7e4e5c7e82bce8afd3087f1a070e6c3c5c50b1
Commit Graph
4596 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Kaplan ca7e4e5c7e Merge pull request #4157 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181219200003 
Update scratch-vm to the latest version 🚀
 2018-12-20 08:30:14 -05:00
Paul Kaplan ef43a17c1e Merge pull request #4156 from paulkaplan/only-trigger-saves-from-editor 
Ignore projectChange updates from the VM when not in editor mode
 2018-12-20 08:29:56 -05:00
Paul Kaplan 8f554a74e0 Merge pull request #4158 from paulkaplan/fix-unload-alert 
Do not remove the window beforeunload handler in componentWillUnmount.
 2018-12-20 08:29:17 -05:00
greenkeeper[bot] 4a2f22f728 chore(package): update scratch-vm to version 0.2.0-prerelease.20181219200003 2018-12-19 21:37:39 +00:00
Paul Kaplan c492602a9f Do not remove the window beforeunload handler in componentWillUnmount. 
This is because when switching from project to editor view, this component gets unmounted and then remounted, but the componentDidMount seems to happen before the componentWillUnmount. Because it is dealing with a global variable, it is unsafe to always unset the beforeunload when unmounting.
 2018-12-19 16:37:32 -05:00
Paul Kaplan c799541d8e Ignore projectChange updates from the VM when not in editor mode 
This prevents unnecassary changes that do not matter to the player view because they were made by the project in progress (i.e. made by running the blocks, or by cloud var updates)
 2018-12-19 16:02:31 -05:00
Paul Kaplan 8a19bab3b4 Merge pull request #4152 from ericrosenbaum/feature/add-city-and-bedroom-assets 
Add city and bedroom assets
 2018-12-19 14:25:52 -05:00
Paul Kaplan 28f6b5eb6e Merge pull request #4150 from ktbee/update-scratch-storage 
Update scratch-storage package
 2018-12-19 14:25:41 -05:00
Paul Kaplan 9b3c84737b Merge pull request #4151 from paulkaplan/show-error-id 
Show error ID if available from Raven and report react errors
 2018-12-19 14:16:58 -05:00
Eric Rosenbaum 8263a734ca Add city and bedroom assets 2018-12-19 13:55:22 -05:00
Paul Kaplan 40ca680e39 Show error ID if available from Raven 2018-12-19 13:39:56 -05:00
Eric Rosenbaum 6355abe0a8 Merge pull request #4149 from ericrosenbaum/bugfix/library-update-fixes 
Sprite and costume library fixes
 2018-12-19 13:38:57 -05:00
Eric Rosenbaum 0f83046f7d Zebrafixes 2018-12-19 13:28:33 -05:00
Eric Rosenbaum ba06a64e9d Fixilations 2018-12-19 13:20:03 -05:00
Eric Rosenbaum 2c7ffe9f3b Fixifications 2018-12-19 13:16:54 -05:00
Eric Rosenbaum 010078d8a7 Yet more fixes 2018-12-19 13:15:33 -05:00
Eric Rosenbaum 400fc676a9 More fixes 2018-12-19 13:14:34 -05:00
Chris Willis-Ford 0544641515 Merge pull request #4113 from cwillisf/isScratchDesktop 
Add a helper function to check if GUI is running in Scratch Desktop
 2018-12-19 10:00:51 -08:00
Christopher Willis-Ford af50ac76bf Remove ready check from isScratchDesktop() 
This was intended as a safety check but it causes problems with some
tests.
 2018-12-19 09:50:27 -08:00
Eric Rosenbaum 829616db44 Sprite and costume library fixes 2018-12-19 12:48:37 -05:00
Christopher Willis-Ford 75053b52d1 Don't use Object.keys() 2018-12-19 08:49:46 -08:00
Katie Broida 8f9793c331 Update scratch-storage package 2018-12-19 11:12:38 -05:00
Paul Kaplan b5b3f33f58 Merge pull request #4081 from paulkaplan/more-beefers 
Make the requiredProjectId work with the online editor
 2018-12-19 09:17:05 -05:00
Paul Kaplan 12ea49bc57 Open the editor view of the required project 2018-12-19 09:05:11 -05:00
Paul Kaplan 6647eb9174 Merge pull request #4115 from towerofnix/fix-touchevent-error 
Fix "TouchEvent is not defined" error
 2018-12-19 09:01:35 -05:00
Christopher Willis-Ford b9dc953ded Derive isScratchDesktop state from a GUI prop 2018-12-19 01:10:27 -08:00
Benjamin Wheeler b3e97adb46 Merge pull request #4134 from benjiwheeler/save-before-upload 
When user uploads project file, project will auto-save before loading
 2018-12-18 16:23:15 -05:00
Ben Wheeler f5e2d3ddea set title correctly 2018-12-18 16:08:29 -05:00
Ben Wheeler ac730dd336 got tests passing 2018-12-18 15:50:57 -05:00
Paul Kaplan 369cdd215c Merge pull request #4135 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1545162154 
Update scratch-blocks to the latest version 🚀
 2018-12-18 15:45:57 -05:00
Paul Kaplan 910d2b3774 Make the requiredProjectId work with the online editor 2018-12-18 15:25:17 -05:00
Karishma Chadha d63a7ad625 Merge pull request #4132 from kchadha/remove-extra-logs 
Remove unnecessary console logs that occur when sending and receiving cloud messages.
 2018-12-18 15:18:55 -05:00
Ben Wheeler 566ec2aa1c added project states for sb file upload; refactored uploader 2018-12-18 14:58:03 -05:00
greenkeeper[bot] 853b0b0483 chore(package): update scratch-blocks to version 0.1.0-prerelease.1545162154 2018-12-18 19:45:40 +00:00
Paul Kaplan adaf2dd76b Merge pull request #4133 from ericrosenbaum/feature/super-mega-library-update 
Super mega library update!
 2018-12-18 14:17:41 -05:00
Eric Rosenbaum 6242a1650f Update all the things! 2018-12-18 13:58:07 -05:00
DD Liu f763f932d0 Merge pull request #4090 from fsih/addCostumeFromLibrary 
Call add costume from library to fix bounding box issues with some library sprites
 2018-12-18 13:49:51 -05:00
DD 8fc09eb050 Call add costume from library to fix bounding box issues with some library sprites 2018-12-18 13:34:32 -05:00
Paul Kaplan cc7a149ac9 Merge pull request #4131 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181218172555 
Update scratch-vm to the latest version 🚀
 2018-12-18 13:15:13 -05:00
Karishma Chadha 83a1498015 Remove unnecessary console logs that occur when sending and receiving cloud messages. 2018-12-18 13:15:04 -05:00
greenkeeper[bot] eb04421bc0 chore(package): update scratch-vm to version 0.2.0-prerelease.20181218172555 2018-12-18 17:51:29 +00:00
Paul Kaplan a4674aca9c Fix comma error from previous commit 2018-12-18 12:38:28 -05:00
Paul Kaplan 6d811014c3 Fix removed package from #4128 2018-12-18 12:37:54 -05:00
Paul Kaplan 4190f43daf Merge pull request #4128 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20181218160410 
Update scratch-render to the latest version 🚀
 2018-12-18 12:27:00 -05:00
Paul Kaplan ed394bb3ea Merge branch 'develop' into greenkeeper/scratch-render-0.1.0-prerelease.20181218160410 2018-12-18 12:26:49 -05:00
Paul Kaplan bf44b553c5 Merge pull request #4129 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20181218161344 
Update scratch-paint to the latest version 🚀
 2018-12-18 12:26:25 -05:00
Paul Kaplan ef589ff684 Merge pull request #4130 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181218163005 
Update scratch-vm to the latest version 🚀
 2018-12-18 12:26:10 -05:00
Paul Kaplan 03ec2d0982 Merge branch 'develop' into greenkeeper/scratch-vm-0.2.0-prerelease.20181218163005 2018-12-18 12:26:03 -05:00
DD Liu b71eb73be3 Merge pull request #4124 from LLK/greenkeeper/scratch-svg-renderer-0.2.0-prerelease.20181218153528 
Update scratch-svg-renderer to the latest version 🚀
 2018-12-18 12:11:57 -05:00
greenkeeper[bot] b6ca5d3671 chore(package): update scratch-vm to version 0.2.0-prerelease.20181218163005 2018-12-18 16:57:52 +00:00