ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,390 Commits 3 Branches 499 Tags
3d0f5750431e084edf86ba2d9cb8a6761ab018f1
Commit Graph
11390 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Kaplan 6e743057f8 Merge pull request #1086 from paulkaplan/update-paint-editor 
Update to most recent paint editor release
 2017-12-20 13:45:35 -05:00
Paul Kaplan 6dbbbcc6f9 Update to most recent paint editor release 2017-12-20 13:31:04 -05:00
Paul Kaplan adb2313151 Merge pull request #1085 from LLK/greenkeeper/scratch-vm-0.1.0-prerelease.1513789849-prerelease.1513789862 
Update scratch-vm to the latest version 🚀
 2017-12-20 12:18:54 -05:00
greenkeeper[bot] b3420eee84 chore(package): update scratch-vm to version 0.1.0-prerelease.1513789849-prerelease.1513789862 2017-12-20 17:12:07 +00:00
Paul Kaplan 5c9aaa31aa Merge pull request #1075 from LLK/greenkeeper/react-modal-3.1.9 
Update react-modal to the latest version 🚀
 2017-12-20 11:23:19 -05:00
Paul Kaplan 91c15fe89e Merge pull request #1078 from LLK/greenkeeper/scratch-vm-0.1.0-prerelease.1513719220-prerelease.1513719234 
chore(package): update scratch-vm to version 0.1.0-prerelease.1513719…
 2017-12-20 11:22:05 -05:00
Paul Kaplan 4e861542de Update tests and snapshots for sound editor 2017-12-20 11:10:17 -05:00
Andrew Sliwinski 6e7fbd1481 Merge pull request #1083 from thisandagain/bugfix/1082 
Disable the 'collapse' option in the blocks workspace
 2017-12-20 10:39:52 -05:00
Paul Kaplan 28050e56c7 Iteration 2 of sound editor stylings. 
- New icons
- Play button moved to prominent location
- Styling normalized with costume editor
 2017-12-20 10:38:36 -05:00
Andrew Sliwinski e5a5f85111 Disable the 'collapse' option in the blocks workspace. Resolves GH-1082 2017-12-20 10:25:58 -05:00
Paul Kaplan d97665fa4a Revert paint editor for workshop due to bounding box bug 2017-12-20 08:44:28 -05:00
Paul Kaplan ee9ed9ba10 Merge pull request #1080 from LLK/develop 
Bring in hotfix for broken menu dropdown crash
 2017-12-20 08:30:24 -05:00
Paul Kaplan 6990f3ba33 Merge pull request #1079 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1513719016 
chore(package): update scratch-blocks to version 0.1.0-prerelease.151…
 2017-12-19 16:52:11 -05:00
greenkeeper[bot] 779705fdda chore(package): update scratch-vm to version 0.1.0-prerelease.1513719220-prerelease.1513719234 
Closes #1073
 2017-12-19 21:34:48 +00:00
greenkeeper[bot] eaecef61e6 chore(package): update scratch-blocks to version 0.1.0-prerelease.1513719016 
Closes #1076
 2017-12-19 21:31:41 +00:00
greenkeeper[bot] 47cf0af566 chore(package): update react-modal to version 3.1.9 2017-12-19 20:38:20 +00:00
Paul Kaplan f6904d88b7 Merge pull request #1072 from LLK/develop 
Merge paint editor fix to master
 2017-12-19 13:39:40 -05:00
Paul Kaplan d09cdaabce Merge pull request #1071 from paulkaplan/update-paint 
Update paint dependency to get hotfix for eyedropper
 2017-12-19 13:29:39 -05:00
Paul Kaplan 0f18f8b339 Update paint dependency to get hotfix for eyedropper 2017-12-19 12:27:21 -05:00
Paul Kaplan 592cfe2cac Merge pull request #1070 from LLK/develop 
Deploy to master after friday testing and bugfixes
 2017-12-19 12:00:56 -05:00
Paul Kaplan 906bac6108 Merge branch 'master' into develop 2017-12-19 11:23:43 -05:00
Paul Kaplan 38596c2be1 Merge pull request #1043 from paulkaplan/fix-touch-handling 
Fix touch actions on the stage
 2017-12-19 11:15:30 -05:00
Paul Kaplan b6bb154409 Merge pull request #1068 from paulkaplan/lock-deps 
Lock scratch-* dependencies to their current versions
 2017-12-19 09:58:29 -05:00
Paul Kaplan d588b94c71 12/19/2017 locking scratch-* dependencies to their current versions 2017-12-19 09:50:11 -05:00
Ray Schamp e9aa0191fc Merge pull request #1062 from LLK/greenkeeper/chromedriver-2.34.0 
Update chromedriver to the latest version 🚀
 2017-12-18 14:49:32 -05:00
