 Gabriele Cirulli
|
bd7f8963d0
|
Merge branch 'resume-game' of github.com:mfrederiksen/2048 into mfrederiksen-resume-game
|
2014-03-22 15:35:51 +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
|
01264c3252
|
set mobile threshold slightly wider than the board size
|
2014-03-14 18:31: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
|
8772e1aee9
|
fix fill mode helper
|
2014-03-14 11:47:54 +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
|
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
|
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
|
92fda72cf5
|
move button styles to mixin
|
2014-03-11 15:18:20 +01:00 |
|
|
Gabriele Cirulli
|
5a49a0ef91
|
add basic iphone support
|
2014-03-10 21:31:41 +01:00 |
|
|
Tim Petricola
|
664546ef9a
|
Store best score in localStorage
Dependency injection and hide best score for incompatible browsers
|
2014-03-10 16:21:05 -04:00 |
|
|
Gabriele Cirulli
|
433127cd93
|
remove use of class list in actuator, fix animations for firefox
|
2014-03-10 18:03:43 +01:00 |
|
|
Gabriele Cirulli
|
d24c67a458
|
update rendered stylesheet
|
2014-03-10 12:08:10 +01:00 |
|
|
Gabriele Cirulli
|
46813070ac
|
add container around sharing functionality
|
2014-03-10 12:07:11 +01:00 |
|
|
Gabriele Cirulli
|
02b66ccb9b
|
add retry button
|
2014-03-10 11:31:10 +01:00 |
|
|
Gabriele Cirulli
|
378ca283f2
|
increase padding on score
|
2014-03-09 23:59:53 +01:00 |
|
|
Gabriele Cirulli
|
e65111f13b
|
add win condition
|
2014-03-09 23:43:56 +01:00 |
|
|
Gabriele Cirulli
|
4b3055fcd0
|
add movement check, score addition
|
2014-03-09 23:24:17 +01:00 |
|
|
Gabriele Cirulli
|
f18f7cee22
|
add score and endgame
|
2014-03-09 23:03:13 +01:00 |
|
|
Gabriele Cirulli
|
53e08722e0
|
add tile merging
|
2014-03-09 20:03:04 +01:00 |
|
|
Gabriele Cirulli
|
b20e26e3bd
|
implement tile movement
|
2014-03-09 14:32:30 +01:00 |
|
|
Gabriele Cirulli
|
fd2927c37c
|
add game explanation, remove test tiles
|
2014-03-05 23:15:57 +01:00 |
|
|
Gabriele Cirulli
|
43aaf123a0
|
mix colors with optional predefined colors for each tile
|
2014-03-05 18:50:32 +01:00 |
|
|
Gabriele Cirulli
|
71122e1f64
|
reduce glow opacity
|
2014-03-05 17:35:55 +01:00 |
|
|
Gabriele Cirulli
|
3f6f06e2df
|
fade tile text to white
|
2014-03-05 17:34:04 +01:00 |
|
|
Gabriele Cirulli
|
61f20acec6
|
adjust font sizes, add transition and cursor states
|
2014-03-05 17:02:54 +01:00 |
|
|
Gabriele Cirulli
|
5e41f41a69
|
generate tile colors automatically
|
2014-03-05 16:33:31 +01:00 |
|
|
Gabriele Cirulli
|
e3a548bd40
|
add sass helpers
|
2014-03-05 16:15:11 +01:00 |
|
|
Gabriele Cirulli
|
a26e1c6bbd
|
rename style.scss to main.scss
|
2014-03-05 16:10:54 +01:00 |
|
|
Gabriele Cirulli
|
c45115f9ae
|
move fonts to style
|
2014-03-05 16:09:11 +01:00 |
|
|
Gabriele Cirulli
|
22ef3be645
|
move css to style dir
|
2014-03-05 16:08:17 +01:00 |
|