Commit Graph

265 Commits

Author SHA1 Message Date
Mikhail Novikov 0fc4354517 Merge branch 'twitter-cards-marketing' into gh-pages
Conflicts:
	cache.appcache
2014-12-13 15:18:00 +03:00
Lee Reilly 00b1f13e05 Update cache.appcache 2014-12-10 12:15:02 -08:00
Lee Reilly b69154b183 Simplify title in Twitter cards too 2014-12-09 16:28:34 -08:00
Lee Reilly 775e574041 Change title from '2048 Game' to to '2048' 2014-12-09 16:26:16 -08:00
Mikhail Novikov 96bc88a795 update cache manifest 2014-12-07 22:58:15 +03:00
Mikhail Novikov 09beaf57d1 Merge branch 'master' into gh-pages 2014-12-07 22:02:22 +03:00
Gabriele Cirulli f927cc556d Add maintainers to README 2014-12-07 19:54:43 +01:00
Gabriele Cirulli c36ad21655 Merge pull request #279 from sigod/numbers-positions
fix positions of tile numbers
2014-12-07 19:40:58 +01:00
Mikhail Novikov c1a02dc232 fix positions of tile numbers 2014-11-26 01:45:37 +03:00
Lee Reilly 19a5b225c9 Remove duplicate app tag 2014-11-09 13:24:30 -08:00
Lee Reilly 6ef707529b Add Twitter App Card 2014-11-09 12:37:24 -08:00
Lee Reilly 48881f3c6f Add Twitter Summary Card 2014-11-09 12:24:46 -08:00
Gabriele Cirulli 95be843b3f update footer notice 2014-05-07 12:44:40 +02:00
Gabriele Cirulli 538546423f Update README.md 2014-05-06 18:49:46 +02:00
Gabriele Cirulli f30cde505d Merge pull request #188 from zzatkin/patch-1
Update README.md
2014-05-06 18:48:43 +02:00
Zack Gold 0656e4c712 Update README.md
Spelling fix.
2014-05-06 12:45:07 -04:00
Gabriele Cirulli 4a115b7a87 update cache.appcache date 2014-05-06 16:25:08 +02:00
Gabriele Cirulli a3c50eaf36 fix spacing above body 2014-05-06 16:24:24 +02:00
Gabriele Cirulli 2d76d56f42 add app id for smart banner 2014-04-30 13:29:03 +02:00
Gabriele Cirulli 3793755010 add app notice 2014-04-28 13:22:26 +02:00
Gabriele Cirulli 6141e302b7 Merge pull request #158 from janschoenherr/patch-1
code cleanup
2014-04-16 22:05:13 +02:00
janschoenherr 3b86903e65 code cleanup 2014-04-16 10:54:51 +02:00
Gabriele Cirulli 542208d94a Merge pull request #112 from Josso/startup-image
Add startup-images for the iPhone
2014-04-06 23:05:12 +02:00
Gabriele Cirulli 2798bb0b1e Merge pull request #115 from iirelu/jshint-compliance
Made animframe_polyfill.js JSHint compliant
2014-03-27 19:11:49 +01:00
iirelu 82834dfc5b Made animframe_polyfill.js JSHint compliant
Reformatted a bunch to make JSHint happy.
2014-03-27 17:52:07 +00:00
Gabriele Cirulli b56159b5da disable phone detection0 2014-03-27 17:09:21 +01:00
Johan K. Jensen 1264d9b3f0 Add startup-images for the iPhone. 2014-03-27 14:20:32 +01:00
Gabriele Cirulli 7a6c761368 set status bar to black 2014-03-26 12:53:28 +01:00
Gabriele Cirulli 1ca07d765e add email form to game over screen 2014-03-24 19:07:26 +01:00
Gabriele Cirulli 26e2e0d2a2 update cache.appcache date 2014-03-23 20:22:43 +01:00
Gabriele Cirulli 5110b255e1 Merge branch 'master' into gh-pages 2014-03-23 20:22:41 +01:00
Gabriele Cirulli 878098f855 apply changes from #43 2014-03-23 20:21:58 +01:00
Gabriele Cirulli 9efe9dab55 update cache.appcache date 2014-03-23 20:18:02 +01:00
Gabriele Cirulli 888f0ad7fa Merge branch 'master' into gh-pages 2014-03-23 20:18:00 +01:00
Gabriele Cirulli b08fa8d6a4 apply css improvements from #68 2014-03-23 20:17:35 +01:00
Gabriele Cirulli 71baa9d3d7 Update CONTRIBUTING.md 2014-03-23 20:12:53 +01:00
Gabriele Cirulli 7dcbe28284 #98 improve contributing guide 2014-03-23 20:09:19 +01:00
Gabriele Cirulli d403f84d7d add https://github.com/mgarciaisaia mention to readme 2014-03-23 19:56:08 +01:00
Gabriele Cirulli 0f66c1834c update appcache with new files 2014-03-23 19:53:53 +01:00
Gabriele Cirulli 5edc10a077 merge android 2.3 support 2014-03-23 19:52:44 +01:00
Gabriele Cirulli cf01ca7e8b manually apply #81 2014-03-23 19:51:29 +01:00
Gabriele Cirulli b81c5e9a74 update cache.appcache date 2014-03-22 18:46:07 +01:00
Gabriele Cirulli 73a3db0c60 Merge branch 'master' into gh-pages 2014-03-22 18:46:06 +01:00
Gabriele Cirulli 2f91247132 improve comments in game manager 2014-03-22 18:45:48 +01:00
Gabriele Cirulli 77a09fd987 update cache.appcache date 2014-03-22 18:42:13 +01:00
Gabriele Cirulli fc414e45ae Merge branch 'master' into gh-pages 2014-03-22 18:42:08 +01:00
Gabriele Cirulli 6cb3d71a40 improve comments in game manager 2014-03-22 18:41:47 +01:00
Gabriele Cirulli 2cc4f2a4cd update appcache 2014-03-22 18:34:40 +01:00
Gabriele Cirulli 60ae35982b Merge branch 'master' into gh-pages 2014-03-22 18:33:33 +01:00
Gabriele Cirulli af683a7856 clear game state on game over 2014-03-22 18:33:24 +01:00