Merge pull request #2294 from rschamp/revert-touching-hat

Revert "Add when touching hat"
This commit is contained in:
Ray Schamp authored and GitHub committed 2018-06-08 12:39:25 -04:00
commit 259bb09bab
2 files changed
-15

No files matched your search

-8
View File
@@ -185,14 +185,6 @@ export default function (vm) {
this.jsonInit(json);
};
ScratchBlocks.Blocks.event_touchingobjectmenu.init = function () {
const json = jsonForMenuBlock('TOUCHINGOBJECTMENU', spriteMenu, eventColors, [
['mouse-pointer', '_mouse_'],
['edge', '_edge_']
]);
this.jsonInit(json);
};
ScratchBlocks.Blocks.control_create_clone_of_menu.init = function () {
const json = jsonForMenuBlock('CLONE_OPTION', cloneMenu, controlColors, []);
this.jsonInit(json);
-7
View File
@@ -321,13 +321,6 @@ const events = function (isStage) {
` : `
<block type="event_whenthisspriteclicked"/>
`}
${isStage ? '' : `
<block type="event_whentouchingobject">
<value name="TOUCHINGOBJECTMENU">
<shadow type="event_touchingobjectmenu"/>
</value>
</block>
`}
<block type="event_whenbackdropswitchesto">
</block>
${blockSeparator}