Impaczus/2048
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
247 Commits 2 Branches 0 Tags
19a5b225c9ffaaf57f0b48a9747d323e8d984129
Commit Graph

79 Commits

Author SHA1 Message Date
Gabriele Cirulli a3c50eaf36 fix spacing above body 2014-05-06 16:24:24 +02:00
Gabriele Cirulli 3793755010 add app notice 2014-04-28 13:22:26 +02:00
Gabriele Cirulli 1ca07d765e add email form to game over screen 2014-03-24 19:07:26 +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 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 fa49d3bc5a Merge branch 'master' into gh-pages 2014-03-22 17:41:12 +01:00
Gabriele Cirulli bf1ba513c1 update css 2014-03-22 17:40:57 +01:00
Gabriele Cirulli 156ef6e50d Merge pull request #96 from jimminning/patch-3 
Update main.scss for -ms-user-select (IE)
 2014-03-22 17:39:02 +01:00
Gabriele Cirulli a0ca822b4f Merge branch 'master' into gh-pages 2014-03-22 17:32:17 +01:00
Gabriele Cirulli 3cfdcca0d2 increase margin above game field 2014-03-22 17:31:55 +01:00
Gabriele Cirulli f3c41d72b7 Merge branch 'master' into gh-pages 2014-03-22 17:28:48 +01:00
Gabriele Cirulli e729f7457f bring container margin top into variable and reduce it on mobile 2014-03-22 17:28:14 +01:00
Gabriele Cirulli 5afb368c15 merge new game button 2014-03-22 17:11:51 +01:00
Gabriele Cirulli 560859fcd9 restyle new game button to put it on the right side of the introduction 2014-03-22 17:00:50 +01:00
Gabriele Cirulli bd7f8963d0 Merge branch 'resume-game' of github.com:mfrederiksen/2048 into mfrederiksen-resume-game 2014-03-22 15:35:51 +01:00
Jim Minning 17f0f57b98 Update main.scss 
Added IE specific user select none, to prevent text selection on IE swiping.
 2014-03-22 07:28:51 -04: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
Mark Frederiksen 02a24c0610 Added persistence of game state to localstorage after each move 
Added rebuilding of game state from localstoage on page load
Added New Game button to allow game restarts now that refreshes resume the game
 2014-03-18 14:48:55 -04: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 c6d4e4f29f merge super tiles 2014-03-14 13:59:04 +01:00
Gabriele Cirulli f663e17a4b add styling for super tiles 2014-03-14 13:50:49 +01:00
Gabriele Cirulli a831baed58 merge infinite game 2014-03-14 13:22:29 +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
Gabriele Cirulli 91f0d161a0 merge transforms 2014-03-13 23:45:45 +01:00
Gabriele Cirulli 74494bb5f5 modify the game to allow using transforms 2014-03-13 23:11:02 +01:00
Marcin Gajda 7f187251a8 Windows Phone touch events 2014-03-13 20:27:09 +01:00
Gabriele Cirulli 1fa911145a remove space between buttons 2014-03-12 19:05:30 +01:00
Gabriele Cirulli 66b623dc1f add paypal donate button 2014-03-12 17:56:43 +01:00
Gabriele Cirulli 886712cc8e add basic css transform positions 2014-03-12 15:40:49 +01:00
Laurent Margirier 7b4c2c171f compile main.css 2014-03-12 13:37:08 +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 03ec53ea25 fix conflict 2014-03-12 13:03:37 +01:00
Gabriele Cirulli 385b65d086 mobile tweaks for best score 2014-03-12 12:55:40 +01:00
Gabriele Cirulli 39ebf51ce2 fix merge conflict 2014-03-12 11:23:22 +01:00
Gabriele Cirulli 29e4b85f32 update css 2014-03-11 22:21:34 +01: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
Gabriele Cirulli ce45d4cd8e improve bitcoin popup for mobile 2014-03-11 16:16:42 +01:00
Gabriele Cirulli ff72bf8a14 custom bitcoin icon 2014-03-11 15:56:37 +01:00
Gabriele Cirulli 603833b981 improve donate button animation 2014-03-11 15:47:11 +01:00
Gabriele Cirulli 9d50e7d746 add bitcoin donate button 2014-03-11 15:39:30 +01:00
Gabriele Cirulli 39f229a9fa merge mixin button 2014-03-11 15:22:20 +01:00
Gabriele Cirulli bfd21d6e6b add basic btc button 2014-03-11 15:20:47 +01:00
Gabriele Cirulli 92fda72cf5 move button styles to mixin 2014-03-11 15:18:20 +01:00
Gabriele Cirulli 6aa953cc1e add btc donate button 2014-03-11 11:52:03 +01:00