Commit Graph
3886 Commits
Author SHA1 Message Date
Karishma Chadha a00a529858 Merge pull request #3539 from kchadha/cloud-connect
Cloud Data Provider
2018-10-30 14:06:46 -04:00
Karishma Chadha 52b3d44eb2 Update VM package. 2018-10-30 13:06:23 -04:00
Chris Willis-Ford b18b428ace Merge pull request #3495 from cwillisf/custom-storage-init-hook
Add a hook for custom storage init
2018-10-30 09:36:05 -07:00
chrisgarrity e818269c3a Merge pull request #3568 from LLK/master
Merge hot fix from Master
2018-10-30 12:33:15 -04:00
chrisgarrity 6df5758455 Merge pull request #3565 from chrisgarrity/issue/hotfix-project-load
Issue/hotfix project load
2018-10-30 11:39:27 -04:00
chrisgarrity 38218cb5ba Don’t reload default project when id doesn’t change
Fixes the issue where the default project reloads when the locale changes.

Why is SET_PROJECT_ID getting dispatched on locale change?
2018-10-30 10:09:07 -04:00
Karishma Chadha dc7db4c262 Add docs and make capitalization/naming of props consistent. 2018-10-29 18:43:26 -04:00
DD Liu 96071be18d chore(package): update scratch-paint to version 0.2.0-prerelease.20181029151725 (#3548)
Closes #3516
2018-10-29 14:42:01 -04:00
Paul Kaplan 2c970fe366 Merge pull request #3547 from LLK/smoke
Bring in hotfix changes from smoke
2018-10-29 11:49:38 -04:00
Paul Kaplan d4553f3809 Merge pull request #3544 from LLK/smoke
Deploy October work to Beta
2018-10-29 11:48:56 -04:00
Paul Kaplan 5314426203 Merge pull request #3523 from ericrosenbaum/feature/spicy-beefers-hack
Hack to load a starter project for a specific tutorial
2018-10-29 11:01:55 -04:00
Eric Rosenbaum 319e326e00 Hack to load starter project for CN tutorial 2018-10-29 11:00:16 -04:00
Paul Kaplan 0a78bebd97 Merge branch 'master' into smoke 2018-10-29 10:48:05 -04:00
Paul Kaplan bb8e934684 Merge pull request #3540 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20181029125804
Update scratch-render to the latest version 🚀
2018-10-29 10:45:41 -04:00
chrisgarrity 0785ffaa10 Merge pull request #3532 from chrisgarrity/issue/fix-ie-intl
Restore IntlProvider for Internet Explorer
2018-10-29 09:59:25 -04:00
greenkeeper[bot] 75c2096182 chore(package): update scratch-render to version 0.1.0-prerelease.20181029125804 2018-10-29 12:59:41 +00:00
Karishma Chadha e0a1fdfa38 Add API to close connection and clean up cloud provider. 2018-10-29 01:02:09 -04:00
Karishma Chadha 25b8fac357 Set up cloud provider and attach it to the VM. Obtain information about cloud host and username from props. 2018-10-27 14:13:42 -04:00
Karishma Chadha 4bbe670431 Create a cloud provider to create and manage a connection to the web socket. 2018-10-27 14:12:10 -04:00
chrisgarrity 03415086da Restore IntlProvider for Internet Explorer
GUI includes its own Intl provider (react-intl supports nested intl providers) that works within the www intl provider.

Restore the app-state provider intl provider and app-stat-hoc for the stand-alone gui so that IE can function enough to put up the unsupported browser.
2018-10-26 21:06:50 -04:00
Benjamin Wheeler 1bca98c868 Merge pull request #3508 from benjiwheeler/share-remix-buttons
shared and remix buttons
2018-10-26 17:58:49 -04:00
Benjamin Wheeler 292ac7a469 Merge pull request #3529 from benjiwheeler/ensmallen-npm
Don't publish playground or test files to npm
2018-10-26 13:54:10 -04:00
Ray Schamp a1ca4768b3 Don't publish playground or test files to npm
The package is too large to publish to NPM. These aren't necessary for other packages using scratch-gui as a module.
2018-10-26 13:51:48 -04:00
Ben Wheeler 12f5fafa46 set gui defaultProps to display remix and share buttons consistently 2018-10-26 13:15:08 -04:00
Paul Kaplan 3b1e32f33c Merge pull request #3525 from paulkaplan/prevent-targets-dispatch
Only dispatch targetsUpdate events if the full editor is visible
2018-10-26 13:12:14 -04:00
Ray Schamp 5877c18094 Merge pull request #3528 from rschamp/ensmallen-npm
Don't publish playground or test files to npm
2018-10-26 17:25:04 +01:00
Ray Schamp dac7aa04c7 Don't publish playground or test files to npm
The package is too large to publish to NPM. These aren't necessary for other packages using scratch-gui as a module.
2018-10-26 17:13:38 +01:00
Ray Schamp 91dbd33e09 Merge pull request #3527 from rschamp/hotfix/record-sound
[Develop] Fix typo accessing storage in record modal
2018-10-26 17:00:45 +01:00
Ray Schamp 6fa90a51ff Merge pull request #3526 from rschamp/hotfix/record-sound
[Smoke] Fix typo accessing storage in record modal
2018-10-26 17:00:28 +01:00
Ray Schamp e4f41c899d Fix typo accessing storage in record modal 2018-10-26 16:57:32 +01:00
Paul Kaplan 98303e31b7 Only dispatch targetsUpdate events if the full editor is visible
We do not need these events when in fullscreen or player mode, and even if they do not change anything, the dispatch takes time.

This also re-requests a vm.emitTargetsUpdate when transitioning from fullscreen/player back to editor mode to make sure the most recent data is shown.
2018-10-26 10:58:42 -04:00
Ray Schamp 13ce9a6f6b Merge pull request #3521 from rschamp/hotfix/tutorial-names
[Smoke] Use names for tutorial URL ids
2018-10-25 19:47:51 +01:00
Ray Schamp 28ea8a592c Merge pull request #3520 from rschamp/hotfix/tutorial-names
[Develop] Use names for tutorial URL ids
2018-10-25 19:47:43 +01:00
Ray Schamp 22f0fd8af4 Map some of the 2.0 tutorial ids 2018-10-25 19:38:31 +01:00
Ray Schamp 3b90ac207b Return early if no query param
This prevents a tutorial with no urlId being returned in the case of no tutorial query param

Nice catch @kchadha!
2018-10-25 19:22:16 +01:00
Ray Schamp e2d5a88549 Use names for tutorial URL ids 2018-10-25 18:07:12 +01:00
Andrew Sliwinski 79a43cc281 Merge pull request #3515 from LLK/develop
Merge to Smoke Branch
2018-10-25 10:28:32 -04:00
Andrew Sliwinski ab25a6ca33 Merge pull request #3514 from carljbowman/develop
Update tutorial and close icons
2018-10-25 10:00:43 -04:00
Andrew Sliwinski 628f362494 Merge branch 'smoke' into develop 2018-10-25 09:59:44 -04:00
Andrew Sliwinski 9d352de470 Merge pull request #3506 from LLK/greenkeeper/scratch-l10n-3.0.20181024221158
Update scratch-l10n to the latest version 🚀
2018-10-25 09:42:02 -04:00
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
carljbowman 9132c2cad0 Update tutorial and close icons
Adjusted the hierarchy of these icons. Close icon is now smaller and less prominent.
2018-10-25 09:29:28 -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