scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
2241 commits 78 branches 380 tags 120 MiB
Commit graph

2241 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
c07d457cac Fix updateToolbox 
I think this method broke in a merge.  We are recreating the category DOM element on init, but this seems to be the simplest solution for now.

Thanks to @rachel-fenichel for helping fix it.
 2017-02-15 14:53:16 -05:00
Andrew Sliwinski
1cf79eed97 Merge pull request #762 from TheBrokenRail/patch-15 
Fix IE and Edge Default Toolbox
 2017-02-13 11:00:04 -05:00
picklesrus
5296c1b78a Merge pull request #787 from picklesrus/add-generators 
Add generators
 2017-02-07 17:36:42 -08:00
Katelyn Mann
3a57cbba1b Missed a spot in the cleanup script. 2017-02-07 14:44:41 -08:00
Katelyn Mann
a5c9b7ef32 Add the rest of the generator infrastructure back into scratch-blocks. 2017-02-07 14:42:33 -08:00
Eric Rosenbaum
8b66c0ea8c Merge pull request #786 from ericrosenbaum/bugfix/audio-effect-names 
Fix effect names for fuzz and robot
 2017-02-03 13:05:32 -05:00
Eric Rosenbaum
c16f5931ea fix effect names for fuzz and robot 2017-02-03 10:40:27 -05:00
Andrew Sliwinski
260859fe7d Merge pull request #785 from thisandagain/merge 
Post-merge clean-up of unused assets
 2017-02-02 18:54:12 -05:00
