wbrawner/hextris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'gh-pages' of http://github.com/hextris/hextris into dev

Browse source
This commit is contained in:
Garrett Finucane 2014-08-18 20:09:50 -04:00
commit 59692246e9
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/Block.js
View file

@ -5,7 +5,7 @@ function Block(fallingLane, color, iter, distFromHex, settled) {
//the lane which the block was shot from
this.fallingLane = fallingLane;
this.checked=0;
this.checked=0;
//the angle at which the block falls
this.angle = 90 - (30 + 60 * fallingLane);
//for calculating the rotation of blocks attached to the center hex

5
js/view.js
View file

@ -95,7 +95,8 @@ function showText(text) {
'paused': "<div class='centeredHeader unselectable'>Paused</div><br><div class='unselectable centeredSubHeader'>Press p to resume</div><div style='height:100px;line-height:100px;cursor:pointer;'></div>",
'pausedMobile': "<div class='centeredHeader unselectable'>Paused</div><br><div class='unselectable centeredSubHeader'>Press <i class='fa fa-play'></i> to resume</div><div style='height:100px;line-height:100px;cursor:pointer;'></div>",
'start': "<div class='centeredHeader unselectable' style='line-height:80px;'>Press enter to start</div>",
'gameover': "<div class='centeredHeader unselectable'> Game Over: " + score + " pts</div><br><div style='font-size:24px;' class='centeredHeader unselectable'> High Scores:</div><table class='tg' style='margin:0px auto'>"
'gameover': "<div class='centeredHeader unselectable'> Game Over: " + score + " pts</div><br><div style='font-size:24px;' class='centeredHeader unselectable'> High Scores:</div><table class='tg' style='margin:0px auto'> "
};
if (text == 'paused') {
@ -131,10 +132,12 @@ function showText(text) {
}
}
}
messages['gameover'] += "<div class='fltrt' id='tweetStuff'><a class='tweet' href='https://twitter.com/intent/tweet?text=Can you beat my score of "+ score +" points in &url=http://hextris.github.io/hextris&button_hashtag=hextris' data-lang='en' data-related='hextris:hextris'>Share Your Score on Twitter!!!</a></div>"
$("#overlay").html(messages[text]);
$("#overlay").fadeIn("1000", "swing");
if (text == 'gameover') {
if (settings.platform == 'mobile') {
$('.tg').css('margin-top', '4px');
}

4
style/style.css
View file

@ -9,6 +9,10 @@
margin:0;
}
.tweet {
font-size:2em;
color:#4099FF;
}
a {
color:#232323;