added timer

Merge pull request #112 from Josso/startup-image

Add startup-images for the iPhone

Merge pull request #115 from iirelu/jshint-compliance

Made animframe_polyfill.js JSHint compliant

Made animframe_polyfill.js JSHint compliant

Reformatted a bunch to make JSHint happy.

Add startup-images for the iPhone.

apply changes from #43

apply css improvements from #68

Update CONTRIBUTING.md

#98 improve contributing guide

add https://github.com/mgarciaisaia mention to readme

manually apply #81

improve comments in game manager

improve comments in game manager

clear game state on game over

update css

Merge pull request #96 from jimminning/patch-3

Update main.scss for -ms-user-select (IE)

increase margin above game field

bring container margin top into variable and reduce it on mobile

Merge branch 'master' of https://github.com/gabrielecirulli/2048

align assignments

remove irrelevant size property on serialized game

reintroduce "to" in intro

restyle new game button to put it on the right side of the introduction

add R key to restart game

add getter comments

refactor grid, gamemanager, tile

remove space to restart game, refactor code slightly

rename LocalScoreManager to LocalStorageManager

Merge branch 'resume-game' of github.com:mfrederiksen/2048 into mfrederiksen-resume-game

Update main.scss

Added IE specific user select none, to prevent text selection on IE swiping.

Update README.md

Merge pull request #85 from MaciejCzyzewski/patch-2

Update README.md, centered screenshot!

match and replace the "Updated" comment

Update README.md, centered screenshot!

I think screenshot is better when it is centered.

add basic rake file with appcache:update task

Update README.md

credit elektryk

update scss

Merge branch 'WP_touch_events' of github.com:elektryk/2048 into elektryk-WP_touch_events

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

set mobile threshold slightly wider than the board size

remove debug logging

rename keep playing to keep going

add styling for super tiles

rename tile-gold to tile-super

rename GameOver to GameTerminated to avoid ambiguity

refactor code

merge infinite game

change local storage support check

Merge pull request #50 from codeKonami/master

adding a test to verify the localStorage is supported

fix fill mode helper

adding a test to verify the localStorage is supported fixing a bug on private browsing on safari

Merge pull request #42 from david-risney/fix-try-again-bug

Ensure the Try Again button actually disappears when selected in IE

Merge pull request #28 from gabrielecirulli/use-transforms

Use transforms for tile positions

modify the game to allow using transforms

Merge pull request #48 from iharosi/master

minimal-ui added to allow fullscreen on iOS 7.1

Merge branch 'master' into use-transforms

minimal-ui added to allow fullscreen on iOS 7.1

More details on the iOS dev site: http://goo.gl/H6RILo

Windows Phone touch events

change site note

add official site note

Update refs

add touchend event (see PR #32)

compile main.css

Endless Game. Allow user to continue the game.

- main.css isn't compiled
- a special class `.tile-gold` is added to tiles above 2048

Ensure the Try Again button actually disappears when selected in Internet Explorer

Merge pull request #32 from coding46/patch-1

[BUGFIX] Add touch event handler for retry button

Merge pull request #29 from TimPetricola/fix-readme

Fix README

[BUGFIX] Add touch event handler for retry button

Fix README

add basic css transform positions

Merge pull request #20 from leereilly/ios-launch-icon

Some tweaks for iOS devices

compile main.css

improve code structure in localscoremanager

small change in scoremanager

add screnshot section

add mentions to readme

Endless Game. Allow user to continue the game.

- main.css isn't compiled
- a special class `.tile-gold` is added to tiles above 2048

remove analytics from master branch

mobile tweaks for best score

add small code tweaks

fix merge conflict

Merge pull request #22 from ghoullier/master

Use querySelector instead of getElementsByClassName

Use querySelector instead of getElementsByClassName

Fix relative path issue - github.io vs. CNAME

Add metadata images to meta folder for consistency

Hide the browser UI on :iphone:

Add launcher icon for :apple: devices

update css

remove hammer, small js changes

Merge pull request #16 from chrisprice/master

Replace hammer with touch event handling

Replace hammer with touch event handling

Merge remote-tracking branch 'upstream/master' into best-score

Conflicts:
index.html
js/application.js
js/html_actuator.js

localStorage fallback

Merge pull request #13 from remram44/readme-fixes

Minor fixes to README

add WASD controls (closes #10)

Minor fixes to README

move button styles to mixin

add requestanimationframe polyfill

add favicon meta tag