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

HTML amends #15

Merged
merged 4 commits into from
Nov 28, 2012
Merged

HTML amends #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ede716
Modifies the main game window
hobnob Nov 28, 2012
8ed72eb
Adds a new tooltip
hobnob Nov 28, 2012
93f8bbe
Css Sprites!
hobnob Nov 28, 2012
6c7be00
Removes uneeded images
hobnob Nov 28, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adds a new tooltip 
Adds a new tooltip so that the commands are clear from the start
  • Loading branch information
@hobnob
hobnob committed Nov 28, 2012
commit 8ed72eb2bd6318fcb5ab871180d706d453390fbe
12 changes: 9 additions & 3 deletions js/lib/levels/level_1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@
{"type":"door", "x":700,"y":218}
]},
{
"type":"tooltip","x":300,"y":641,"width":100,"height":100,
"text":"Press <span class='button e'>e</span> or <span class='button enter'>enter</span> to activate switches<br>At least one clone must remain at a switch to keep it active"},
"type":"tooltip","x":150,"y":641,"width":50,"height":50,
"text":"Press the <span class='button left'>left</span> arrow or <span class='button a'>a</span> to move left<br>Press the <span class='button right'>right</span> arrow or <span class='button d'>d</span> to move right"
},
{
"type":"tooltip","x":350,"y":641,"width":50,"height":50,
"text":"Press <span class='button e'>e</span> or <span class='button enter'>enter</span> to activate switches<br>At least one clone must remain at a switch to keep it active"
},
{
"type":"tooltip","x":650,"y":641,"width":50,"height":50,
"text":"Press <span class='button c'>c</span> to create a clone<br/>Press <span class='button tab'>tab</span> to switch between them"},
"text":"Press <span class='button c'>c</span> to create a clone<br/>Press <span class='button tab'>tab</span> to switch between them"
},
{"type":"goal","x":890,"y":540}
]
1 change: 1 addition & 0 deletions js/lib/tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ function tooltip()
$('#game_tooltip').hide();
}


tooltip.timer = null;
}

Expand Down
1 change: 0 additions & 1 deletion js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ gamejs.ready(function() {
$('#game_scorecard .resetLevel').click();
event.preventDefault();
break;

}
}
});
Expand Down