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

honestly cant remember

Browse source
This commit is contained in:
Garrett Finucane 2015-03-14 13:18:05 -04:00
parent dd310aeaba
commit 6630e5723e
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
index.html
View file

@ -80,10 +80,11 @@
<h1 class = 'instructions_body'>Instructions</h1> <h1 class = 'instructions_body'>Instructions</h1>
<p class = 'instructions_body' id = 'inst_main_body'></p> <p class = 'instructions_body' id = 'inst_main_body'></p>
</div> </div>
<div id="openSideBar" class = 'helpText'><i class="fa fa-info-circle fa-lg"></i> <i class="fa fa-arrow-left"><b> Help</b></i></div> <img id="openSideBar" class = 'helpText' src="./images/btn_help.svg" />
<div class="faded overlay"></div> <div class="faded overlay"></div>
<div id = 'pauseBtn'><div id = 'pauseBtnInner'><img src="./images/btn_pause.svg" /></div></div> <div id = 'pauseBtn'><div id = 'pauseBtnInner'><img src="./images/btn_pause.svg" /></div></div>
<div id = 'restartBtn'><div id = 'restartBtnInner'><i class="fa fa-refresh fa-2x"></i></div></div> <div id = 'pauseBtn'><div id = 'pauseBtnInner'><img src="./images/btn_pause.svg" /></div></div>
<div id = 'restartBtn'><div id = 'restartBtnInner'><img src="./images/btn_restart.svg" /></div></div>
<div id="bottombar"> <div id="bottombar">
<div style="bottom:4px; padding-right:4px;" class="fb-like" data-href="http://hextris.github.io/hextris" data-width="20" data-layout="button_count" data-action="like" data-show-faces="false" data-share="true"></div> <div style="bottom:4px; padding-right:4px;" class="fb-like" data-href="http://hextris.github.io/hextris" data-width="20" data-layout="button_count" data-action="like" data-show-faces="false" data-share="true"></div>
<a onClick="tweetblock=true" href="https://twitter.com/intent/tweet?hashtags=hextris&original_referer=http%3A%2F%2F0.0.0.0%3A8080%2F&text=Play%20Hextris!%20-&tw_p=tweetbutton&url=http%3A%2F%2Fhextris.github.io%2F" class="twitter-share-button" data-url="http://hextris.github.io/" data-text="Play Hextris! -" data-hashtags="hextris">Tweet</a> <a onClick="tweetblock=true" href="https://twitter.com/intent/tweet?hashtags=hextris&original_referer=http%3A%2F%2F0.0.0.0%3A8080%2F&text=Play%20Hextris!%20-&tw_p=tweetbutton&url=http%3A%2F%2Fhextris.github.io%2F" class="twitter-share-button" data-url="http://hextris.github.io/" data-text="Play Hextris! -" data-hashtags="hextris">Tweet</a>

14
js_v9/input.js
View file

@ -66,7 +66,7 @@ function addKeyListeners() {
keys: "enter", keys: "enter",
on_keydown: function() { on_keydown: function() {
if (gameState==2 || gameState==1 || importing == 1) { if (gameState==2 || gameState==1 || importing == 1) {
init(); init(1);
} }
if (gameState===0) { if (gameState===0) {
resumeGame(); resumeGame();
@ -82,7 +82,7 @@ function addKeyListeners() {
if ($('#helpScreen').is(":visible")) { if ($('#helpScreen').is(":visible")) {
$('#helpScreen').fadeOut(150, "linear"); $('#helpScreen').fadeOut(150, "linear");
} }
alert("hey");
pause(); pause();
return false; return false;
}); });
@ -115,13 +115,13 @@ function addKeyListeners() {
if(/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) { if(/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
$("#restartBtn").on('touchstart', function() { $("#restartBtn").on('touchstart', function() {
init(); init(1);
canRestart = false; canRestart = false;
}); });
} }
else { else {
$("#restartBtn").on('mousedown', function() { $("#restartBtn").on('mousedown', function() {
init(); init(1);
canRestart = false; canRestart = false;
}); });
} }
@ -174,7 +174,7 @@ function handleClickTap(x,y) {
} }
else{ else{
if (gameState != 1) { if (gameState != 1) {
init(); init(1);
} }
} }
return; return;
@ -192,7 +192,7 @@ function handleClickTap(x,y) {
resumeGame(); resumeGame();
} }
else { else {
init(); init(1);
} }
} }
@ -204,7 +204,7 @@ function handleClickTap(x,y) {
resumeGame(); resumeGame();
} }
else { else {
init(); init(1);
} }
} }
MainHex.rotate(-1); MainHex.rotate(-1);

10
style/style.css
View file

@ -74,6 +74,8 @@ button:focus {
#openSideBar { #openSideBar {
position: absolute; position: absolute;
width:60px;
height:60px;
top: 2px; top: 2px;
left: 4px; left: 4px;
z-index: 3002; z-index: 3002;
@ -96,10 +98,6 @@ button:focus {
z-index:99; z-index:99;
} }
#restartBtnInner {
margin-top:28px;
}
#restartBtn { #restartBtn {
position:absolute; position:absolute;
left:0; left:0;
@ -108,8 +106,8 @@ button:focus {
bottom:0; bottom:0;
z-index:99; z-index:99;
position: absolute; position: absolute;
margin-bottom: 3px; margin-bottom: 18px;
margin-left: 7px; margin-left: 10px;
z-index:99; z-index:99;
color:#232323; color:#232323;
cursor:pointer; cursor:pointer;