Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new sound blocks #763

Merged
merged 27 commits into from Jan 6, 2017
Merged

Add new sound blocks #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9617193
play note block using scale and key
ericrosenbaum Aug 9, 2016
1dcb465
play sound and effects blocks
ericrosenbaum Aug 11, 2016
07e4e91
defaults
ericrosenbaum Oct 26, 2016
a9ec8b4
theremin aka spooky notes
ericrosenbaum Oct 26, 2016
90dcba5
sounds menu uses indices
ericrosenbaum Oct 26, 2016
b66ac9f
add new effects to menu
ericrosenbaum Oct 26, 2016
73edee9
json
ericrosenbaum Oct 26, 2016
840cde5
rename sound_sounds_option to sound_sounds_menu
ericrosenbaum Dec 22, 2016
9ef3ce3
instruments menu
ericrosenbaum Dec 22, 2016
f95075c
comment fix
ericrosenbaum Dec 22, 2016
3b1a2f2
edits to effects menu
ericrosenbaum Dec 22, 2016
f9fb281
remove unused block experiments
ericrosenbaum Dec 22, 2016
66be425
Merge branch 'develop' of https://github.com/LLK/scratch-blocks into …
ericrosenbaum Dec 22, 2016
f350f7d
remove theremin block
ericrosenbaum Jan 2, 2017
ac3694f
Merge branch 'develop' of https://github.com/LLK/scratch-blocks into …
ericrosenbaum Jan 2, 2017
31b14c7
Merge branch 'develop' of https://github.com/LLK/scratch-blocks into …
ericrosenbaum Jan 3, 2017
b9289f2
?
ericrosenbaum Jan 3, 2017
3125b3e
instruments menu
ericrosenbaum Jan 3, 2017
41a3b3c
effect names
ericrosenbaum Jan 3, 2017
351360c
remove unused blocks and cleanup comments
ericrosenbaum Jan 3, 2017
26e29d6
fix sound menu name
ericrosenbaum Jan 3, 2017
d7b7ba0
add drums menu
ericrosenbaum Jan 3, 2017
e8f4ed9
fix menus
ericrosenbaum Jan 3, 2017
cd5e956
Merge branch 'develop' of https://github.com/LLK/scratch-blocks into …
ericrosenbaum Jan 3, 2017
ac1d3e0
fix drum menu
ericrosenbaum Jan 3, 2017
0317cf6
Merge branch 'develop' of https://github.com/ericrosenbaum/scratch-bl…
ericrosenbaum Jan 4, 2017
9f114aa
Merge branch 'develop' of https://github.com/ericrosenbaum/scratch-bl…
ericrosenbaum Jan 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 10 additions & 14 deletions blocks_vertical/default_toolbox.js
View file
Open in desktop
Expand Up @@ -246,21 +246,19 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
'<category name="Sound" colour="#D65CD6" secondaryColour="#BD42BD">'+
'<block type="sound_play">'+
'<value name="SOUND_MENU">'+
'<shadow type="sound_sounds_option"></shadow>'+
'<shadow type="sound_sounds_menu"></shadow>'+
'</value>'+
'</block>'+
'<block type="sound_playuntildone">'+
'<value name="SOUND_MENU">'+
'<shadow type="sound_sounds_option"></shadow>'+
'<shadow type="sound_sounds_menu"></shadow>'+
'</value>'+
'</block>'+
'<block type="sound_stopallsounds"></block>'+
'<block type="sound_playdrumforbeats">'+
'<value name="DRUMTYPE">'+
'<shadow type="math_number">'+
'<field name="NUM">1</field>'+
'</shadow>'+
'</value>'+
'<value name="DRUM">' +
'<shadow type="sound_drums_menu"></shadow>' +
'</value>' +
'<value name="BEATS">'+
'<shadow type="math_number">'+
'<field name="NUM">0.25</field>'+
Expand All @@ -277,7 +275,7 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
'<block type="sound_playnoteforbeats">'+
'<value name="NOTE">'+
'<shadow type="math_number">'+
'<field name="NUM">1</field>'+
'<field name="NUM">60</field>'+
'</shadow>'+
'</value>'+
'<value name="BEATS">'+
Expand All @@ -287,19 +285,17 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
'</value>'+
'</block>'+
'<block type="sound_setinstrumentto">'+
'<value name="INSTRUMENT">'+
'<shadow type="math_number">'+
'<field name="NUM">1</field>'+
'</shadow>'+
'</value>'+
'<value name="INSTRUMENT">' +
'<shadow type="sound_instruments_menu"></shadow>' +
'</value>' +
'</block>'+
'<block type="sound_seteffectto">' +
'<value name="EFFECT">' +
'<shadow type="sound_effects_menu"></shadow>' +
'</value>' +
'<value name="VALUE">' +
'<shadow type="math_number">'+
'<field name="NUM">10</field>'+
'<field name="NUM">100</field>'+
'</shadow>'+
'</value>' +
'</block>' +
Expand Down