ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,123 Commits 3 Branches 499 Tags
18daa16738d7da0f20ce95bc4bf35d255ea7d0d4
Commit Graph
2123 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
greenkeeper[bot] 18daa16738 chore(package): update scratch-blocks to version 0.1.0-prerelease.1524865295 2018-04-27 21:43:21 +00:00
Paul Kaplan 54c5bae6b8 Merge pull request #1886 from LLK/greenkeeper/scratch-storage-0.4.1 
Update scratch-storage to the latest version 🚀
 2018-04-27 16:25:18 -04:00
Paul Kaplan 9263da5d4f Merge pull request #1884 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20180427143155 
Update scratch-render to the latest version 🚀
 2018-04-27 16:24:57 -04:00
Paul Kaplan 99b914e18c Merge pull request #1888 from LLK/revert-1887-revert-preview-update 
Bring back "Updates to preview modal for release"
 2018-04-27 16:24:30 -04:00
Paul Kaplan d6428cb7b5 Merge pull request #1903 from LLK/revert-1896-revert-bitmap-paint 
Revert "Revert to pre-bitmap paint editor for deploying"
 2018-04-27 16:24:03 -04:00
Paul Kaplan 9eb89b3b37 Revert "Revert to pre-bitmap paint editor for deploying" 2018-04-27 16:23:39 -04:00
Paul Kaplan def5898c16 Merge pull request #1889 from paulkaplan/integration-tests-for-how-tos 
Add a simple smoke test for the how-to library
 2018-04-27 16:23:11 -04:00
Paul Kaplan 44bd1a307c Merge pull request #1899 from paulkaplan/fix-sound-formats 
Allow more mime types to be processed.
 2018-04-27 15:30:25 -04:00
Paul Kaplan 3de4960618 Allow more mime types to be processed. 
Firefox and Safari both process mp3s as having audio/mpeg, and a variety of different audio/wav* possibilities.
 2018-04-27 15:25:34 -04:00
Paul Kaplan f29231ee18 Merge pull request #1896 from LLK/revert-bitmap-paint 
Revert to pre-bitmap paint editor for deploying
 2018-04-27 15:07:17 -04:00
