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

This commit is contained in:
Garrett Finucane 2014-07-01 11:03:06 -04:00
commit 429de31d14

View file

@ -145,13 +145,13 @@ var gameState;
setStartScreen();
function resumeGame() {
debugger;
gameState = 1;
hideUIElements();
$('#pauseBtn').show();
$('#restartBtn').show();
importing = 0;
startTime = Date.now();
waveone = saveState.wavegen || new waveGen(MainClock,Date.now(),[1,1,0],[1,1],[1,1]);
}
function hideUIElements() {