Razvan Stanga [Tue, 15 Apr 2014 08:41:56 +0000 ]
added timer
Gabriele Cirulli [Sun, 06 Apr 2014 21:05:12 +0000 ]
Merge pull request #112 from Josso/startup-image
Add startup-images for the iPhone
Gabriele Cirulli [Thu, 27 Mar 2014 18:11:49 +0000 ]
Merge pull request #115 from iirelu/jshint-compliance
Made animframe_polyfill.js JSHint compliant
iirelu [Thu, 27 Mar 2014 17:52:07 +0000 ]
Made animframe_polyfill.js JSHint compliant
Reformatted a bunch to make JSHint happy.
Johan K. Jensen [Thu, 27 Mar 2014 13:20:32 +0000 ]
Add startup-images for the iPhone.
Gabriele Cirulli [Sun, 23 Mar 2014 19:21:58 +0000 ]
apply changes from #43
Gabriele Cirulli [Sun, 23 Mar 2014 19:17:22 +0000 ]
apply css improvements from #68
Gabriele Cirulli [Sun, 23 Mar 2014 19:12:53 +0000 ]
Update CONTRIBUTING.md
Gabriele Cirulli [Sun, 23 Mar 2014 19:09:19 +0000 ]
#98 improve contributing guide
Gabriele Cirulli [Sun, 23 Mar 2014 18:56:08 +0000 ]
add https://github.com/mgarciaisaia mention to readme
Gabriele Cirulli [Sun, 23 Mar 2014 18:51:29 +0000 ]
manually apply #81
Gabriele Cirulli [Sat, 22 Mar 2014 17:45:48 +0000 ]
improve comments in game manager
Gabriele Cirulli [Sat, 22 Mar 2014 17:41:47 +0000 ]
improve comments in game manager
Gabriele Cirulli [Sat, 22 Mar 2014 17:33:24 +0000 ]
clear game state on game over
Gabriele Cirulli [Sat, 22 Mar 2014 16:40:57 +0000 ]
update css
Gabriele Cirulli [Sat, 22 Mar 2014 16:39:02 +0000 ]
Merge pull request #96 from jimminning/patch-3
Update main.scss for -ms-user-select (IE)
Gabriele Cirulli [Sat, 22 Mar 2014 16:31:55 +0000 ]
increase margin above game field
Gabriele Cirulli [Sat, 22 Mar 2014 16:28:14 +0000 ]
bring container margin top into variable and reduce it on mobile
Gabriele Cirulli [Sat, 22 Mar 2014 16:09:08 +0000 ]
Merge branch 'master' of https://github.com/gabrielecirulli/2048
Gabriele Cirulli [Sat, 22 Mar 2014 16:06:37 +0000 ]
align assignments
Gabriele Cirulli [Sat, 22 Mar 2014 16:06:32 +0000 ]
remove irrelevant size property on serialized game
Gabriele Cirulli [Sat, 22 Mar 2014 16:01:36 +0000 ]
reintroduce "to" in intro
Gabriele Cirulli [Sat, 22 Mar 2014 16:00:50 +0000 ]
restyle new game button to put it on the right side of the introduction
Gabriele Cirulli [Sat, 22 Mar 2014 15:35:47 +0000 ]
add R key to restart game
Gabriele Cirulli [Sat, 22 Mar 2014 15:29:23 +0000 ]
add getter comments
Gabriele Cirulli [Sat, 22 Mar 2014 15:24:11 +0000 ]
refactor grid, gamemanager, tile
Gabriele Cirulli [Sat, 22 Mar 2014 15:11:19 +0000 ]
remove space to restart game, refactor code slightly
Gabriele Cirulli [Sat, 22 Mar 2014 14:38:52 +0000 ]
rename LocalScoreManager to LocalStorageManager
Gabriele Cirulli [Sat, 22 Mar 2014 14:35:51 +0000 ]
Merge branch 'resume-game' of github.com:mfrederiksen/2048 into mfrederiksen-resume-game
Jim Minning [Sat, 22 Mar 2014 11:28:51 +0000 ]
Update main.scss
Added IE specific user select none, to prevent text selection on IE swiping.
Gabriele Cirulli [Fri, 21 Mar 2014 14:33:51 +0000 ]
Update README.md
Gabriele Cirulli [Fri, 21 Mar 2014 14:33:08 +0000 ]
Merge pull request #85 from MaciejCzyzewski/patch-2
Update README.md, centered screenshot!
Gabriele Cirulli [Thu, 20 Mar 2014 21:59:00 +0000 ]
match and replace the "Updated" comment
Maciej A. Czyzewski [Thu, 20 Mar 2014 21:01:34 +0000 ]
Update README.md, centered screenshot!
I think screenshot is better when it is centered.
Gabriele Cirulli [Thu, 20 Mar 2014 18:57:48 +0000 ]
add basic rake file with appcache:update task
Gabriele Cirulli [Wed, 19 Mar 2014 18:17:32 +0000 ]
Update README.md
Gabriele Cirulli [Wed, 19 Mar 2014 14:11:20 +0000 ]
credit elektryk
Gabriele Cirulli [Wed, 19 Mar 2014 13:45:54 +0000 ]
update scss
Gabriele Cirulli [Wed, 19 Mar 2014 13:42:12 +0000 ]
Merge branch 'WP_touch_events' of github.com:elektryk/2048 into elektryk-WP_touch_events
Mark Frederiksen [Tue, 18 Mar 2014 18:48:55 +0000 ]
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
Gabriele Cirulli [Fri, 14 Mar 2014 17:31:04 +0000 ]
set mobile threshold slightly wider than the board size
Gabriele Cirulli [Fri, 14 Mar 2014 12:56:38 +0000 ]
remove debug logging
Gabriele Cirulli [Fri, 14 Mar 2014 12:50:57 +0000 ]
rename keep playing to keep going
Gabriele Cirulli [Fri, 14 Mar 2014 12:50:49 +0000 ]
add styling for super tiles
Gabriele Cirulli [Fri, 14 Mar 2014 12:35:42 +0000 ]
rename tile-gold to tile-super
Gabriele Cirulli [Fri, 14 Mar 2014 12:34:05 +0000 ]
rename GameOver to GameTerminated to avoid ambiguity
Gabriele Cirulli [Fri, 14 Mar 2014 12:27:57 +0000 ]
refactor code
Gabriele Cirulli [Fri, 14 Mar 2014 12:22:29 +0000 ]
merge infinite game
Gabriele Cirulli [Fri, 14 Mar 2014 11:33:32 +0000 ]
change local storage support check
Gabriele Cirulli [Fri, 14 Mar 2014 11:29:05 +0000 ]
Merge pull request #50 from codeKonami/master
adding a test to verify the localStorage is supported
Gabriele Cirulli [Fri, 14 Mar 2014 10:47:54 +0000 ]
fix fill mode helper
codeKonami [Fri, 14 Mar 2014 01:25:26 +0000 ]
adding a test to verify the localStorage is supported fixing a bug on private browsing on safari
Gabriele Cirulli [Thu, 13 Mar 2014 23:03:59 +0000 ]
Merge pull request #42 from david-risney/fix-try-again-bug
Ensure the Try Again button actually disappears when selected in IE
Gabriele Cirulli [Thu, 13 Mar 2014 22:14:06 +0000 ]
Merge pull request #28 from gabrielecirulli/use-transforms
Use transforms for tile positions
Gabriele Cirulli [Thu, 13 Mar 2014 22:11:02 +0000 ]
modify the game to allow using transforms
Gabriele Cirulli [Thu, 13 Mar 2014 22:04:20 +0000 ]
Merge pull request #48 from iharosi/master
minimal-ui added to allow fullscreen on iOS 7.1
Gabriele Cirulli [Thu, 13 Mar 2014 21:53:06 +0000 ]
Merge branch 'master' into use-transforms
Gergely Iharosi [Thu, 13 Mar 2014 21:52:25 +0000 ]
minimal-ui added to allow fullscreen on iOS 7.1
More details on the iOS dev site: http://goo.gl/H6RILo
Marcin Gajda [Thu, 13 Mar 2014 19:27:09 +0000 ]
Windows Phone touch events
Gabriele Cirulli [Thu, 13 Mar 2014 16:10:14 +0000 ]
change site note
Gabriele Cirulli [Thu, 13 Mar 2014 15:51:55 +0000 ]
add official site note
Laurent Margirier [Thu, 13 Mar 2014 09:40:59 +0000 ]
Update refs
Laurent Margirier [Thu, 13 Mar 2014 09:17:57 +0000 ]
add touchend event (see PR #32)
Laurent Margirier [Wed, 12 Mar 2014 12:37:08 +0000 ]
compile main.css
Laurent Margirier [Wed, 12 Mar 2014 11:27:27 +0000 ]
Endless Game. Allow user to continue the game.
- main.css isn't compiled
- a special class `.tile-gold` is added to tiles above 2048
Dave Risney [Wed, 12 Mar 2014 05:59:47 +0000 ]
Ensure the Try Again button actually disappears when selected in Internet Explorer
Gabriele Cirulli [Wed, 12 Mar 2014 20:56:13 +0000 ]
Merge pull request #32 from coding46/patch-1
[BUGFIX] Add touch event handler for retry button
Gabriele Cirulli [Wed, 12 Mar 2014 17:04:16 +0000 ]
Merge pull request #29 from TimPetricola/fix-readme
Fix README
G. Bodenschatz [Wed, 12 Mar 2014 17:03:11 +0000 ]
[BUGFIX] Add touch event handler for retry button
Tim Petricola [Wed, 12 Mar 2014 14:56:54 +0000 ]
Fix README
Gabriele Cirulli [Wed, 12 Mar 2014 14:40:49 +0000 ]
add basic css transform positions
Gabriele Cirulli [Wed, 12 Mar 2014 12:39:04 +0000 ]
Merge pull request #20 from leereilly/ios-launch-icon
Some tweaks for iOS devices
Laurent Margirier [Wed, 12 Mar 2014 12:37:08 +0000 ]
compile main.css
Gabriele Cirulli [Wed, 12 Mar 2014 12:35:42 +0000 ]
improve code structure in localscoremanager
Gabriele Cirulli [Wed, 12 Mar 2014 12:30:50 +0000 ]
small change in scoremanager
Gabriele Cirulli [Wed, 12 Mar 2014 12:15:38 +0000 ]
add screnshot section
Gabriele Cirulli [Wed, 12 Mar 2014 12:15:10 +0000 ]
add mentions to readme
Laurent Margirier [Wed, 12 Mar 2014 11:27:27 +0000 ]
Endless Game. Allow user to continue the game.
- main.css isn't compiled
- a special class `.tile-gold` is added to tiles above 2048
Gabriele Cirulli [Wed, 12 Mar 2014 12:04:16 +0000 ]
remove analytics from master branch
Gabriele Cirulli [Wed, 12 Mar 2014 11:55:40 +0000 ]
mobile tweaks for best score
Gabriele Cirulli [Wed, 12 Mar 2014 11:15:57 +0000 ]
add small code tweaks
Gabriele Cirulli [Wed, 12 Mar 2014 10:23:22 +0000 ]
fix merge conflict
Gabriele Cirulli [Wed, 12 Mar 2014 09:48:18 +0000 ]
Merge pull request #22 from ghoullier/master
Use querySelector instead of getElementsByClassName
Grégory HOULLIER [Wed, 12 Mar 2014 07:59:12 +0000 ]
Use querySelector instead of getElementsByClassName
Lee Reilly [Wed, 12 Mar 2014 05:42:59 +0000 ]
Fix relative path issue - github.io vs. CNAME
Lee Reilly [Wed, 12 Mar 2014 05:40:10 +0000 ]
Add metadata images to meta folder for consistency
Lee Reilly [Wed, 12 Mar 2014 05:33:56 +0000 ]
Hide the browser UI on :iphone:
Lee Reilly [Wed, 12 Mar 2014 05:32:12 +0000 ]
Add launcher icon for :apple: devices
Gabriele Cirulli [Tue, 11 Mar 2014 21:21:34 +0000 ]
update css
Gabriele Cirulli [Tue, 11 Mar 2014 21:18:56 +0000 ]
remove hammer, small js changes
Gabriele Cirulli [Tue, 11 Mar 2014 21:15:19 +0000 ]
Merge pull request #16 from chrisprice/master
Replace hammer with touch event handling
Chris Price [Tue, 11 Mar 2014 20:34:47 +0000 ]
Replace hammer with touch event handling
Tim Petricola [Tue, 11 Mar 2014 16:05:42 +0000 ]
Merge remote-tracking branch 'upstream/master' into best-score
Conflicts:
index.html
js/application.js
js/html_actuator.js
Tim Petricola [Tue, 11 Mar 2014 15:52:02 +0000 ]
localStorage fallback
Gabriele Cirulli [Tue, 11 Mar 2014 15:41:28 +0000 ]
Merge pull request #13 from remram44/readme-fixes
Minor fixes to README
Gabriele Cirulli [Tue, 11 Mar 2014 15:31:39 +0000 ]
add WASD controls (closes #10)
Remi Rampin [Tue, 11 Mar 2014 15:26:18 +0000 ]
Minor fixes to README
Gabriele Cirulli [Tue, 11 Mar 2014 14:18:20 +0000 ]
move button styles to mixin
Gabriele Cirulli [Tue, 11 Mar 2014 13:48:42 +0000 ]
add requestanimationframe polyfill
Gabriele Cirulli [Tue, 11 Mar 2014 13:38:38 +0000 ]
add favicon meta tag