Commit Graph
1829 Commits
Author SHA1 Message Date
Paul Kaplan ca3e9ec00a Merge pull request #1640 from LLK/greenkeeper/chromedriver-2.37.0
Update chromedriver to the latest version 🚀
2018-03-26 13:07:43 -04:00
Paul Kaplan c6318964af Merge pull request #1665 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180326153721
Update scratch-paint to the latest version 🚀
2018-03-26 12:33:15 -04:00
Paul Kaplan c57ff54273 Merge branch 'develop' into greenkeeper/scratch-paint-0.2.0-prerelease.20180326153721 2018-03-26 11:59:18 -04:00
Paul Kaplan fcb8b9b3ab Merge pull request #1660 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.1521830325
Update scratch-render to the latest version 🚀
2018-03-26 11:58:19 -04:00
Paul Kaplan 4e8af2cd9d Include the update for scratch-vm to stay in sync 2018-03-26 11:43:33 -04:00
greenkeeper[bot] fb93e14315 chore(package): update scratch-paint to version 0.2.0-prerelease.20180326153721 2018-03-26 15:38:31 +00:00
greenkeeper[bot] 9095a9e378 chore(package): update scratch-render to version 0.1.0-prerelease.1521830325 2018-03-23 18:39:16 +00:00
Paul Kaplan 97dc45b08f Merge pull request #1647 from paulkaplan/rotate-messages
Make the loader message update every 5 seconds
2018-03-23 14:37:23 -04:00
kchadha 3ccd7f54c1 Merge pull request #1621 from kchadha/loading-states
Load Button Loading/Error State
2018-03-23 10:48:11 -04:00
kchadha f6c71219a4 Merge branch 'develop' into loading-states 2018-03-23 10:35:01 -04:00
Karishma Chadha dac58b6b2c Updating scratch-vm version in package.json 2018-03-23 10:32:33 -04:00
Karishma Chadha 004b586cad Revert "Changes to hash should happen through project loader hoc. Changes to the current project id and current project data should happen in a reducer since they are part of global state. That way, the load button can affect the global project data as well."
This reverts commit e4fe143ba6.
2018-03-23 10:06:54 -04:00
Paul Kaplan 51259e921f Merge pull request #1637 from paulkaplan/stage-clicked
Conditionally use "when stage clicked" vs "when this sprite clicked"
2018-03-23 09:52:13 -04:00
Paul Kaplan 8af45dbb1a Merge pull request #1657 from LLK/greenkeeper/scratch-vm-0.1.0-prerelease.1521811835-prerelease.1521811852
chore(package): update scratch-vm to version 0.1.0-prerelease.1521811…
2018-03-23 09:51:49 -04:00
Paul Kaplan c043d15514 Merge pull request #1656 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1521811349
Update scratch-blocks to the latest version 🚀
2018-03-23 09:39:56 -04:00
Paul Kaplan 5535d17dfe Merge pull request #1582 from fsih/addBackdropIndexChange
Costume tab detects added costume and switches to the current costume of the edit target
2018-03-23 09:36:52 -04:00
greenkeeper[bot] 5031340cad chore(package): update scratch-vm to version 0.1.0-prerelease.1521811835-prerelease.1521811852
Closes #1636
2018-03-23 13:32:32 +00:00
Paul Kaplan ff56027879 Merge pull request #1641 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180320181154
Update scratch-paint to the latest version 🚀
2018-03-23 09:31:28 -04:00
Paul Kaplan 69d887cefb Fix typo
FWIW the AP style guide recommends "emojis", although many dictionaries
also recognize "emoji" as the plural because that is the plural in the
original Japanese.
2018-03-23 09:27:40 -04:00
Paul Kaplan 630c12bad7 Fix linting 2018-03-23 09:23:47 -04:00
greenkeeper[bot] 050d0d8a55 chore(package): update scratch-blocks to version 0.1.0-prerelease.1521811349 2018-03-23 13:23:34 +00:00
Karishma Chadha 7ea295df48 Recorded sounds should have actual md5s. 2018-03-22 16:11:43 -04:00
Karishma Chadha c4b44ccd05 Make load button work with new changes. 2018-03-22 16:09:47 -04:00
Karishma Chadha e4fe143ba6 Changes to hash should happen through project loader hoc. Changes to the current project id and current project data should happen in a reducer since they are part of global state. That way, the load button can affect the global project data as well. 2018-03-22 15:09:26 -04:00
chrisgarrity 2f7c44387b Merge pull request #1648 from chrisgarrity/issue/1460-more-unsupported
Add more browsers to the unsupported list

