Commit Graph

188 Commits

Author SHA1 Message Date
Gabriele Cirulli 864a6c9a6a Merge branch 'master' into gh-pages 2014-03-20 22:59:33 +01:00
Gabriele Cirulli a875a3ab96 match and replace the "Updated" comment 2014-03-20 22:59:00 +01:00
Gabriele Cirulli fb2e012f06 Merge branch 'master' into gh-pages 2014-03-20 22:40:37 +01:00
Gabriele Cirulli 6a4b3ec322 add basic rake file with appcache:update task 2014-03-20 19:57:48 +01:00
Gabriele Cirulli 856e168c32 Merge pull request #82 from TheSavior/appcache
Adding a cache manifest
2014-03-20 19:41:07 +01:00
Gabriele Cirulli 95ca668676 Update README.md 2014-03-19 19:17:32 +01:00
Gabriele Cirulli 40fc9014eb credit elektryk 2014-03-19 15:11:20 +01:00
Gabriele Cirulli 36222ca5fb Merge branch 'master' into gh-pages 2014-03-19 14:49:03 +01:00
Gabriele Cirulli b6e48e2f24 update scss 2014-03-19 14:45:54 +01:00
Gabriele Cirulli 2056ed480d Merge branch 'WP_touch_events' of github.com:elektryk/2048 into elektryk-WP_touch_events 2014-03-19 14:42:12 +01:00
Gabriele Cirulli 941e6eea99 Merge pull request #58 from imcotton/tweet-links
shorten links while tweeting, plus to ensure original counts
2014-03-15 00:26:37 +01:00
Cotton Hou f57c8b052b shorten links while tweeting, plus to ensure original counts 2014-03-15 06:39:45 +08:00
Gabriele Cirulli af61d052cb remove twitter uri 2014-03-14 23:09:25 +01:00
Gabriele Cirulli 907aff4266 remove git.io uri 2014-03-14 23:07:57 +01:00
Gabriele Cirulli 001a5b9ea2 merge threshold change 2014-03-14 18:32:22 +01:00
Gabriele Cirulli 01264c3252 set mobile threshold slightly wider than the board size 2014-03-14 18:31:04 +01:00
Gabriele Cirulli 90f9541b1d Merge pull request #56 from imcotton/tweet-links
shorten links while tweeting, ref #34
2014-03-14 18:25:36 +01:00
Cotton Hou 887c6b4cfe shorten links while tweeting, ref #34 2014-03-15 01:13:21 +08:00
Gabriele Cirulli c6d4e4f29f merge super tiles 2014-03-14 13:59:04 +01:00
Gabriele Cirulli f732d4f547 remove debug logging 2014-03-14 13:56:38 +01:00
Gabriele Cirulli db0dc7eae1 rename keep playing to keep going 2014-03-14 13:50:57 +01:00
Gabriele Cirulli f663e17a4b add styling for super tiles 2014-03-14 13:50:49 +01:00
Gabriele Cirulli 10c72a76b3 rename tile-gold to tile-super 2014-03-14 13:35:42 +01:00
Gabriele Cirulli 5392893cd6 rename GameOver to GameTerminated to avoid ambiguity 2014-03-14 13:34:05 +01:00
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 b7f09a4c23 Merge branch 'master' into gh-pages 2014-03-14 11:48:52 +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 702dd1aa39 Merge branch 'master' into gh-pages 2014-03-14 00:05:53 +01: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 91f0d161a0 merge transforms 2014-03-13 23:45:45 +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
Marcin Gajda 7f187251a8 Windows Phone touch events 2014-03-13 20:27:09 +01:00
Gabriele Cirulli 84fb0327d4 Merge branch 'master' into gh-pages 2014-03-13 17:10:43 +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 8b1f3a4f71 Merge branch 'master' into gh-pages 2014-03-12 21:58:27 +01: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