ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,668 Commits 3 Branches 499 Tags
38ee27d8969a6fb2e92ea0fe8e0bfdac8fa619c4
Commit Graph
2566 Commits
Author SHA1 Message Date
Christopher Willis-Ford 38ee27d896 Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:24 -07:00
Christopher Willis-Ford 73e1bc352b Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:24 -07:00
Christopher Willis-Ford 46ce75bf2a Prevent crash when opening tutorials library 2019-03-12 15:01:23 -07:00
Christopher Willis-Ford 2c285fee8a Load 6 ScratchImages at a time, prioritize visible 2019-03-12 15:01:08 -07:00
Christopher Willis-Ford d1c3cf8bb0 Move image-from-storage code into new ScratchImage component 2019-03-12 14:38:25 -07:00
Christopher Willis-Ford a09c7ddb53 Clarify getAssetTypeForExtension 2019-03-12 14:38:25 -07:00
Christopher Willis-Ford fec81c93a3 Make sure icon load starts immediately 2019-03-12 14:38:25 -07:00
Christopher Willis-Ford 2b3c70dfc3 Move event processing out of LibraryItemComponent 2019-03-12 14:38:25 -07:00
Christopher Willis-Ford db9236bef2 Fix sprite lib animation: move load into LibraryItem 
The `LibraryItem` component has been split into a container, responsible
for handling interaction with the storage module, and a component,
responsible for presentation. The component now always takes an
`iconURI` and the logic to load an icon from storage has been moved from
`Library` into `LibraryItem`.

TODO: move animation logic from `SpriteLibrary` into `LibraryItem`. This
should simplify the code quite a bit and might also improve performance.
 2019-03-12 14:38:25 -07:00
Andrew Sliwinski a9280c918e Merge pull request #4208 from apple502j/patch-9 
Change WebGL link
 2018-12-27 17:05:48 -05:00
Paul Kaplan 70eb240a7c Use the loading screen in player mode 2018-12-27 10:34:02 -05:00
apple502j 31730cc776 Change WebGL link 2018-12-27 09:46:18 +09:00
picklesrus 9cd41199c5 Fix #4203 by checking whether a target exists before asking whether it has an variables 2018-12-26 16:26:34 -05:00
Karishma Chadha 6b2cf976f6 Fix regex for extracting the project title from a .sb file 2018-12-25 13:17:52 -05:00
Paul Kaplan 3c53bac17b Revert "Make remixing/saving faster by marking all assets as clean to start." 2018-12-21 11:22:16 -05:00
chrisgarrity 543d23970c Merge pull request #4169 from benjiwheeler/translate-validation 
translate form validation string
 2018-12-20 22:02:48 -05:00
Christopher Willis-Ford 86b6e12453 WIP: Load media libs with scratch-storage 
The basics work but hover animations are broken
 2018-12-20 18:45:55 -08:00
Chris Willis-Ford 744076babf Merge pull request #4162 from cwillisf/telemetry-opt-in 
Add telemetry opt-in/opt-out dialog
 2018-12-20 18:44:13 -08:00
Christopher Willis-Ford e3c205a9d1 Update telemetry image placeholder 2018-12-20 16:23:18 -08:00
Andrew Sliwinski 3ba85ebd74 Merge pull request #4172 from ericrosenbaum/bugfix/another-library-update 
More library updates
 2018-12-20 17:37:59 -05:00
Eric Rosenbaum fb6da98bfd More library updates 2018-12-20 17:23:25 -05:00
Christopher Willis-Ford f4daec5160 Don't bundle telemetry modal event handlers 2018-12-20 13:51:26 -08:00
Christopher Willis-Ford ee80e07ade Add telemetry opt-in/opt-out dialog 
The playground now displays this on startup when in Scratch Desktop
simulation mode.
 2018-12-20 13:50:36 -08:00
Karishma Chadha ea54953caf The file uploader file input should accept .sb files as well. 2018-12-20 15:44:01 -05:00
Paul Kaplan 57e841b19b Merge pull request #4146 from paulkaplan/list-import 
Implement list import and export from files
 2018-12-20 13:35:54 -05:00
Paul Kaplan 6c9ae25159 Fix linting 2018-12-20 13:29:44 -05:00
Benjamin Wheeler d76b74e8d4 Merge pull request #4144 from benjiwheeler/library-history2 
On modal mount, push history if current history state doesn't match this modal's id
 2018-12-20 13:24:44 -05:00
Paul Kaplan 6fe27f7691 Remove the error logging to GA, augment Sentry with the action prop 2018-12-20 13:19:44 -05:00
Paul Kaplan 54eea42e15 Remove most of the analytics.pageview events, keeping the search queries 2018-12-20 13:19:24 -05:00
Paul Kaplan 4df56e41ca Include the action in the sentry report 2018-12-20 13:11:07 -05:00
Paul Kaplan 50a917280a Use new sentry API provided by www, and use analytics ID from www 2018-12-20 12:53:33 -05:00
Benjamin Wheeler 19f5b196bd Merge pull request #4160 from benjiwheeler/load-fonts-in-redux 
refactored font loading state to be in redux
 2018-12-20 10:00:37 -05:00
Paul Kaplan 80df9d6f13 Fix issue with undefineds in the CSV 2018-12-20 09:23:33 -05:00
Paul Kaplan fc28a7256d Add txt import so file can be imported/exported from symmetrically 2018-12-20 08:43:07 -05:00
Paul Kaplan 54c8588279 Merge pull request #4153 from paulkaplan/enfasten-remix 
Make remixing/saving faster by marking all assets as clean to start.
 2018-12-20 08:30:26 -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
Ben Wheeler 39e1229c4e translate form validation string 2018-12-19 22:45:57 -05:00
Ben Wheeler 8a9996b247 refactored font loading state to be in redux 2018-12-19 19:45:38 -05: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 faadda3007 Make remixing/saving faster by marking all assets as clean to start. 
They were not being marked as clean when loaded from the server, causing remixes that included only minimal (or no) changes to take a very long time as it waited for hundreds of network requests to resolve. Mark them as clean when loaded from the server so we know they do not need to be resaved
 2018-12-19 15:11:30 -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 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 5ed340c789 Fix typo 2018-12-19 13:51:52 -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