Merge branch 'gh-pages' of https://github.com/Hextris/hextris into gh…

…-pages
abianchi81 · Sep 5, 2014 · 8317f48 · 8317f48
2 parents 74e23d3 + 41664aa
commit 8317f48
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 15 deletions.
diff --git a/index.html b/index.html
@@ -37,20 +37,20 @@
 		<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/jquery.js"></script>
-		<script type = 'text/javascript' src="js_v8/save-state.js"></script>
-		<script type = 'text/javascript' src="js_v8/view.js"></script>
-		<script type = 'text/javascript' src="js_v8/wavegen.js"></script>
-		<script type = 'text/javascript' src="js_v8/math.js"></script>
-		<script type = 'text/javascript' src="js_v8/Block.js"></script>
-		<script type = 'text/javascript' src="js_v8/Hex.js"></script>
-		<script type = 'text/javascript' src="js_v8/Text.js"></script>
-		<script type = 'text/javascript' src="js_v8/comboTimer.js"></script>
-		<script type = 'text/javascript' src="js_v8/checking.js"></script>
-		<script type = 'text/javascript' src='js_v8/update.js'></script>
-		<script type = 'text/javascript' src='js_v8/render.js'></script>
-		<script type = 'text/javascript' src="js_v8/input.js"></script>
-		<script type = 'text/javascript' src="js_v8/main.js"></script>
-		<script type = 'text/javascript' src="js_v8/initialization.js"></script>
+		<script type = 'text/javascript' src="js_v9/save-state.js"></script>
+		<script type = 'text/javascript' src="js_v9/view.js"></script>
+		<script type = 'text/javascript' src="js_v9/wavegen.js"></script>
+		<script type = 'text/javascript' src="js_v9/math.js"></script>
+		<script type = 'text/javascript' src="js_v9/Block.js"></script>
+		<script type = 'text/javascript' src="js_v9/Hex.js"></script>
+		<script type = 'text/javascript' src="js_v9/Text.js"></script>
+		<script type = 'text/javascript' src="js_v9/comboTimer.js"></script>
+		<script type = 'text/javascript' src="js_v9/checking.js"></script>
+		<script type = 'text/javascript' src='js_v9/update.js'></script>
+		<script type = 'text/javascript' src='js_v9/render.js'></script>
+		<script type = 'text/javascript' src="js_v9/input.js"></script>
+		<script type = 'text/javascript' src="js_v9/main.js"></script>
+		<script type = 'text/javascript' src="js_v9/initialization.js"></script>
 		<script type = 'text/javascript' charset = 'utf-8' src = 'cordova.js'></script>
 	</head>
 	<body>
@@ -85,6 +85,8 @@ <h1 class = 'instructions_body'>Instructions</h1>
 		<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>
 			<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">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>
 			<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>

diff --git a/js_v8/Block.js → js_v9/Block.js b/js_v8/Block.js → js_v9/Block.js
diff --git a/js_v8/Hex.js → js_v9/Hex.js b/js_v8/Hex.js → js_v9/Hex.js
diff --git a/js_v8/Text.js → js_v9/Text.js b/js_v8/Text.js → js_v9/Text.js
diff --git a/js_v8/checking.js → js_v9/checking.js b/js_v8/checking.js → js_v9/checking.js
diff --git a/js_v8/comboTimer.js → js_v9/comboTimer.js b/js_v8/comboTimer.js → js_v9/comboTimer.js
diff --git a/js_v8/initialization.js → js_v9/initialization.js b/js_v8/initialization.js → js_v9/initialization.js
diff --git a/js_v8/input.js → js_v9/input.js b/js_v8/input.js → js_v9/input.js
diff --git a/js_v8/main.js → js_v9/main.js b/js_v8/main.js → js_v9/main.js
diff --git a/js_v8/math.js → js_v9/math.js b/js_v8/math.js → js_v9/math.js
diff --git a/js_v8/render.js → js_v9/render.js b/js_v8/render.js → js_v9/render.js
diff --git a/js_v8/save-state.js → js_v9/save-state.js b/js_v8/save-state.js → js_v9/save-state.js
diff --git a/js_v8/update.js → js_v9/update.js b/js_v8/update.js → js_v9/update.js
diff --git a/js_v8/view.js → js_v9/view.js b/js_v8/view.js → js_v9/view.js
@@ -135,7 +135,7 @@ function showText(text) {
             }
         }
     }
-    messages['gameover'] += "<div class='fltrt' id='tweetStuff'><a class='tweet' href='https://twitter.com/intent/tweet?text=Can you beat my score of "+ score +" points at&button_hashtag=hextris ? http://hextris.github.io/hextris' data-lang='en' data-related='hextris:hextris' target='_blank'>Share Your Score on Twitter!!!</a></div>"
+    messages['gameover'] += "<div class='fltrt' id='tweetStuff'><a class='tweet' href='https://twitter.com/intent/tweet?text=Can you beat my score of "+ score +" points at&button_hashtag=hextris ? http://hextris.github.io/hextris @hextris' data-lang='en' data-related='hextris:hextris' target='_blank'>Share Your Score on Twitter!!!</a></div>"
     $("#overlay").html(messages[text]);
     $("#overlay").fadeIn("1000", "swing");
 

diff --git a/js_v8/wavegen.js → js_v9/wavegen.js b/js_v8/wavegen.js → js_v9/wavegen.js