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

Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages

Browse source
This commit is contained in:
lengstrom 2014-07-22 22:07:42 -04:00
commit 277d785ada
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/initialization.js
View file

@ -10,7 +10,7 @@ function showbottombar() {
setTimeout(showbottombar, 1000);
} else {
window.iframeHasLoaded = true;
if (!(gameState == 1 || gameState == 2)) {
if (gameState != 1) {
$('#bottombar').fadeIn(150, 'linear');
}
}

1
js/view.js
View file

@ -166,6 +166,7 @@ function gameOverDisplay(){
var c = document.getElementById("canvas");
c.className = "blur";
showText('gameover');
showbottombar();
}
function togglePlayIcon (){