Andrew Sliwinski
4a04d09585 Post-merge clean-up of unused assets 2017-02-02 16:37:47 -05:00
Andrew Sliwinski
be9d5fefed Merge from Upstream Blockly (#776) 
* WIP merge from upstream google/blockly

* fixing some merging bugs. Getting the drag surface to work, updating some function calls, etc.

* make the trash can lid animate again and fix the cursor to show an x when things will be removed.

* Fix text rendering logic in fields

* Hand apply some more changes from blockly flyout.js to flyout_base.js.

Also revert 08efd1381c
in scratch-blocks since it breaks variables and there is more work fenichel is planning
to do here.

* Fix drop-down field rendering

* Resolve issue with text input field widths on init

* Remove unused blockly (built) files

* Remove unused language files

* Resolve lint issues and rebuild

* Add blockly build targets to cleanup script

* Return 0 if 'this.arrow_' does not exist in a dropdown field

* Remove unused / irrelevant comments
 2017-02-02 14:17:43 -05:00
Andrew Sliwinski
ccd2da9173 Merge pull request #768 from thisandagain/bugfix/oss 
Improve Contribution Guidelines and Issue / PR Templates
 2017-01-17 17:30:38 -05:00
Andrew Sliwinski
0a44330a3e Improve contribution guidelines and issue/pr templates 2017-01-17 17:17:42 -05:00
TheBrokenRail
e2ab2dca0d Add Multi Playground Link to GH-Pages (#767) 2017-01-12 20:28:28 -05:00
TheBrokenRail
b2ab08dc87 Fix Horizontal 2017-01-06 16:21:05 -05:00
Eric Rosenbaum
6e6fb61aaa Merge pull request #763 from ericrosenbaum/sound 
Add new sound blocks
 2017-01-06 16:17:56 -05:00
TheBrokenRail
7c75bf3ddb Update horizontal_playground.html 2017-01-05 17:08:49 -05:00
TheBrokenRail
8ea24ca969 No sessionStorage on IE 2017-01-05 17:08:27 -05:00
TheBrokenRail
d81afd26c2 Update vertical_playground.html 2017-01-05 17:04:35 -05:00
TheBrokenRail
5026e6eda1 No sessionStorage on IE 2017-01-05 17:04:08 -05:00
TheBrokenRail
457bea9edd No sessionStorage on IE 2017-01-05 17:00:35 -05:00
TheBrokenRail
d4a727820b Fix IE and Edge Default Toolbox 2017-01-05 15:53:46 -05:00
Eric Rosenbaum
9f114aa92c Merge branch 'develop' of https://github.com/ericrosenbaum/scratch-blocks into sound 
# Conflicts:
#	blocks_vertical/default_toolbox.js
#	blocks_vertical/sound.js
 2017-01-04 15:40:32 -05:00
Eric Rosenbaum
0317cf694e Merge branch 'develop' of https://github.com/ericrosenbaum/scratch-blocks into develop 
# Conflicts:
#	blockly_compressed_horizontal.js
#	blockly_compressed_vertical.js
#	blockly_uncompressed_horizontal.js
#	blockly_uncompressed_vertical.js
#	blocks_compressed.js
#	blocks_compressed_horizontal.js
#	blocks_compressed_vertical.js
#	blocks_vertical/sound.js
 2017-01-04 15:38:36 -05:00
Eric Rosenbaum
ac1d3e00e7 fix drum menu 2017-01-03 12:13:07 -05:00
Eric Rosenbaum
cd5e956e65 Merge branch 'develop' of https://github.com/LLK/scratch-blocks into develop 2017-01-03 12:06:01 -05:00
Eric Rosenbaum
e8f4ed9c96 fix menus 2017-01-03 12:05:56 -05:00
Eric Rosenbaum
d7b7ba06d1 add drums menu 2017-01-03 11:37:07 -05:00
Ray Schamp
279fb6331a Revert "Set git committer single-use vars" 
This reverts commit ee5aacad62.
 2017-01-03 11:34:18 -05:00
Eric Rosenbaum
26e29d6603 fix sound menu name 2017-01-03 11:31:26 -05:00
Eric Rosenbaum
351360cbfd remove unused blocks and cleanup comments 2017-01-03 11:30:44 -05:00
Eric Rosenbaum
41a3b3c710 effect names 2017-01-03 11:27:26 -05:00
Eric Rosenbaum
3125b3e4cd instruments menu 2017-01-03 11:26:34 -05:00
Eric Rosenbaum
b9289f2e90 ? 2017-01-03 11:26:24 -05:00
Eric Rosenbaum
31b14c741f Merge branch 'develop' of https://github.com/LLK/scratch-blocks into develop 2017-01-03 11:23:24 -05:00
Ray Schamp
729c4b56a5 Merge pull request #755 from rschamp/bugfix/744 
Build playgrounds for gh-pages
 2017-01-03 10:23:49 -05:00
Ray Schamp
ee5aacad62 Set git committer single-use vars 
/ht @cwillisf
 2017-01-03 10:18:10 -05:00
Eric Rosenbaum
ac3694ff73 Merge branch 'develop' of https://github.com/LLK/scratch-blocks into develop 2017-01-02 12:17:00 -05:00
Eric Rosenbaum
f350f7de26 remove theremin block 2017-01-02 11:51:34 -05:00
Ray Schamp
fb5e97d918 Build playgrounds for gh-pages 
Sets up the necessary structure in the gh-pages directory to run the uncompressed playgrounds. Deploy the gh-pages directory to the gh-pages branch after publishing to NPM.
 2016-12-24 13:17:24 -05:00
Rachel Fenichel
afc7874ad7 Merge pull request #747 from rachel-fenichel/bugfix/ie_polyfills 
Use existing polyfills to regain IE compatibility
 2016-12-23 11:41:59 -08:00
Eric Rosenbaum
66be42563a Merge branch 'develop' of https://github.com/LLK/scratch-blocks into sound 2016-12-22 13:43:44 -05:00
Eric Rosenbaum
f9fb281fc5 remove unused block experiments 2016-12-22 13:42:45 -05:00
Eric Rosenbaum
3b1a2f2dc0 edits to effects menu 2016-12-22 13:42:28 -05:00
Eric Rosenbaum
f95075c14b comment fix 2016-12-22 13:41:55 -05:00
Eric Rosenbaum
9ef3ce30f0 instruments menu 2016-12-22 13:41:16 -05:00
Eric Rosenbaum
840cde5a8b rename sound_sounds_option to sound_sounds_menu 2016-12-21 20:17:23 -05:00
TheBrokenRail
a2b135aac2 Remove vertical grammar warnings from playground 
* Vertical Grammar Is Here!

* Update vertical_playground.html

* Update vertical_playground_compressed.html
 2016-12-21 19:15:26 -05:00
Ray Schamp
ed92be8555 Merge pull request #750 from rschamp/bugfix/718 
Remove explicit file paths from npm scripts
 2016-12-21 14:46:11 -05:00
Ray Schamp
fda4b2957d Remove explicit file paths from npm scripts 
Fixes #718. I don't see any reason for these to be explicit, even if this repo is used with `npm link`.
 2016-12-21 14:00:13 -05:00
Rachel Fenichel
fe6d4589e0 use existing polyfills to regain IE compatibility 2016-12-12 14:33:53 -08:00