greenkeeper[bot] a58ab96cc3 chore(package): update chromedriver to version 2.34.0 2017-12-18 19:31:42 +00:00
Ray Schamp a07f8b9bb4 Merge pull request #1057 from LLK/greenkeeper/file-loader-1.1.6 
Update file-loader to the latest version 🚀
 2017-12-18 09:59:47 -05:00
Paul Kaplan 5788372ea9 Merge pull request #1050 from paulkaplan/backdrop-library 
Fix backdrop library
 2017-12-18 09:16:47 -05:00
greenkeeper[bot] 1d5ed9e6d4 chore(package): update file-loader to version 1.1.6 2017-12-16 07:02:30 +00:00
Paul Kaplan 508fd343d2 Add integration test for backdrop library 2017-12-15 15:43:04 -05:00
Paul Kaplan c48d34022f Fix backdrop library 2017-12-15 15:36:42 -05:00
Paul Kaplan 9996872e59 Merge pull request #1038 from paulkaplan/fix-show-new-assets 
Show newly added assets after they are loaded
 2017-12-15 14:04:18 -05:00
Paul Kaplan 74c21431dd Fix integration test 2017-12-15 12:45:21 -05:00
Paul Kaplan efaf2371dc Select the newly added costume, sound or backdrop in the editor. 2017-12-15 12:34:12 -05:00
Paul Kaplan ea933b6665 Button property does not exist for touch actions 2017-12-15 11:53:02 -05:00
Andrew Sliwinski 947904fdfd Merge pull request #1037 from thisandagain/feature/sprites 
Add musical instruments and letters to libraries
 2017-12-14 16:28:48 -05:00
chrisgarrity 683241cac1 Localize extension blocks (#968) 
Localizes the pen extension:
- loads all pen locale information - may want to consider dynamically loading locales later.
 2017-12-14 15:53:18 -05:00
Andrew Sliwinski 5448f2d18e Add musical instruments and letters to sprite, sound, and costume libraries. 2017-12-14 12:56:42 -05:00
Paul Kaplan 89673ebe03 Merge pull request #1034 from LLK/greenkeeper/xhr-2.4.1 
Update xhr to the latest version 🚀
 2017-12-14 12:07:22 -05:00
Paul Kaplan e9361471a5 Merge pull request #1032 from davidaylaian/meow-uppercase 
Renamed meow sound to Meow
 2017-12-14 12:03:39 -05:00
Ray Schamp a2a6f8dd9a Merge pull request #1035 from LLK/greenkeeper/copy-webpack-plugin-4.3.0 
chore(package): update copy-webpack-plugin to version 4.3.0
 2017-12-14 09:48:30 -05:00
Ray Schamp 03de3196e3 Merge pull request #667 from josiahneuberger/add-full-screen-render-view 
Add full screen render view
 2017-12-14 09:38:17 -05:00
greenkeeper[bot] 04fa80e99c chore(package): update xhr to version 2.4.1 2017-12-14 13:55:33 +00:00
greenkeeper[bot] e896e2f442 chore(package): update copy-webpack-plugin to version 4.3.0 2017-12-14 09:26:46 +00:00
Josiah Neuberger ba3ff9d1f3 fixed some minor code smell problems 
1. Removed duplication of code in stage component to avoid future
     potential divergence. Now just selectively applying styling based
     on states of zoomed, colorPicking, and question.

  2. Fixed bottom border getting chopped in zoomed mode by adding margin
     and adjusting height/width accordingly.

  3. Removed shouldComponentUpdate from stageHeader as suggested from code
     review. Added ignore lint warning suggesting change to stateless function.
 2017-12-13 22:01:09 -05:00
David Aylaian 89d002d259 Merge branch 'develop' of git://github.com/LLK/scratch-gui into meow-uppercase 2017-12-13 17:50:04 -05:00
David Aylaian f0b3972491 Renamed meow sound to Meow 2017-12-13 17:36:30 -05:00
Paul Kaplan a8bc2ef3b8 Merge pull request #1029 from LLK/greenkeeper/react-modal-3.1.8 
Update react-modal to the latest version 🚀
 2017-12-13 16:41:34 -05:00
Paul Kaplan b8253ac2e6 Bring in hotfix for shadow blocks on custom procedures 2017-12-13 08:13:55 -05:00
greenkeeper[bot] 0de4a3badc chore(package): update react-modal to version 3.1.8 2017-12-12 23:46:33 +00:00