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

fixed merge conflicts

Browse source
This commit is contained in:
lengstrom 2014-07-21 10:23:22 -04:00
commit fa2a6433fc
4 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/comboTimer.js
View file

@ -1,4 +1,5 @@
function drawTimer() {
if(gameState==1){
var leftVertexes = [];
var rightVertexes = [];
if(MainHex.ct - MainHex.lastCombo < settings.comboTime){
@ -17,6 +18,7 @@ function drawTimer() {
}
if(rightVertexes.length !== 0) drawSide(rightVertexes);
if(leftVertexes.length !== 0) drawSide(leftVertexes);
}
}
function calcSide(startVertex,endVertex,fraction,offset){
@ -66,4 +68,4 @@ function drawSide(vertexes){
ctx.fill();
ctx.stroke();
}
}

2
js/main.js
View file

@ -58,6 +58,7 @@ function hideUIElements() {
$('#restartBtn').hide();
$('#startBtn').hide();
$("#attributions").hide();
$("#bottombar").hide();
}
function init(b) {
@ -189,6 +190,7 @@ function setStartScreen() {
$('#restartBtn').show();
$('#startBtn').show();
$('#attributions').show();
$("#bottombar").show();
gameState = 0;
requestAnimFrame(animLoop);

21
js/view.js
View file

@ -94,8 +94,8 @@ function toggleClass(element, active) {
function showText(text){
var messages = {
'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 class = 'centeredSubSubHeader'>Click here for the main menu!</div></div>",
'pausedMobile':"<div class='centeredHeader unselectable'>Paused</div><div style='height:100px;line-height:100px;cursor:pointer;'><div class = 'centeredSubSubHeader'>Tap here for the main menu!</div></div>",
'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><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'>"
};
@ -164,22 +164,6 @@ function showText(text){
});
}
if (text == 'paused') {
$(".centeredSubSubHeader").on('mousedown', function() {
localStorage.setItem("saveState", exportSaveState());
$('#restartBtn').hide();
canRestart = false;
setTimeout(setMainMenu, 2);
});
} else if (text == 'pausedMobile') {
$(".centeredSubSubHeader").on('touchstart', function() {
localStorage.setItem("saveState", exportSaveState());
$('#restartBtn').hide();
setTimeout(setMainMenu, 2);
canRestart = false;
});
}
}
function setMainMenu() {
@ -203,6 +187,7 @@ function hideText(text){
}
function gameOverDisplay(){
updateHighScore();
$("#attributions").show();
var c = document.getElementById("canvas");
c.className = "blur";
showText('gameover');

2
style/style.css
View file

@ -289,4 +289,4 @@ body {
margin-left:-500px;
bottom:10px;
z-index:98;
}
}