Merge branch 'master' into use-transforms
Merge branch 'master' into use-transforms

file:a/README.md -> file:b/README.md
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 ### Contributions
 
- - [TimPetricola](https://github.com/warmwaffles) added best score storage
+ - [TimPetricola](https://github.com/TimPetricola) added best score storage
  - [chrisprice](https://github.com/chrisprice) added custom code for swipe handling on mobile
 
 Many thanks to [rayhaanj](https://github.com/rayhaanj), [Mechazawa](https://github.com/Mechazawa), [grant](https://github.com/grant), [remram44](https://github.com/remram44) and [ghoullier](https://github.com/ghoullier) for the many other good contributions.

file:a/index.html -> file:b/index.html
--- a/index.html
+++ b/index.html
@@ -69,6 +69,10 @@
     </p>
     <hr>
     <p>
+    <strong class="important">Note:</strong> This site is the official version of 2048. You can play it on your phone via <a href="http://git.io/2048">http://git.io/2048.</a> All other apps or sites are derivatives or fakes, and should be used with caution.
+    </p>
+    <hr>
+    <p>
     Created by <a href="http://gabrielecirulli.com" target="_blank">Gabriele Cirulli.</a> Based on <a href="https://itunes.apple.com/us/app/1024!/id823499224" target="_blank">1024 by Veewo Studio</a> and conceptually similar to <a href="http://asherv.com/threes/" target="_blank">Threes by Asher Vollmer.</a>
     </p>
   </div>

--- a/js/keyboard_input_manager.js
+++ b/js/keyboard_input_manager.js
@@ -55,6 +55,7 @@
 
   var retry = document.getElementsByClassName("retry-button")[0];
   retry.addEventListener("click", this.restart.bind(this));
+  retry.addEventListener("touchend", this.restart.bind(this));
 
   // Listen to swipe events
   var touchStartClientX, touchStartClientY;

comments