Paul Kaplan b690dc0298 Revert to pre-bitmap paint editor for deploying 2018-04-27 14:51:12 -04:00
Paul Kaplan 7eebe9b355 Add a simple smoke test for the how-to library 2018-04-27 14:30:36 -04:00
Paul Kaplan 97a16f1176 Revert "Revert "Updates to preview modal for release (#1864)"" 2018-04-27 11:44:52 -04:00
Paul Kaplan 51771c71d6 Merge pull request #1887 from paulkaplan/revert-preview-update 
Revert "Updates to preview modal for release (#1864)"
 2018-04-27 11:44:47 -04:00
Paul Kaplan 7caddb90a9 Revert "Updates to preview modal for release (#1864)" 
This reverts commit 29d5619d93.
 2018-04-27 11:42:27 -04:00
Paul Kaplan ad5473b508 Merge branch 'develop' into greenkeeper/scratch-render-0.1.0-prerelease.20180427143155 2018-04-27 11:21:22 -04:00
Paul Kaplan f32399d3a0 Merge pull request #1879 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180426204040 
Update scratch-paint to the latest version 🚀
 2018-04-27 11:17:06 -04:00
greenkeeper[bot] 80d916374f chore(package): update scratch-storage to version 0.4.1 2018-04-27 15:13:37 +00:00
Paul Kaplan 76bfe175aa Framework and demo content for how-tos inside the editor (#1867) 
* WIP tips

* WIP first card stack

* WIP use tips reducer to show things to try

* single card deck similar to mask sequence

* collapse option

* Add zoom card

* WIP tips

* Reorganized to redux

* Add zooming to the gifs

* Blue cards + navigation

* Add tips to new nav bar

* Remove blue

* Update design with icons

* deck updates wip

* Updated card decks

* Add videos to libraries

* Update initial card and clicker preview

* Add backdrop to initial card step.

* WIP use vimeo player instead

* New simple spin deck

* Spin around and say hello decks

* Update button and sub-card styles

* Fix "tips" button in menu bar

* Use move cursor

* Fix cursor

* Use same image for deck preview and library

* Fix cursor again

* Update clicker game deck

* Add videos as single-step decks

* Change tips in menu bar to ? icon

* Change “tips” to “how-tos” in library

* Add help icon to cards

* Update deck library images

* Add drag cover for youtube video to prevent catching mouseup

* add a step to spin deck for clicking control

* Blue bar style updates

* Add step pips

* Update clicker game name to run away

* Fix image padding

* Add change color step to spin deck

* Add start sound step to run away deck

* Update say deck to start with adding a sprite

* Remove package lock

* Remove zooming functionality

* Remove unnecassary prototype changes

* Split up rendering of cards into smaller parts

* Use FormattedMessage for all strings

* Automatic lint fixes

* Almost finished with lint errors!

* Fix more lint errors

* Clean up CSS

* Fix webpack config
 2018-04-27 11:11:42 -04:00
greenkeeper[bot] f4a2d51744 chore(package): update scratch-render to version 0.1.0-prerelease.20180427143155 2018-04-27 14:32:35 +00:00
Paul Kaplan e0056a914f Merge pull request #1882 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1524774938 
chore(package): update scratch-blocks to version 0.1.0-prerelease.152…
 2018-04-27 09:26:07 -04:00
Paul Kaplan a44377b8e1 Remove non-existent block menu definition causing crash 2018-04-27 09:02:46 -04:00
greenkeeper[bot] 427076ce33 chore(package): update scratch-paint to version 0.2.0-prerelease.20180426204040 2018-04-26 20:41:00 +00:00
greenkeeper[bot] 695fe15eb5 chore(package): update scratch-blocks to version 0.1.0-prerelease.1524774938 
Closes #1877
 2018-04-26 20:37:31 +00:00
DD Liu a933c16139 Merge pull request #1878 from fsih/renameGetCostume 
Rename getCostumeSvg to getCostume
 2018-04-26 14:24:14 -04:00
DD 85efa71d74 Rename getCostumeSvg to getCostume 2018-04-26 14:10:06 -04:00
Paul Kaplan 9750afd1bc Merge pull request #1876 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180426161647 
Update scratch-paint to the latest version 🚀
 2018-04-26 13:35:07 -04:00
greenkeeper[bot] 2e80ef0506 chore(package): update scratch-paint to version 0.2.0-prerelease.20180426161647 2018-04-26 16:42:10 +00:00
Andrew Sliwinski 29d5619d93 Updates to preview modal for release (#1864) 
* Updates to preview modal for release

* Design tweaks and remove import modal

* Resolve issues with tests

* Copy edits HT Eric

* Resolve lint issue with integration test

* One more change to the disclaimer language

* Add line break
 2018-04-25 17:47:22 -04:00
Paul Kaplan beaf75a90c Merge pull request #1804 from LLK/greenkeeper/scratch-audio-0.1.0-prerelease.1523977528 
Update scratch-audio to the latest version 🚀
 2018-04-25 15:49:43 -04:00
Paul Kaplan 7d2e7b63ab Merge pull request #1871 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20180425181730 
Update scratch-render to the latest version 🚀
 2018-04-25 15:48:40 -04:00
Paul Kaplan 3dc42d2bbe Merge branch 'develop' into greenkeeper/scratch-audio-0.1.0-prerelease.1523977528 2018-04-25 15:21:50 -04:00
greenkeeper[bot] 28e5084937 chore(package): update scratch-render to version 0.1.0-prerelease.20180425181730 2018-04-25 18:18:14 +00:00
chrisgarrity 384edaadf4 Merge pull request #1860 from chrisgarrity/export-travis 
Update travis to publish dist and build
 2018-04-25 12:05:56 -04:00
kchadha 60cf7f1e5d Merge pull request #1836 from kchadha/costume-file-upload 
Upload Costumes and Backdrops (vector and bitmap)
 2018-04-25 11:49:51 -04:00
Karishma Chadha 7110eb0026 Refactoring and code cleanup. 2018-04-24 18:22:56 -04:00
Ray Schamp 69e242f051 Merge pull request #1858 from rschamp/feature/modal-back-button 
Allow the back button to work with libraries
 2018-04-24 16:25:01 -04:00
Ray Schamp 4eddee6732 Merge pull request #1862 from LLK/revert-1861-greenkeeper-pls/scratch-vm-0.1.0-prerelease.1524520946 
Revert "Update scratch-vm"
 2018-04-24 16:17:43 -04:00
Ray Schamp a7eaae88aa Revert "Update scratch-vm" 2018-04-24 16:16:44 -04:00
Ray Schamp 88e202a7fa Merge pull request #1861 from LLK/greenkeeper-pls/scratch-vm-0.1.0-prerelease.1524520946 
Update scratch-vm
 2018-04-24 15:40:08 -04:00
Ray Schamp 607e9a754c Update scratch-vm 2018-04-24 15:00:27 -04:00
Karishma Chadha 906f5406ac Rename fileUploader to match file naming conventions. 2018-04-24 13:37:07 -04:00
chrisgarrity a26d975577 Update travis to publish dist and build 
build in production mode on travis
 2018-04-24 13:06:52 -04:00
Karishma Chadha 164ed2bd4d Update package json. 2018-04-24 12:54:39 -04:00
Karishma Chadha 73cd5b3019 File uploading abstractions 2018-04-24 12:54:38 -04:00
Karishma Chadha 2bf417045e Add bitmap support to backdrop upload button. 2018-04-24 12:44:39 -04:00
Karishma Chadha 4c50363a55 Fixed svg thumbnails, some cleanup. 2018-04-24 12:44:39 -04:00
Karishma Chadha f2b398ae0e Bitmap upload -- mostly working, code needs cleanup. 2018-04-24 12:44:39 -04:00
Karishma Chadha f12718c25b Toggle upload button title based on whether the currently selected sprite is the stage or not. 2018-04-24 12:44:39 -04:00
Karishma Chadha a0cbb07ec0 Remove preventDefault which was preventing the input file browser from popping up 2018-04-24 12:44:39 -04:00