3 years agoadded timer master
Razvan Stanga []
added timer

3 years agoMerge pull request #112 from Josso/startup-image
Gabriele Cirulli []
Merge pull request #112 from Josso/startup-image

Add startup-images for the iPhone

3 years agoMerge pull request #115 from iirelu/jshint-compliance
Gabriele Cirulli []
Merge pull request #115 from iirelu/jshint-compliance

Made animframe_polyfill.js JSHint compliant

3 years agoMade animframe_polyfill.js JSHint compliant
iirelu []
Made animframe_polyfill.js JSHint compliant

Reformatted a bunch to make JSHint happy.

3 years agoAdd startup-images for the iPhone.
Johan K. Jensen []
Add startup-images for the iPhone.

3 years agoapply changes from #43
Gabriele Cirulli []
apply changes from #43

3 years agoapply css improvements from #68
Gabriele Cirulli []
apply css improvements from #68

3 years agoUpdate CONTRIBUTING.md
Gabriele Cirulli []
Update CONTRIBUTING.md

3 years ago#98 improve contributing guide
Gabriele Cirulli []
#98 improve contributing guide

3 years agoadd https://github.com/mgarciaisaia mention to readme
Gabriele Cirulli []
add https://github.com/mgarciaisaia mention to readme

3 years agomanually apply #81
Gabriele Cirulli []
manually apply #81

3 years agoimprove comments in game manager
Gabriele Cirulli []
improve comments in game manager

3 years agoimprove comments in game manager
Gabriele Cirulli []
improve comments in game manager

3 years agoclear game state on game over
Gabriele Cirulli []
clear game state on game over

3 years agoupdate css
Gabriele Cirulli []
update css

3 years agoMerge pull request #96 from jimminning/patch-3
Gabriele Cirulli []
Merge pull request #96 from jimminning/patch-3

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

3 years agoincrease margin above game field
Gabriele Cirulli []
increase margin above game field

3 years agobring container margin top into variable and reduce it on mobile
Gabriele Cirulli []
bring container margin top into variable and reduce it on mobile

3 years agoMerge branch 'master' of https://github.com/gabrielecirulli/2048
Gabriele Cirulli []
Merge branch 'master' of https://github.com/gabrielecirulli/2048

3 years agoalign assignments
Gabriele Cirulli []
align assignments

3 years agoremove irrelevant size property on serialized game
Gabriele Cirulli []
remove irrelevant size property on serialized game

3 years agoreintroduce "to" in intro
Gabriele Cirulli []
reintroduce "to" in intro

3 years agorestyle new game button to put it on the right side of the introduction
Gabriele Cirulli []
restyle new game button to put it on the right side of the introduction

3 years agoadd R key to restart game
Gabriele Cirulli []
add R key to restart game

3 years agoadd getter comments
Gabriele Cirulli []
add getter comments

3 years agorefactor grid, gamemanager, tile
Gabriele Cirulli []
refactor grid, gamemanager, tile

3 years agoremove space to restart game, refactor code slightly
Gabriele Cirulli []
remove space to restart game, refactor code slightly

3 years agorename LocalScoreManager to LocalStorageManager
Gabriele Cirulli []
rename LocalScoreManager to LocalStorageManager

3 years agoMerge branch 'resume-game' of github.com:mfrederiksen/2048 into mfrederiksen-resume-game
Gabriele Cirulli []
Merge branch 'resume-game' of github.com:mfrederiksen/2048 into mfrederiksen-resume-game

3 years agoUpdate main.scss
Jim Minning []
Update main.scss

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

3 years agoUpdate README.md
Gabriele Cirulli []
Update README.md

3 years agoMerge pull request #85 from MaciejCzyzewski/patch-2
Gabriele Cirulli []
Merge pull request #85 from MaciejCzyzewski/patch-2

Update README.md, centered screenshot!

3 years agomatch and replace the "Updated" comment
Gabriele Cirulli []
match and replace the "Updated" comment

