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

merge conflict resolved

Browse source
This commit is contained in:
Michael Yang 2014-05-24 15:07:58 -04:00
commit a3b74202b8
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
js/main.js
View file

@ -24,7 +24,6 @@ $('#clickToExit').bind('click', toggleDevTools);
function toggleDevTools() { function toggleDevTools() {
$('#devtools').toggle(); $('#devtools').toggle();
} }
var gameState = 0; var gameState = 0;
var framerate = 60; var framerate = 60;
var history = {}; var history = {};
@ -193,16 +192,17 @@ function render() {
} }
MainClock.draw(); MainClock.draw();
// drawPolygon(canvas.originalWidth / 2 , canvas.originalHeight / 2 , 6, 220, 30, '#BDA0CB', false,6); drawPolygon(canvas.originalWidth / 2 , canvas.originalHeight / 2 , 6, 220, 30, '#f39c12', false,6);
} }
function stepInitialLoad() { function stepInitialLoad() {
var dur = 1300; var dy = getStepDY(Date.now() - startTime, 0, 100 + canvas.height/2, 1300);
var dy = getStepDY(Date.now() - startTime, 0, 100 + canvas.originalHeight/2, dur); if (Date.now() - startTime > 1300) {
if (Date.now() - startTime > dur) {
MainClock.dy = 0; MainClock.dy = 0;
MainClock.y = canvas.originalHeight/2; MainClock.y = canvas.height/2;
gameState = 1; if (Date.now() - startTime - 500 > 1300) {
gameState = 1;
}
} else { } else {
MainClock.dy = dy; MainClock.dy = dy;
} }
@ -271,3 +271,8 @@ function checkGameOver() {
} }
return false; return false;
} }
window.onblur = function (e) {
gameState=-1;
}