1
0
mirror of https://github.com/danog/2048.git synced 2024-11-27 03:44:43 +01:00
Commit Graph

109 Commits

Author SHA1 Message Date
Gabriele Cirulli
cfbf74905f refactor code 2014-03-14 13:27:57 +01:00
Gabriele Cirulli
a831baed58 merge infinite game 2014-03-14 13:22:29 +01:00
Gabriele Cirulli
2bf48efe68 change local storage support check 2014-03-14 12:33:32 +01:00
Gabriele Cirulli
15057fd625 Merge pull request #50 from codeKonami/master
adding a test to verify the localStorage is supported
2014-03-14 12:29:05 +01:00
Gabriele Cirulli
8772e1aee9 fix fill mode helper 2014-03-14 11:47:54 +01:00
codeKonami
9274840ced adding a test to verify the localStorage is supported fixing a bug on private browsing on safari 2014-03-14 14:25:26 +13:00
Gabriele Cirulli
f943d2a745 Merge pull request #42 from david-risney/fix-try-again-bug
Ensure the Try Again button actually disappears when selected in IE
2014-03-14 00:03:59 +01:00
Gabriele Cirulli
7c6fd1b2a4 Merge pull request #28 from gabrielecirulli/use-transforms
Use transforms for tile positions
2014-03-13 23:14:06 +01:00
Gabriele Cirulli
74494bb5f5 modify the game to allow using transforms 2014-03-13 23:11:02 +01:00
Gabriele Cirulli
92399414eb Merge pull request #48 from iharosi/master
minimal-ui added to allow fullscreen on iOS 7.1
2014-03-13 23:04:20 +01:00
Gabriele Cirulli
ca5762310a Merge branch 'master' into use-transforms 2014-03-13 22:53:06 +01:00
Gergely Iharosi
7f1a82e41e minimal-ui added to allow fullscreen on iOS 7.1
More details on the iOS dev site: http://goo.gl/H6RILo
2014-03-13 22:52:25 +01:00
Gabriele Cirulli
d7ef12e41c change site note 2014-03-13 17:10:14 +01:00
Gabriele Cirulli
425076c759 add official site note 2014-03-13 16:51:55 +01:00
Laurent Margirier
c329f35796 Update refs 2014-03-13 10:40:59 +01:00
Laurent Margirier
bd62716d60 add touchend event (see PR #32) 2014-03-13 10:17:57 +01:00
Laurent Margirier
e7be14d65a compile main.css 2014-03-13 10:16:19 +01:00
Laurent Margirier
9626e2b060 Endless Game. Allow user to continue the game.
- main.css isn't compiled
- a special class `.tile-gold` is added to tiles above 2048
2014-03-13 10:16:19 +01:00
Dave Risney
472e30cd35 Ensure the Try Again button actually disappears when selected in Internet Explorer 2014-03-12 20:17:03 -07:00
Gabriele Cirulli
da75b7a44e Merge pull request #32 from coding46/patch-1
[BUGFIX] Add touch event handler for retry button
2014-03-12 21:56:13 +01:00
Gabriele Cirulli
bd8516ac7d Merge pull request #29 from TimPetricola/fix-readme
Fix README
2014-03-12 18:04:16 +01:00
G. Bodenschatz
fc6206ab39 [BUGFIX] Add touch event handler for retry button 2014-03-12 18:03:11 +01:00
Tim Petricola
ffcb772937 Fix README 2014-03-12 10:56:54 -04:00
Gabriele Cirulli
886712cc8e add basic css transform positions 2014-03-12 15:40:49 +01:00
Gabriele Cirulli
7723697873 Merge pull request #20 from leereilly/ios-launch-icon
Some tweaks for iOS devices
2014-03-12 13:39:04 +01:00
Laurent Margirier
7b4c2c171f compile main.css 2014-03-12 13:37:08 +01:00
Gabriele Cirulli
608ca2844b improve code structure in localscoremanager 2014-03-12 13:35:42 +01:00
Gabriele Cirulli
88278792be small change in scoremanager 2014-03-12 13:31:09 +01:00
Gabriele Cirulli
a862d44849 add screnshot section 2014-03-12 13:15:38 +01:00
Gabriele Cirulli
0c771c88f0 add mentions to readme 2014-03-12 13:15:10 +01:00
Laurent Margirier
e61ef18824 Endless Game. Allow user to continue the game.
- main.css isn't compiled
- a special class `.tile-gold` is added to tiles above 2048
2014-03-12 13:05:57 +01:00
Gabriele Cirulli
d9fef6095f remove analytics from master branch 2014-03-12 13:04:16 +01:00
Gabriele Cirulli
385b65d086 mobile tweaks for best score 2014-03-12 12:55:40 +01:00
Gabriele Cirulli
b080e5300d add small code tweaks 2014-03-12 12:15:57 +01:00
Gabriele Cirulli
39ebf51ce2 fix merge conflict 2014-03-12 11:23:22 +01:00
Gabriele Cirulli
3dd8f3e527 Merge pull request #22 from ghoullier/master
Use querySelector instead of getElementsByClassName
2014-03-12 10:48:18 +01:00
Grégory HOULLIER
95a2676b3b Use querySelector instead of getElementsByClassName 2014-03-12 08:59:12 +01:00
Lee Reilly
4010bbb46c Fix relative path issue - github.io vs. CNAME 2014-03-11 22:42:59 -07:00
Lee Reilly
d990b3a56f Add metadata images to meta folder for consistency 2014-03-11 22:40:10 -07:00
Lee Reilly
f071712a72 Hide the browser UI on 📱 2014-03-11 22:33:56 -07:00
Lee Reilly
350e673835 Add launcher icon for 🍎 devices 2014-03-11 22:32:12 -07:00
Gabriele Cirulli
29e4b85f32 update css 2014-03-11 22:21:34 +01:00
Gabriele Cirulli
f251f5c898 remove hammer, small js changes 2014-03-11 22:18:56 +01:00
Gabriele Cirulli
db82cf4952 Merge pull request #16 from chrisprice/master
Replace hammer with touch event handling
2014-03-11 22:15:19 +01:00
Chris Price
cf4087e87d Replace hammer with touch event handling 2014-03-11 20:34:47 +00:00
Tim Petricola
77654452a7 Merge remote-tracking branch 'upstream/master' into best-score
Conflicts:
	index.html
	js/application.js
	js/html_actuator.js
2014-03-11 12:05:42 -04:00
Tim Petricola
d6da8d9925 localStorage fallback 2014-03-11 11:52:02 -04:00
Gabriele Cirulli
39ba3a986f Merge pull request #13 from remram44/readme-fixes
Minor fixes to README
2014-03-11 16:41:28 +01:00
Gabriele Cirulli
5c6327f390 add WASD controls (closes #10) 2014-03-11 16:31:39 +01:00
Remi Rampin
988d71f7a0 Minor fixes to README 2014-03-11 11:26:18 -04:00