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

Remove droid actor numbers on conditionals #20949

Merged
merged 1 commit into from
Mar 1, 2018
Merged

Remove droid actor numbers on conditionals #20949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions apps/i18n/studio/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@
"iceAge": "Ice Age!",
"ifDroid": "droid",
"ifDroidN": "droid {spriteIndex}",
"ifSprite": "actor",
"ifSpriteN": "actor {spriteIndex}",
"incrementPlayerScore" : "score point",
"isSet": "is set",
Expand Down
3 changes: 2 additions & 1 deletion apps/src/studio/blocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ exports.install = function (blockly, blockInstallOptions) {
.appendTitle(spriteNumberTextDropdown(msg.ifSpriteN), 'SPRITE');
}
} else {
block.appendDummyInput();
block.appendDummyInput()
.appendTitle(msg.ifSprite());
}
} else {
block
Expand Down
8 changes: 4 additions & 4 deletions dashboard/config/scripts/levels/New Star Wars Expanded Blocks Project.level
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,18 +198,18 @@
<block type="logic_boolean">
<title name="BOOL">TRUE</title>
</block>
<block type="studio_ifActorPositionParams" inline="true">
<block type="studio_ifActorPosition" inline="true">
<title name="POSITION">x</title>
<title name="OPERATOR">EQ</title>
</block>
<block type="studio_ifActorIsVisibleParams" inline="true">
<block type="studio_ifActorIsVisible" inline="true">
<title name="VISIBILITY">false</title>
</block>
<block type="studio_ifActorPositionElseParams" inline="true">
<block type="studio_ifActorPositionElse" inline="true">
<title name="POSITION">x</title>
<title name="OPERATOR">EQ</title>
</block>
<block type="studio_ifActorIsVisibleElseParams" inline="true">
<block type="studio_ifActorIsVisibleElse" inline="true">
<title name="VISIBILITY">false</title>
</block>
</category>
Expand Down