Commit graph

539 commits

Author SHA1 Message Date
Garrett Finucane
2de2ce4462 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages
Conflicts:
	style/style.css
2014-07-21 21:37:26 -04:00
Garrett Finucane
71c809c2b5 no overlapping text on mobile 2014-07-21 21:35:54 -04:00
lengstrom
fa2a6433fc fixed merge conflicts 2014-07-21 10:23:22 -04:00
lengstrom
d081c5a50d centered twitter / github buttons at bottom of page 2014-07-21 10:12:01 -04:00
lengstrom
c3a1941d88 removed devtools 2014-07-21 09:54:08 -04:00
Garrett Finucane
fa9fb102b3 no comboTimer 2014-07-20 23:35:42 -04:00
Garrett Finucane
279313a09a no menu button 2014-07-20 23:32:09 -04:00
lengstrom
5503d95f1b fixed link text, fixed covering info btn issue 2014-07-20 23:13:51 -04:00
Garrett Finucane
dea00c48d4 share buttons disapear 2014-07-20 23:10:21 -04:00
Garrett Finucane
bfc356c4aa made users clickable 2014-07-20 22:46:01 -04:00
Garrett Finucane
c79a472e3a resized twitter button 2014-07-20 22:39:28 -04:00
Garrett Finucane
8a273274e1 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-20 22:37:00 -04:00
Garrett Finucane
976711b4e8 share buttons centered 2014-07-20 22:36:45 -04:00
lengstrom
c91c0a7e45 removed icons 2014-07-20 22:18:26 -04:00
lengstrom
188b35e137 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-20 21:54:25 -04:00
lengstrom
8d2f36669f changed binary files 2014-07-20 21:54:11 -04:00
Garrett Finucane
29e2aa5498 added share buttons 2014-07-20 21:47:08 -04:00
Garrett Finucane
66069d5b3d Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-20 20:41:46 -04:00
Garrett Finucane
11593f4d10 gh star buttons 2014-07-20 20:41:11 -04:00
lengstrom
d0449f5f0f added launch images for ios 2014-07-20 18:36:50 -04:00
lengstrom
c87b8d17c1 moved icons 2014-07-20 18:29:40 -04:00
lengstrom
0a766dec6b updated icons + added ios / anrdoid icons 2014-07-20 18:25:31 -04:00
lengstrom
0310cd4655 updated logos 2014-07-20 17:59:49 -04:00
lengstrom
ca93267bc4 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-20 17:36:07 -04:00
lengstrom
ae3a5457e3 added icons/PSDs 2014-07-20 17:36:03 -04:00
Garrett Finucane
61b6d860dc pause button now switches whenever paused 2014-07-19 22:31:19 -04:00
Garrett Finucane
ec5f774186 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-19 22:15:26 -04:00
Garrett Finucane
0607ead568 pause button off at start screen 2014-07-19 22:15:14 -04:00
lengstrom
70b8d24c19 fixed merge commits 2014-07-19 22:11:42 -04:00
lengstrom
402d1a3718 added phonegap handlers. integrated pause and info buttons 2014-07-19 22:03:22 -04:00
Garrett Finucane
f54491c2ed added @'s 2014-07-19 21:57:34 -04:00
Garrett Finucane
06a3a31e11 highscores 2014-07-19 21:46:05 -04:00
lengstrom
43c27a0df4 removed canvas instructions from pause menu 2014-07-19 19:48:28 -04:00
Garrett Finucane
54ee9642d3 I fixed double restart clear 2014-07-19 19:12:28 -04:00
lengstrom
99f7b8a748 fixed issue around play btn firing after pressing the button to go back to the main menu 2014-07-19 18:51:35 -04:00
lengstrom
2ef65f41d8 fixed issue w/ tapping triggering multiple depths of btns 2014-07-19 18:34:33 -04:00
lengstrom
4b9e179db9 removed callback stacking issues 2014-07-19 18:03:16 -04:00
lengstrom
0eba942db5 added more to main menu btn 2014-07-19 17:49:39 -04:00
lengstrom
6dabf4e65c added button to go to main menu from the pause menu 2014-07-19 17:36:43 -04:00
lengstrom
eff06e4c18 put instructions inside of pause menu 2014-07-19 16:19:07 -04:00
lengstrom
80ccc10b46 removed intro JSON, kept keypress, consolidated initialization to a single function 2014-07-17 21:11:05 -04:00
lengstrom
ce6ce5e4c4 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-17 07:52:06 -04:00
Garrett Finucane
d0eccacdae fixed touble restart on mobile 2014-07-16 10:37:12 -04:00
lengstrom
cb5154318d added fading helpText, removed old ogg declarations, removed old ogg
files
2014-07-16 00:09:27 -04:00
lengstrom
14dfd8a4f8 added fading helpText, removed old ogg declarations 2014-07-16 00:08:57 -04:00
lengstrom
401c0873af removed music 2014-07-16 00:06:23 -04:00
lengstrom
3e64d5633c Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-15 23:58:23 -04:00
lengstrom
97bde851bc c 2014-07-15 23:58:15 -04:00
Garrett Finucane
997f5e5547 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-07 10:55:26 -04:00
Garrett Finucane
878813d7d3 made looping and autoplay in js 2014-07-07 10:55:12 -04:00