danog/2048
1
0
Fork 0
mirror of https://github.com/danog/2048.git synced 2024-11-26 11:34:37 +01:00
Code Issues Projects Releases Wiki Activity
174 Commits 2 Branches 0 Tags 661 KiB
master
Commit Graph

174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sigod
837ca51b6f Merge pull request #233 from sigod/ie9-styles 
fix styles for IE9: add -ms-transform
 2015-10-20 21:43:34 +03:00
sigod
0ce1da5e69 Merge pull request #372 from Gitgiddy/master 
fixes type error surrounding `event.targetTouches`
 2015-09-28 23:37:23 +03:00
jkleban
450ddd0282 fixes type error surrounding event.targetTouches 2015-09-28 11:58:11 -04:00
sigod
76336e86ee README.md: store screenshot on github (close #358) 2015-07-10 10:52:10 +03:00
Anna Harren
caef60a9a9 Merge pull request #328 from marcingajda/patch-1 
Updated contributors username.
 2015-03-21 00:51:29 +00:00
Marcin Gajda
845ee40d2a Updated contributors username. 
I changed my GitHub username and the old link doesn't work anymore.
 2015-03-21 01:25:01 +01:00
sigod
999bea39a7 Merge pull request #234 from sigod/contributing 
CONTRIBUTING.md: sass --unix-newlines
 2014-12-13 15:28:22 +03:00
sigod
52978771ac Merge pull request #258 from harimohanraj89/documentation 
CONTRIBUTING.md typo fix
 2014-12-10 17:42:50 +03:00
Gabriele Cirulli
f927cc556d Add maintainers to README 2014-12-07 19:54:43 +01:00
Gabriele Cirulli
c36ad21655 Merge pull request #279 from sigod/numbers-positions 
fix positions of tile numbers
 2014-12-07 19:40:58 +01:00
Mikhail Novikov
c1a02dc232 fix positions of tile numbers 2014-11-26 01:45:37 +03:00
harimohanraj89
d02e499b59 fixed typo in contributing doc 2014-07-24 11:42:55 -04:00
Mikhail Novikov
ecd91f7e10 CONTRIBUTING.md: sass --unix-newlines 2014-06-15 16:04:13 +03:00
Mikhail Novikov
cbd3055a5f fix styles for IE9: add -ms-transform 2014-06-15 15:55:39 +03:00
Gabriele Cirulli
538546423f Update README.md 2014-05-06 18:49:46 +02:00
Gabriele Cirulli
f30cde505d Merge pull request #188 from zzatkin/patch-1 
Update README.md
 2014-05-06 18:48:43 +02:00
Zack Gold
0656e4c712 Update README.md 
Spelling fix.
 2014-05-06 12:45:07 -04:00
Gabriele Cirulli
6141e302b7 Merge pull request #158 from janschoenherr/patch-1 
code cleanup
 2014-04-16 22:05:13 +02:00
janschoenherr
3b86903e65 code cleanup 2014-04-16 10:54:51 +02:00
Gabriele Cirulli
542208d94a Merge pull request #112 from Josso/startup-image 
Add startup-images for the iPhone
 2014-04-06 23:05:12 +02:00
Gabriele Cirulli
2798bb0b1e Merge pull request #115 from iirelu/jshint-compliance 
Made animframe_polyfill.js JSHint compliant
 2014-03-27 19:11:49 +01:00
iirelu
82834dfc5b Made animframe_polyfill.js JSHint compliant 
Reformatted a bunch to make JSHint happy.
 2014-03-27 17:52:07 +00:00
Johan K. Jensen
1264d9b3f0 Add startup-images for the iPhone. 2014-03-27 14:20:32 +01:00
Gabriele Cirulli
878098f855 apply changes from #43 2014-03-23 20:21:58 +01:00
Gabriele Cirulli
b08fa8d6a4 apply css improvements from #68 2014-03-23 20:17:35 +01:00
Gabriele Cirulli
71baa9d3d7 Update CONTRIBUTING.md 2014-03-23 20:12:53 +01:00
Gabriele Cirulli
7dcbe28284 #98 improve contributing guide 2014-03-23 20:09:19 +01:00
Gabriele Cirulli
d403f84d7d add https://github.com/mgarciaisaia mention to readme 2014-03-23 19:56:08 +01:00
Gabriele Cirulli
cf01ca7e8b manually apply #81 2014-03-23 19:51:29 +01:00
Gabriele Cirulli
2f91247132 improve comments in game manager 2014-03-22 18:45:48 +01:00
Gabriele Cirulli
6cb3d71a40 improve comments in game manager 2014-03-22 18:41:47 +01:00
Gabriele Cirulli
af683a7856 clear game state on game over 2014-03-22 18:33:24 +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
3cfdcca0d2 increase margin above game field 2014-03-22 17:31:55 +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
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