 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
|
fe04a69ba4
|
update appcache
|
2014-03-22 17:33:34 +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
|
17fe360df1
|
Merge branch 'master' of https://github.com/gabrielecirulli/2048
|
2014-03-22 17:09:08 +01:00 |
|
|
Gabriele Cirulli
|
8ad8318c7c
|
align assignments
|
2014-03-22 17:06:37 +01:00 |
|
|
Gabriele Cirulli
|
88e084a0d7
|
remove irrelevant size property on serialized game
|
2014-03-22 17:06:32 +01:00 |
|
|
Gabriele Cirulli
|
4fa41a045b
|
reintroduce "to" in intro
|
2014-03-22 17:01:36 +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
|
4ad15d4cbd
|
add R key to restart game
|
2014-03-22 16:35:47 +01:00 |
|
|
Gabriele Cirulli
|
a6531b08bd
|
add getter comments
|
2014-03-22 16:29:23 +01:00 |
|
|
Gabriele Cirulli
|
c48b92689d
|
refactor grid, gamemanager, tile
|
2014-03-22 16:24:11 +01:00 |
|
|
Gabriele Cirulli
|
4d294cf9b9
|
remove space to restart game, refactor code slightly
|
2014-03-22 16:11:19 +01:00 |
|
|
Gabriele Cirulli
|
08c50df938
|
rename LocalScoreManager to LocalStorageManager
|
2014-03-22 15:38:52 +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
|
6c12037b2a
|
Update README.md
|
2014-03-21 15:33:51 +01:00 |
|
|
Gabriele Cirulli
|
03052c9a27
|
Merge pull request #85 from MaciejCzyzewski/patch-2
Update README.md, centered screenshot!
|
2014-03-21 15:33:08 +01:00 |
|
|
Gabriele Cirulli
|
6c8d94c0cf
|
set black translucent bar on the web app
|
2014-03-21 13:04:29 +01:00 |
|
|
Gabriele Cirulli
|
82e55988b4
|
improve appcache
|
2014-03-20 23:10:22 +01:00 |
|
|
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 |
|
|
Maciej A. Czyzewski
|
9ca6e3c788
|
Update README.md, centered screenshot!
I think screenshot is better when it is centered.
|
2014-03-20 22:01:34 +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 |
|
|
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
|
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 |
|