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

Fixed merge conflict

Browse source
This commit is contained in:
Noah Moroze 2014-09-23 20:09:57 -04:00
commit 14dd2f8e7a
16 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
index.html
View file

@ -37,20 +37,20 @@
<script type = 'text/javascript' src="vendor/jsonfn.min.js"></script> <script type = 'text/javascript' src="vendor/jsonfn.min.js"></script>
<script type = 'text/javascript' src="vendor/keypress.min.js"></script> <script type = 'text/javascript' src="vendor/keypress.min.js"></script>
<script type = 'text/javascript' src="vendor/jquery.js"></script> <script type = 'text/javascript' src="vendor/jquery.js"></script>
<script type = 'text/javascript' src="js_v8/save-state.js"></script> <script type = 'text/javascript' src="js_v9/save-state.js"></script>
<script type = 'text/javascript' src="js_v8/view.js"></script> <script type = 'text/javascript' src="js_v9/view.js"></script>
<script type = 'text/javascript' src="js_v8/wavegen.js"></script> <script type = 'text/javascript' src="js_v9/wavegen.js"></script>
<script type = 'text/javascript' src="js_v8/math.js"></script> <script type = 'text/javascript' src="js_v9/math.js"></script>
<script type = 'text/javascript' src="js_v8/Block.js"></script> <script type = 'text/javascript' src="js_v9/Block.js"></script>
<script type = 'text/javascript' src="js_v8/Hex.js"></script> <script type = 'text/javascript' src="js_v9/Hex.js"></script>
<script type = 'text/javascript' src="js_v8/Text.js"></script> <script type = 'text/javascript' src="js_v9/Text.js"></script>
<script type = 'text/javascript' src="js_v8/comboTimer.js"></script> <script type = 'text/javascript' src="js_v9/comboTimer.js"></script>
<script type = 'text/javascript' src="js_v8/checking.js"></script> <script type = 'text/javascript' src="js_v9/checking.js"></script>
<script type = 'text/javascript' src='js_v8/update.js'></script> <script type = 'text/javascript' src='js_v9/update.js'></script>
<script type = 'text/javascript' src='js_v8/render.js'></script> <script type = 'text/javascript' src='js_v9/render.js'></script>
<script type = 'text/javascript' src="js_v8/input.js"></script> <script type = 'text/javascript' src="js_v9/input.js"></script>
<script type = 'text/javascript' src="js_v8/main.js"></script> <script type = 'text/javascript' src="js_v9/main.js"></script>
<script type = 'text/javascript' src="js_v8/initialization.js"></script> <script type = 'text/javascript' src="js_v9/initialization.js"></script>
<script type = 'text/javascript' charset = 'utf-8' src = 'cordova.js'></script> <script type = 'text/javascript' charset = 'utf-8' src = 'cordova.js'></script>
</head> </head>
<body> <body>
@ -85,6 +85,8 @@
<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>
<a href="https://twitter.com/hextris" class="twitter-follow-button" data-show-count="false" data-show-screen-name="false">Follow @hextris</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
<iframe id = 'ghl' src="http://ghbtns.com/github-btn.html?user=Hextris&repo=Hextris&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="90" height="20" onload='showbottombar()'></iframe> <iframe id = 'ghl' src="http://ghbtns.com/github-btn.html?user=Hextris&repo=Hextris&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="90" height="20" onload='showbottombar()'></iframe>
</div> </div>

0
js_v8/Block.js → js_v9/Block.js
View file

0
js_v8/Hex.js → js_v9/Hex.js
View file

0
js_v8/Text.js → js_v9/Text.js
View file

0
js_v8/checking.js → js_v9/checking.js
View file

0
js_v8/comboTimer.js → js_v9/comboTimer.js
View file

0
js_v8/initialization.js → js_v9/initialization.js
View file

0
js_v8/input.js → js_v9/input.js
View file

0
js_v8/main.js → js_v9/main.js
View file

0
js_v8/math.js → js_v9/math.js
View file

0
js_v8/render.js → js_v9/render.js
View file

0
js_v8/save-state.js → js_v9/save-state.js
View file

0
js_v8/update.js → js_v9/update.js
View file

0
js_v8/view.js → js_v9/view.js
View file

0
js_v8/wavegen.js → js_v9/wavegen.js
View file

2
style/style.css
View file

@ -304,7 +304,7 @@ body {
width:1000px; width:1000px;
text-align:center; text-align:center;
left:50%; left:50%;
margin-left:-510px; margin-left:-500px;
bottom:10px; bottom:10px;
z-index:98; z-index:98;
} }