Commit Graph
2180 Commits
Author SHA1 Message Date
Paul Kaplan fc7febb16f Merge pull request #1934 from paulkaplan/revert-localize-error
Revert localization of crash message.
2018-05-02 07:43:56 -04:00
Paul Kaplan 240f1987f7 Merge pull request #1932 from paulkaplan/fix-dragging-nothing
Fix errors when dragging in player mode
2018-05-01 17:03:13 -04:00
Paul Kaplan f6dfe8da38 Revert localization of crash message.
It doesn't work without an intl provider, which is mounted inside the error boundary.
2018-05-01 16:58:08 -04:00
Paul Kaplan 396f21e568 Fix early return to be before draggability checking. 2018-05-01 16:19:37 -04:00
Andrew Sliwinski 6c7c1c36d5 Merge pull request #1921 from thisandagain/feature/tags
Update libraries with new version of libgen
2018-05-01 15:54:37 -04:00
Bryce Taylor e58bf9f674 Update PULL_REQUEST_TEMPLATE.md 2018-05-01 14:24:29 -04:00
Paul Kaplan 2225ec69b6 Merge pull request #1922 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1525125321
Update scratch-blocks to the latest version 🚀
2018-05-01 12:51:12 -04:00
Paul Kaplan 63146f3662 Merge pull request #1924 from kchadha/camera-costume
Upload a costume from camera
2018-05-01 11:04:59 -04:00
Paul Kaplan 0bd6227173 Fix nits 2018-05-01 10:37:26 -04:00
Paul Kaplan 16621261b5 Add 'flash' to differentiate video from photo mode 2018-05-01 10:33:14 -04:00
chrisgarrity be208ba10d Player mode (#1909)
* Player mode

Add isPlayerOnly property on GUI. Move isFullScreen into mode reducer with isPlayerOnly.

Full screen needs to be a separate prop so that GUI knows what to show when exiting full-screen (either player-only or full editor).

- set `gui-body * {box-sizing: border-box;}` instead of expecting it to be set by the enclosing component/playground, and removed uses of content-box (adjusting sizes as needed) 
- Added `!isPlayerOnly` to the conditions for draggable sprites
- rewrote player example to use player mode.
2018-05-01 10:30:42 -04:00
chrisgarrity 29f34efe0b Merge pull request #1920 from chrisgarrity/update-l10n
Add translation to missing strings
2018-05-01 08:23:46 -04:00
Karishma Chadha 254726d9ff Cleanup 2018-04-30 22:59:09 -04:00
Karishma Chadha 421d4d0e9a Localization support in camera modal and some code cleanup. 2018-04-30 22:42:16 -04:00
Karishma Chadha 598ca8af94 Remove unnecessary prop. 2018-04-30 18:01:32 -04:00
greenkeeper[bot] 0d168a8f1b chore(package): update scratch-blocks to version 0.1.0-prerelease.1525125321 2018-04-30 21:59:13 +00:00
Paul Kaplan ebaec99b30 Merge pull request #1918 from paulkaplan/fix-costumes-backdrops-tab
Show "Backdrops" instead of "Costumes" in tab text if stage is selected.
2018-04-30 17:33:13 -04:00
Karishma Chadha 6f41d8a92e Rename camera upload option in action menu. 2018-04-30 17:19:37 -04:00
Karishma Chadha 3c23749e42 Add more UI states (e.g. differentiating between no access, permission granted but video not loaded, video loaded). CSS cleanup. 2018-04-30 17:19:37 -04:00
Karishma Chadha 5d87872361 Move runtime/renderer related code back into the vm io device. Refactor ModalVideoManager to use the video provider. 2018-04-30 17:18:24 -04:00
Karishma Chadha a7a30929b4 Fix lint error. 2018-04-30 17:18:24 -04:00
Karishma Chadha 4b562afac0 Re-take a picture, single media stream, some more styling. 2018-04-30 17:18:24 -04:00
Karishma Chadha 8c0d895cac Camera costume upload functionality. Needs UI and code cleanup. 2018-04-30 17:18:24 -04:00
kchadha abc79fe03c Merge pull request #1880 from kchadha/video-refactor
Refactor Video IO
2018-04-30 16:58:00 -04:00
Andrew Sliwinski 7ca0086507 Clean-up tags on children of sprites 2018-04-30 16:49:37 -04:00
Andrew Sliwinski 5c1a23b56c Fix naming / tags on basketball sprites 2018-04-30 16:37:04 -04:00
Andrew Sliwinski 603e9ba4a1 Fix tagging on Casey sprite / costumes 2018-04-30 16:35:14 -04:00
Andrew Sliwinski 9dcc9c4d3c Update libraries with new version of libgen 2018-04-30 16:32:34 -04:00
Karishma Chadha 6eaba09189 Merge branch 'video-refactor' of github.com:kchadha/scratch-gui into video-refactor 2018-04-30 16:24:11 -04:00
Karishma Chadha 45e413c3f5 Remove old comments referencing VM. 2018-04-30 16:23:48 -04:00
Paul Kaplan 1a5adeb90c Merge pull request #1915 from paulkaplan/fix-costume-crash
Protect against showing costume tab for target that does not exist.
2018-04-30 15:10:06 -04:00
Andrew Sliwinski be3d3d3576 Merge pull request #1916 from LLK/revert-1888-revert-1887-revert-preview-update
Revert "Bring back "Updates to preview modal for release""
2018-04-30 15:09:53 -04:00
Paul Kaplan 9e69478923 Show "Backdrops" instead of "Costumes" in tab text if stage is selected. 2018-04-30 14:55:52 -04:00
Paul Kaplan dd48a86ba1 Fix lint error 2018-04-30 14:36:54 -04:00
Paul Kaplan 97d3f85762 Update targets list and editing target at the same time.
Prevent crashes resulting from the editing target not being on the target list.
2018-04-30 14:11:38 -04:00
Andrew Sliwinski 571f40560e Revert "Bring back "Updates to preview modal for release"" 2018-04-30 14:09:12 -04:00
Paul Kaplan 92df10079a Merge pull request #1914 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1525108498
chore(package): update scratch-blocks to version 0.1.0-prerelease.152…
2018-04-30 13:44:03 -04:00
greenkeeper[bot] a8096b1893 chore(package): update scratch-blocks to version 0.1.0-prerelease.1525108498
Closes #1913
2018-04-30 17:16:10 +00:00
Paul Kaplan bb4ba90b39 Merge pull request #1911 from paulkaplan/no-select-sound-buttons
Make sound editor buttons unselectable
2018-04-30 12:41:51 -04:00
chrisgarrity 45032cc291 Add translation to missing strings
Question, should ‘x’ and ‘y’ be localizable?
2018-04-30 12:22:23 -04:00
Eric Rosenbaum 732a3be031 Merge pull request #1869 from ericrosenbaum/feature/key-droppability
Post keyboard event.key
2018-04-30 12:20:34 -04:00
Paul Kaplan 2a6ac6ff4d Merge pull request #1904 from paulkaplan/fix-edge-downloading
Use special method for downloading blobs in Edge
2018-04-30 11:49:25 -04:00
Paul Kaplan d7a2148850 Merge pull request #1910 from LLK/greenkeeper/chromedriver-2.38.2
chore(package): update chromedriver to version 2.38.2
2018-04-30 10:35:20 -04:00
Eric Rosenbaum fe7b35cd27 Merge pull request #1883 from ericrosenbaum/bugfix/scroll-position-stability-2
Prevent category menu jump on sprite switch
2018-04-30 10:28:22 -04:00
kchadha 3e1505f578 Merge branch 'develop' into video-refactor 2018-04-30 10:01:42 -04:00
Paul Kaplan 3568a36530 Make sound editor buttons unselectable 2018-04-30 10:00:12 -04:00
Karishma Chadha 317e9e9846 Update scratch-vm 2018-04-30 09:45:50 -04:00
Paul Kaplan d71e0a0ab9 Merge branch 'develop' into bugfix/scroll-position-stability-2 2018-04-30 09:23:12 -04:00
Paul Kaplan 0e15e6b386 Merge pull request #1905 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1524865295
Update scratch-blocks to the latest version 🚀
2018-04-30 09:21:25 -04:00
Karishma Chadha 5c30ae16be Rename function for clarity. 2018-04-30 09:09:55 -04:00