3 years agoUpdate README.md, centered screenshot!
Maciej A. Czyzewski []
Update README.md, centered screenshot!

I think screenshot is better when it is centered.

3 years agoadd basic rake file with appcache:update task
Gabriele Cirulli []
add basic rake file with appcache:update task

3 years agoUpdate README.md
Gabriele Cirulli []
Update README.md

3 years agocredit elektryk
Gabriele Cirulli []
credit elektryk

3 years agoupdate scss
Gabriele Cirulli []
update scss

3 years agoMerge branch 'WP_touch_events' of github.com:elektryk/2048 into elektryk-WP_touch_events
Gabriele Cirulli []
Merge branch 'WP_touch_events' of github.com:elektryk/2048 into elektryk-WP_touch_events

3 years agoAdded persistence of game state to localstorage after each move
Mark Frederiksen []
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

3 years agoset mobile threshold slightly wider than the board size
Gabriele Cirulli []
set mobile threshold slightly wider than the board size

3 years agoremove debug logging
Gabriele Cirulli []
remove debug logging

3 years agorename keep playing to keep going
Gabriele Cirulli []
rename keep playing to keep going

3 years agoadd styling for super tiles
Gabriele Cirulli []
add styling for super tiles

3 years agorename tile-gold to tile-super
Gabriele Cirulli []
rename tile-gold to tile-super

3 years agorename GameOver to GameTerminated to avoid ambiguity
Gabriele Cirulli []
rename GameOver to GameTerminated to avoid ambiguity

3 years agorefactor code
Gabriele Cirulli []
refactor code

3 years agomerge infinite game
Gabriele Cirulli []
merge infinite game

3 years agochange local storage support check
Gabriele Cirulli []
change local storage support check

3 years agoMerge pull request #50 from codeKonami/master
Gabriele Cirulli []
Merge pull request #50 from codeKonami/master

adding a test to verify the localStorage is supported

3 years agofix fill mode helper
Gabriele Cirulli []
fix fill mode helper

3 years agoadding a test to verify the localStorage is supported fixing a bug on private browsing on safari
codeKonami []
adding a test to verify the localStorage is supported fixing a bug on private browsing on safari

3 years agoMerge pull request #42 from david-risney/fix-try-again-bug
Gabriele Cirulli []
Merge pull request #42 from david-risney/fix-try-again-bug

Ensure the Try Again button actually disappears when selected in IE

3 years agoMerge pull request #28 from gabrielecirulli/use-transforms
Gabriele Cirulli []
Merge pull request #28 from gabrielecirulli/use-transforms

Use transforms for tile positions

3 years agomodify the game to allow using transforms
Gabriele Cirulli []
modify the game to allow using transforms

3 years agoMerge pull request #48 from iharosi/master
Gabriele Cirulli []
Merge pull request #48 from iharosi/master

minimal-ui added to allow fullscreen on iOS 7.1

3 years agoMerge branch 'master' into use-transforms
Gabriele Cirulli []
Merge branch 'master' into use-transforms

3 years agominimal-ui added to allow fullscreen on iOS 7.1
Gergely Iharosi []
minimal-ui added to allow fullscreen on iOS 7.1

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

3 years agoWindows Phone touch events
Marcin Gajda []
Windows Phone touch events

3 years agochange site note
Gabriele Cirulli []
change site note

3 years agoadd official site note
Gabriele Cirulli []
add official site note

3 years agoUpdate refs
Laurent Margirier []
Update refs