Fixes #1460
2018-03-22 13:56:57 -04:00
DD db54b64fdc Implement Pauls suggestion and remove promises 2018-03-22 10:54:18 -04:00
Karishma Chadha 6aec034acd Remove .sb from file browser filter since we can't support them yet. Remove .zip from the same. Save project as .sb3 (and untitled-project). 2018-03-21 18:03:38 -04:00
Karishma Chadha bb3a4572c9 Default project should have correct property names for md5+ext. 2018-03-21 16:52:58 -04:00
Karishma Chadha 47e2bbbdc7 Pretty print default project json. 2018-03-21 16:36:30 -04:00
Karishma Chadha 73ec43d0b3 Revert "Rename md5 property in default sb3 project to md5ext to reflect it's actual contents."
scratch-audio depends on sound property being called md5 even though it refers to md5+file ext,
so this property cannot be renamed just yet.

This reverts commit dee7195fac.
2018-03-21 12:38:55 -04:00
chrisgarrity 8861eca99b Add more browsers to the unsupported list
Added:
- Opera (including Opera Mini)
- Silk

Not Added:
- Vivialdi - appears to be ‘Chrome’ in `platform.name`
2018-03-21 11:17:07 -04:00
Karishma Chadha dee7195fac Rename md5 property in default sb3 project to md5ext to reflect it's actual contents. 2018-03-21 11:16:34 -04:00
Paul Kaplan 5f8ce77b7d Make the loader message update every 5 seconds 2018-03-21 08:53:51 -04:00
greenkeeper[bot] 680399cad2 chore(package): update scratch-paint to version 0.2.0-prerelease.20180320181154 2018-03-20 19:31:49 +00:00
greenkeeper[bot] 5f17d70e19 chore(package): update chromedriver to version 2.37.0 2018-03-20 18:46:24 +00:00
Paul Kaplan 81a0011b80 Merge pull request #1639 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1521560313
Update scratch-blocks to the latest version 🚀
2018-03-20 11:01:24 -07:00
greenkeeper[bot] e70b906afe chore(package): update scratch-blocks to version 0.1.0-prerelease.1521560313 2018-03-20 15:40:00 +00:00
Paul Kaplan 435d132f4d Merge pull request #1608 from paulkaplan/fix-asset-panel-warnings
Fix proptype warnings for asset panel buttons
2018-03-20 08:23:42 -07:00
Paul Kaplan 71e4da8e7c Conditionally use "when stage clicked" vs "when this sprite clicked" 2018-03-20 10:42:33 -04:00
DD Liu 64f790b327 Merge pull request #1631 from fsih/noPreventDefaultKeyboard
Don't prevent default on keyboard events
2018-03-20 10:33:47 -04:00
Paul Kaplan c0c1b865c7 Merge pull request #1634 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180316191214
chore(package): update scratch-paint to version 0.2.0-prerelease.2018…
2018-03-20 06:30:13 -07:00
Paul Kaplan 59cd63d0cb Merge pull request #1633 from LLK/greenkeeper/scratch-vm-0.1.0-prerelease.1521481406-prerelease.1521481427
chore(package): update scratch-vm to version 0.1.0-prerelease.1521481…
2018-03-20 06:29:57 -07:00
Eric Rosenbaum 0ce265a507 Merge pull request #1620 from ericrosenbaum/bugfix/stable-scroll-position
Hold scroll position on switching sprites
2018-03-19 17:01:22 -04:00
Paul Kaplan f72fb79218 Merge pull request #1616 from LLK/greenkeeper/react-modal-3.3.2
Update react-modal to the latest version 🚀
2018-03-19 12:44:43 -07:00
greenkeeper[bot] 4440ea065c chore(package): update scratch-vm to version 0.1.0-prerelease.1521481406-prerelease.1521481427
Closes #1619
2018-03-19 17:45:50 +00:00
DD baf86ab23c Don't prevent default on keyboard events 2018-03-19 12:07:02 -04:00
greenkeeper[bot] a0bf60cd74 chore(package): update scratch-paint to version 0.2.0-prerelease.20180316191214
Closes #1628
2018-03-16 23:08:59 +00:00
Karishma Chadha 447b2b551a Code cleanup to remove warning for loadingStateVisible property. 2018-03-16 15:13:19 -04:00
DD Liu c7cfeac411 Merge pull request #1596 from fsih/cleanUpPaintWrapper
Clean up some unused prop warnings
2018-03-16 15:08:16 -04:00
Eric Rosenbaum ed1eee713f hold scroll position on switching sprites 2018-03-15 17:28:54 -04:00