ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,987 Commits 3 Branches 499 Tags
e2a7e4792cb6992aed679d2036181f3cb6abab4f
Commit Graph
2987 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Sliwinski e2a7e4792c Clean-up / correct translator notes 2018-07-18 10:36:04 -04:00
Andrew Sliwinski 1039a3b135 Change 'video motion' to 'video sensing' and minor clean-up to extension library. Resolves GH-2621 2018-07-18 10:04:04 -04:00
DD Liu ba404a772d Update scratch paint, adds gradient fills 2018-07-17 17:41:33 -04:00
Paul Kaplan ea14185fbf Merge pull request #2653 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180717182448 
Update scratch-paint to the latest version 🚀
 2018-07-17 16:56:08 -04:00
Eric Rosenbaum 0c77826318 Merge pull request #2651 from evhan55/feature/device-connection-fixes 
EV3/Microbit critical fixes for code freeze
 2018-07-17 15:56:31 -04:00
chrisgarrity 374bbcfef4 Merge pull request #2650 from chrisgarrity/issue/2535-myblock-missing-string 
Localize custom procedure modal title - per discussion, the changes to error-step are intended to avoid `i18n:src` errors
 2018-07-17 15:44:35 -04:00
greenkeeper[bot] 610d0ded27 chore(package): update scratch-paint to version 0.2.0-prerelease.20180717182448 2018-07-17 18:26:09 +00:00
Evelyn Eastmond 4f11e856c6 Fixing a linting error. 2018-07-17 10:20:56 -04:00
Evelyn Eastmond fe5d72d83a Scanning flag correctly shared from scanning-step container to component. 2018-07-17 09:51:11 -04:00
chrisgarrity a7b07cd450 Localize custom procedure modal title 
* Added localization for ‘Make a Block’
* ‘block name’ default text is in scratch-blocks

The changes in `error-step.jsx` were needed because the same id was defined in there and `unavailable_step.jsx`. The scripts to generate the json file for Transifex give an error if the same id is defined in two places. In error step it simply uses the id without redefining default value etc. The alternative would be to add a new messages.jsx file that has the definitions for shared text and include that in both places that use them.
 2018-07-17 08:50:04 -04:00
chrisgarrity 819868d6a1 Merge pull request #2640 from chrisgarrity/issue/widen-category 
Widen add-extension button to match category.
 2018-07-16 14:59:18 -04:00
Paul Kaplan 2363513dd2 Merge pull request #2639 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180713150122 
chore(package): update scratch-paint to version 0.2.0-prerelease.2018…
 2018-07-16 11:40:16 -04:00
Paul Kaplan 79b2909aca Merge pull request #2617 from paulkaplan/reenable-safari9-test 
Do not skip safari 9 browser test because it works now
 2018-07-16 10:14:11 -04:00
Andrew Sliwinski 81e73ca168 Merge pull request #2622 from thisandagain/feature/assets3 
Updates to sprite, costume, and backdrop libraries
 2018-07-16 09:23:27 -04:00
chrisgarrity aba4b4b101 Widen add-extension button to match category. 
Goes along with https://github.com/LLK/scratch-blocks/pull/1646
 2018-07-16 08:57:04 -04:00
Andrew Sliwinski 9ea3d19482 Add "Andie" to the basketball theme 2018-07-13 13:34:49 -04:00
Paul Kaplan 88219c344c Merge pull request #2620 from paulkaplan/update-vm-july-13-again 
Update vm again, bringing in variable updates
 2018-07-13 13:34:39 -04:00
Andrew Sliwinski f9aa86ddfe Fix spelling on dinosaur backdrop 2018-07-13 13:34:37 -04:00
Paul Kaplan 4c0443a3d0 Update vm again, bringing in variable updates 2018-07-13 13:34:10 -04:00
Paul Kaplan 1aa43ba916 Merge pull request #2619 from kchadha/share-the-love-var-fix 
Share Local Variables from a target to another
 2018-07-13 13:25:26 -04:00
Karishma Chadha 07a679d19e Provide a from target id when sharing blocks to another target so that variable conflicts can be resolved. 2018-07-13 12:51:32 -04:00
Andrew Sliwinski a08d0cb243 Fix issue with first costume of D-Money 2018-07-13 11:34:04 -04:00
greenkeeper[bot] 803f1b808a chore(package): update scratch-paint to version 0.2.0-prerelease.20180713150122 
Closes #2616
 2018-07-13 15:02:39 +00:00
