 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
|
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 |
|
|
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 |
|
|
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 |
|
|
Gabriele Cirulli
|
68f7e4a9c8
|
merge iphone version
|
2014-03-10 21:38:38 +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
|
9d48120a14
|
Merge branch 'master' into gh-pages
|
2014-03-10 18:04:14 +01: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
|
a85abfdaba
|
merge master
|
2014-03-10 12:10:22 +01:00 |
|
|
Gabriele Cirulli
|
06fa37b0ae
|
add twitter sharing to game over screen
|
2014-03-10 12:09:35 +01:00 |
|
|
Gabriele Cirulli
|
d24c67a458
|
update rendered stylesheet
|
2014-03-10 12:08:10 +01:00 |
|
|
Gabriele Cirulli
|
c84ebb04b5
|
merge master & readd ga
|
2014-03-10 11:33:06 +01:00 |
|
|
Gabriele Cirulli
|
02b66ccb9b
|
add retry button
|
2014-03-10 11:31:10 +01:00 |
|