3 years agoadd touchend event (see PR #32)
Laurent Margirier []
add touchend event (see PR #32)

3 years agocompile main.css
Laurent Margirier []
compile main.css

3 years agoEndless Game. Allow user to continue the game.
Laurent Margirier []
Endless Game. Allow user to continue the game.

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

3 years agoEnsure the Try Again button actually disappears when selected in Internet Explorer
Dave Risney []
Ensure the Try Again button actually disappears when selected in Internet Explorer

3 years agoMerge pull request #32 from coding46/patch-1
Gabriele Cirulli []
Merge pull request #32 from coding46/patch-1

[BUGFIX] Add touch event handler for retry button

3 years agoMerge pull request #29 from TimPetricola/fix-readme
Gabriele Cirulli []
Merge pull request #29 from TimPetricola/fix-readme

Fix README

3 years ago[BUGFIX] Add touch event handler for retry button
G. Bodenschatz []
[BUGFIX] Add touch event handler for retry button

3 years agoFix README
Tim Petricola []
Fix README

3 years agoadd basic css transform positions
Gabriele Cirulli []
add basic css transform positions

3 years agoMerge pull request #20 from leereilly/ios-launch-icon
Gabriele Cirulli []
Merge pull request #20 from leereilly/ios-launch-icon

Some tweaks for iOS devices

3 years agocompile main.css
Laurent Margirier []
compile main.css

3 years agoimprove code structure in localscoremanager
Gabriele Cirulli []
improve code structure in localscoremanager

3 years agosmall change in scoremanager
Gabriele Cirulli []
small change in scoremanager

3 years agoadd screnshot section
Gabriele Cirulli []
add screnshot section

3 years agoadd mentions to readme
Gabriele Cirulli []
add mentions to readme

3 years agoEndless Game. Allow user to continue the game.
Laurent Margirier []
Endless Game. Allow user to continue the game.

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

3 years agoremove analytics from master branch
Gabriele Cirulli []
remove analytics from master branch

3 years agomobile tweaks for best score
Gabriele Cirulli []
mobile tweaks for best score

3 years agoadd small code tweaks
Gabriele Cirulli []
add small code tweaks

3 years agofix merge conflict
Gabriele Cirulli []
fix merge conflict

3 years agoMerge pull request #22 from ghoullier/master
Gabriele Cirulli []
Merge pull request #22 from ghoullier/master

Use querySelector instead of getElementsByClassName

3 years agoUse querySelector instead of getElementsByClassName
Grégory HOULLIER []
Use querySelector instead of getElementsByClassName

3 years agoFix relative path issue - github.io vs. CNAME
Lee Reilly []
Fix relative path issue - github.io vs. CNAME

3 years agoAdd metadata images to meta folder for consistency
Lee Reilly []
Add metadata images to meta folder for consistency

3 years agoHide the browser UI on :iphone:
Lee Reilly []
Hide the browser UI on :iphone:

3 years agoAdd launcher icon for :apple: devices
Lee Reilly []
Add launcher icon for :apple: devices

3 years agoupdate css
Gabriele Cirulli []
update css

3 years agoremove hammer, small js changes
Gabriele Cirulli []
remove hammer, small js changes

3 years agoMerge pull request #16 from chrisprice/master
Gabriele Cirulli []
Merge pull request #16 from chrisprice/master

Replace hammer with touch event handling

3 years agoReplace hammer with touch event handling
Chris Price []
Replace hammer with touch event handling

3 years agoMerge remote-tracking branch 'upstream/master' into best-score
Tim Petricola []
Merge remote-tracking branch 'upstream/master' into best-score

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

3 years agolocalStorage fallback
Tim Petricola []
localStorage fallback

3 years agoMerge pull request #13 from remram44/readme-fixes
Gabriele Cirulli []
Merge pull request #13 from remram44/readme-fixes

Minor fixes to README

3 years agoadd WASD controls (closes #10)
Gabriele Cirulli []
add WASD controls (closes #10)

3 years agoMinor fixes to README
Remi Rampin []
Minor fixes to README

3 years agomove button styles to mixin
Gabriele Cirulli []
move button styles to mixin

3 years agoadd requestanimationframe polyfill
Gabriele Cirulli []
add requestanimationframe polyfill

3 years agoadd favicon meta tag
Gabriele Cirulli []
add favicon meta tag

comments