Andrew Sliwinski e2afe75cb7 Clean-up cat assets 2018-07-13 10:55:53 -04:00
Andrew Sliwinski 19c9c069af Sync sound library 2018-07-13 10:55:03 -04:00
Andrew Sliwinski e87d77d0c9 Rename "Jamie" sprite to "Jamal" and clean-up cats 2018-07-13 10:54:55 -04:00
Andrew Sliwinski 88480813da Fixed bat sprite / costumes 2018-07-13 10:43:07 -04:00
Paul Kaplan 685b208a0a Do not skip safari 9 browser test because it works now 2018-07-13 09:17:28 -04:00
Paul Kaplan 02f7042659 Merge pull request #2614 from paulkaplan/update-vm-july-13 
Update scratch vm to include promise reporter fixes
 2018-07-13 08:59:10 -04:00
Paul Kaplan 61ec093388 Update scratch vm to include promise reporter fixes 2018-07-13 08:58:38 -04:00
Paul Kaplan 87f62992ea Merge pull request #2613 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1531482946 
Update scratch-blocks to the latest version 🚀
 2018-07-13 08:18:35 -04:00
Paul Kaplan 792d174848 Merge branch 'develop' into greenkeeper/scratch-blocks-0.1.0-prerelease.1531482946 2018-07-13 08:18:27 -04:00
Paul Kaplan d5f1862ac2 Merge pull request #2610 from kchadha/rename-var-bugfix 
Fix rename variable bug
 2018-07-13 08:17:53 -04:00
Paul Kaplan 608837399e Merge pull request #2607 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180712195436 
Update scratch-paint to the latest version 🚀
 2018-07-13 08:15:44 -04:00
Paul Kaplan 8c02d02fdf Merge branch 'develop' into greenkeeper/scratch-paint-0.2.0-prerelease.20180712195436 2018-07-13 08:15:37 -04:00
chrisgarrity d74935f6c7 Merge pull request #2608 from LLK/greenkeeper/scratch-l10n-3.0.20180712200642 
Update scratch-l10n to the latest version 🚀
 2018-07-13 08:14:50 -04:00
greenkeeper[bot] 58587ed2e9 chore(package): update scratch-blocks to version 0.1.0-prerelease.1531482946 2018-07-13 11:58:38 +00:00
chrisgarrity e14ebed46c Merge branch 'develop' into greenkeeper/scratch-l10n-3.0.20180712200642 2018-07-13 07:52:53 -04:00
Paul Kaplan f1b45af7bc Merge pull request #2611 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1531439997 
Update scratch-blocks to the latest version 🚀
 2018-07-13 07:48:50 -04:00
Paul Kaplan 5fb46caa9b Merge pull request #2605 from paulkaplan/install-scratch-link-step 
Add a new "unavailable" step to the connection flow
 2018-07-13 07:47:59 -04:00
greenkeeper[bot] 4b43e25dce chore(package): update scratch-blocks to version 0.1.0-prerelease.1531439997 2018-07-13 00:02:38 +00:00
Andrew Sliwinski 1bed50f3ab Merge pull request #2595 from thisandagain/feature/assets2 
Update libraries
 2018-07-12 19:26:31 -04:00
Karishma Chadha f3a2d53332 Fix rename variable bug by always passing additionalVars to the scratch-blocks prompt callback. Let scratch-blocks decide whether or not to use the additional vars based on whether the variable is local or global. 2018-07-12 19:21:54 -04:00
DD Liu 4fc8a0d1a6 Merge pull request #2575 from fsih/bitmapAdapter 
Use bitmapAdapter for costume upload
 2018-07-12 19:14:03 -04:00
DD Liu f59d028362 add dependencies 2018-07-12 19:00:56 -04:00
Andrew Sliwinski 813f9ef0a0 Merge pull request #2609 from ericrosenbaum/bugfix/microbit-name-and-description 
Fix micro:bit extension name and description
 2018-07-12 18:42:17 -04:00
DD Liu ce070fe0fb Catch errors in load costume 2018-07-12 17:17:50 -04:00
DD Liu 3978282435 Correct call to addCostumeFromBuffer for svgs 2018-07-12 16:48:26 -04:00
DD Liu 34e764c96c Don't try to convert to binary twice 2018-07-12 16:46:28 -04:00
chrisgarrity 857d9def01 Merge branch 'develop' into greenkeeper/scratch-l10n-3.0.20180712200642 2018-07-12 16:11:12 -04:00