ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,715 Commits 3 Branches 499 Tags
849fe8fc0c4e44e28b0632a4e3f73e1f2b722f87
Commit Graph
4715 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Willis-Ford 849fe8fc0c Merge branch 'develop' into scratch-desktop 2019-03-12 15:01:25 -07:00
Christopher Willis-Ford f600e6095e Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:25 -07:00
Christopher Willis-Ford d952f774dd Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:25 -07:00
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
Paul Kaplan 35ad4cc13b Merge pull request #4304 from chrisgarrity/feature/catch-unsupported-browser 
Revise how unsupported browsers are handled
 2019-01-09 14:36:45 -05:00
chrisgarrity cf5183a3ee Revise how unsupported browsers are handled 
Browsers other than IE will be allowed to load the GUI.
However, if there is an error, the error boundary will display an unsupported browser message recommending they update to the latest version of a supported browser.

For the purposes of this PR, ‘supported’ means you can load the gui (anything other than IE), and recommended is just the browsers that meet our minimum requirements for Chrome, Firefox, Edge and Safari.
 2019-01-09 12:24:01 -05:00
Paul Kaplan 123b0a6881 Merge pull request #4296 from LLK/revert-4287-issue/unsupported-versions 
Revert "Check for minimum versions of recommended browsers"
 2019-01-08 16:10:44 -05:00
Paul Kaplan d3608ead52 Revert "Check for minimum versions of recommended browsers" 2019-01-08 16:08:06 -05:00
Paul Kaplan 73d19d09fe Merge pull request #4295 from LLK/revert-4289-greenkeeper/scratch-render-0.1.0-prerelease.20190108175224 
Revert "Update scratch-render to the latest version 🚀"
 2019-01-08 15:53:41 -05:00
Paul Kaplan e1f1b9d4ec Revert "Update scratch-render to the latest version 🚀" 2019-01-08 15:51:50 -05:00
Paul Kaplan 4af0e92465 Merge pull request #4287 from chrisgarrity/issue/unsupported-versions 
Check for minimum versions of recommended browsers
 2019-01-08 14:02:36 -05:00
Paul Kaplan fe03673537 Merge pull request #4290 from LLK/greenkeeper/scratch-audio-0.1.0-prerelease.20190108181031 
Update scratch-audio to the latest version 🚀
 2019-01-08 13:28:23 -05:00
Paul Kaplan 379c676b7c Merge pull request #4289 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190108175224 
Update scratch-render to the latest version 🚀
 2019-01-08 13:27:38 -05:00
greenkeeper[bot] 88b0094c3f chore(package): update scratch-audio to version 0.1.0-prerelease.20190108181031 2019-01-08 18:14:07 +00:00
greenkeeper[bot] 33232b97ac chore(package): update scratch-render to version 0.1.0-prerelease.20190108175224 2019-01-08 17:53:59 +00:00
chrisgarrity b129c1e1bb Check for minimum versions of recommended browsers 2019-01-08 09:14:07 -05:00
Paul Kaplan 2472ca1f4a Merge pull request #4284 from kchadha/save-project-state-before-storing-assets 
Save project state before storing assets instead of after.
 2019-01-08 08:48:17 -05:00
Karishma Chadha 933bdd7c05 Save project state before storing assets instead of after. 2019-01-07 17:14:51 -05:00
Paul Kaplan 69aa8c0946 Merge pull request #4282 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190107184530 
Update scratch-vm to the latest version 🚀
 2019-01-07 14:05:47 -05:00
greenkeeper[bot] 2da6ebcacd chore(package): update scratch-vm to version 0.2.0-prerelease.20190107184530 2019-01-07 18:52:52 +00:00
Paul Kaplan d05dc39c27 Merge pull request #4280 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190107163047 
Update scratch-render to the latest version 🚀
 2019-01-07 13:49:40 -05:00
Paul Kaplan 33fa07eec5 Merge pull request #4281 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190107183612 
Update scratch-vm to the latest version 🚀
 2019-01-07 13:49:29 -05:00
greenkeeper[bot] 821afa8f57 chore(package): update scratch-vm to version 0.2.0-prerelease.20190107183612 2019-01-07 18:39:16 +00:00
Paul Kaplan cb04bb10ba Merge pull request #4279 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190107160043 
Update scratch-vm to the latest version 🚀
 2019-01-07 13:20:30 -05:00
Eric Rosenbaum e3345ca1b8 Merge pull request #4023 from epicfaace/features/sound-editor-buttons 
Fix sound editor button spacing
 2019-01-07 11:58:14 -05:00
greenkeeper[bot] 6879635678 chore(package): update scratch-render to version 0.1.0-prerelease.20190107163047 2019-01-07 16:32:22 +00:00
greenkeeper[bot] 3081f0bb77 chore(package): update scratch-vm to version 0.2.0-prerelease.20190107160043 2019-01-07 16:13:35 +00:00
Paul Kaplan 67b9d97c32 Merge pull request #4277 from paulkaplan/fix-sprite-drop-area 
Make the sprite drop area from the backpack highlight and large
 2019-01-07 10:33:04 -05:00
Paul Kaplan cb401ec6d8 Make the sprite drop area from the backpack highlight and large 
Fixes useability issue where the drop area was too small, and you couldn't see it.
 2019-01-07 10:09:03 -05:00
Andrew Sliwinski 8de8c02f6b Merge pull request #4196 from Cqoicebordel/Cqoicebordel-patch-1 
Remove Vivaldi block
 2019-01-04 09:18:32 -05:00
Paul Kaplan 3a4d934f5b Merge pull request #4247 from picklesrus/fix-font-loading 
Stop waiting for non scratch fonts to load.
 2019-01-03 16:37:35 -05:00
picklesrus 97b9f5cf30 Stop waiting for non scratch fonts to load. 2019-01-03 15:32:21 -05:00
Paul Kaplan 95381f25af Merge pull request #4246 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190103190631 
Update scratch-render to the latest version 🚀
 2019-01-03 14:43:06 -05:00
greenkeeper[bot] 87a9febc9d chore(package): update scratch-render to version 0.1.0-prerelease.20190103190631 2019-01-03 19:21:28 +00:00
Paul Kaplan d05e8f0ea5 Merge pull request #4232 from adroitwhiz/develop 
Wrap the stage canvas so that styles are not directly applied to it, fixing bounds calculations
 2019-01-03 11:44:05 -05:00
adroitwhiz 0b228433ba whitespace tweak 2: electric boogaloo 2019-01-02 21:02:41 -05:00
adroitwhiz e23e29b027 whitespace tweak 2019-01-02 20:54:52 -05:00
adroitwhiz 50b7d3ad53 Round off getStageDimensions() 2019-01-02 20:54:36 -05:00
adroitwhiz 98f5210c37 Remove package-lock.json and add to .gitignore 2019-01-02 20:33:32 -05:00
adroitwhiz c6a2da76c3 Fixed blurry stage 2019-01-02 20:31:07 -05:00
Ray Schamp 72730d19dd Merge pull request #4223 from LLK/rschamp-patch-1 
Bump scratch-vm
 2019-01-02 12:56:23 -05:00
Ray Schamp 34d712a9aa Bump scratch-vm 2019-01-02 12:55:48 -05:00