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

Merge branch 'master' of http://github.com/teamsnowman/hextris

Browse source
This commit is contained in:
garrettdreyfus 2014-05-24 14:38:36 -04:00
commit ae13307b64
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
index.html
View file

@ -15,7 +15,7 @@
body {
color: #ecf0f1;
font-family: 'Roboto', sans-serif;
background-color:#ecf0f1;
background-color:#ecf0f1;
}
#clickToExit {
@ -27,14 +27,14 @@
left: calc(50% - 80vmin / 2);
height: 80vmin;
width: 80vmin;
background-color:#ecf0f1;
background-color:#ecf0f1;
z-index:3;
}
#title {
z-index:99999;
margin-top:20px;
color:#2c3e50;
color:#2c3e50;
}
</style>
</head>

4
js/main.js
View file

@ -197,10 +197,10 @@ function render() {
function stepInitialLoad() {
var dur = 1300;
var dy = getStepDY(Date.now() - startTime, 0, 100 + canvas.height/2, dur);
var dy = getStepDY(Date.now() - startTime, 0, 100 + canvas.originalHeight/2, dur);
if (Date.now() - startTime > dur) {
MainClock.dy = 0;
MainClock.y = canvas.height/2;
MainClock.y = canvas.originalHeight/2;
gameState = 1;
} else {
MainClock.dy = dy;