Commit graph

697 commits

Author SHA1 Message Date
Garrett Finucane
fce36f0975 fixed no restart from pause 2014-07-22 09:13:13 -04:00
meadowstream
c508fc4008 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-22 09:07:00 -04:00
meadowstream
dea99b59e2 fixed bottom bar connectivity issues. fixed instruction text appearing in the pause screen. fixed buttons appearing in the end game screen 2014-07-22 09:06:52 -04:00
Garrett Finucane
d425f9d41f made it so if you score 0 it displays 0 2014-07-22 08:38:11 -04:00
Garrett Finucane
60c7ce8f6a overlapping text in game over 2014-07-21 22:08:33 -04:00
meadowstream
246a89589a upped difficulty on mobile slightly 2014-07-21 21:54:49 -04:00
meadowstream
3c8e47eb51 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-21 21:41:09 -04:00
meadowstream
98310798f7 added showing and hiding of buttons, made buttons appear onload (instead of having ugly iframes / skeletons, other misc changes 2014-07-21 21:41:04 -04:00
Garrett Finucane
f16082fc69 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
e125842186 no overlapping text on mobile 2014-07-21 21:35:54 -04:00
meadowstream
66bea04492 fixed merge conflicts 2014-07-21 10:23:22 -04:00
meadowstream
81e461e5bb centered twitter / github buttons at bottom of page 2014-07-21 10:12:01 -04:00
meadowstream
e47811faf1 removed devtools 2014-07-21 09:54:08 -04:00
Garrett Finucane
9f61dee891 no comboTimer 2014-07-20 23:35:42 -04:00
Garrett Finucane
6c2a22093b no menu button 2014-07-20 23:32:09 -04:00
meadowstream
5b9ffb408a fixed link text, fixed covering info btn issue 2014-07-20 23:13:51 -04:00
Garrett Finucane
47033a218d share buttons disapear 2014-07-20 23:10:21 -04:00
Garrett Finucane
199e4b4841 made users clickable 2014-07-20 22:46:01 -04:00
Garrett Finucane
13ed778483 resized twitter button 2014-07-20 22:39:28 -04:00
Garrett Finucane
9f5ce19acb Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-20 22:37:00 -04:00
Garrett Finucane
aadd535a6a share buttons centered 2014-07-20 22:36:45 -04:00
meadowstream
a9c1dd498d removed icons 2014-07-20 22:18:26 -04:00
meadowstream
42535660e6 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-20 21:54:25 -04:00
meadowstream
a98141707e changed binary files 2014-07-20 21:54:11 -04:00
Garrett Finucane
44a7a70d78 added share buttons 2014-07-20 21:47:08 -04:00
Garrett Finucane
a901fb5af9 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-20 20:41:46 -04:00
Garrett Finucane
a8f0b93940 gh star buttons 2014-07-20 20:41:11 -04:00
meadowstream
f79c5c47df added launch images for ios 2014-07-20 18:36:50 -04:00
meadowstream
5e8cefdeb1 moved icons 2014-07-20 18:29:40 -04:00
meadowstream
740309af13 updated icons + added ios / anrdoid icons 2014-07-20 18:25:31 -04:00
meadowstream
c31027b157 updated logos 2014-07-20 17:59:49 -04:00
meadowstream
93e9a21afb Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-20 17:36:07 -04:00
meadowstream
7a916a46be added icons/PSDs 2014-07-20 17:36:03 -04:00
Garrett Finucane
90b2702697 pause button now switches whenever paused 2014-07-19 22:31:19 -04:00
Garrett Finucane
6e0e4e6be0 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-19 22:15:26 -04:00
Garrett Finucane
123ab0e82e pause button off at start screen 2014-07-19 22:15:14 -04:00
meadowstream
3aa1e00f11 fixed merge commits 2014-07-19 22:11:42 -04:00
meadowstream
a6af6db755 added phonegap handlers. integrated pause and info buttons 2014-07-19 22:03:22 -04:00
Garrett Finucane
8e925f2080 added @'s 2014-07-19 21:57:34 -04:00
Garrett Finucane
df8fc1f809 highscores 2014-07-19 21:46:05 -04:00
meadowstream
6a58937d62 removed canvas instructions from pause menu 2014-07-19 19:48:28 -04:00
Garrett Finucane
34087504da I fixed double restart clear 2014-07-19 19:12:28 -04:00
meadowstream
344d42aceb 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
meadowstream
e388cac85a fixed issue w/ tapping triggering multiple depths of btns 2014-07-19 18:34:33 -04:00
meadowstream
48e2c8192c removed callback stacking issues 2014-07-19 18:03:16 -04:00
meadowstream
5ba9b86aa9 added more to main menu btn 2014-07-19 17:49:39 -04:00
meadowstream
46d809cacf added button to go to main menu from the pause menu 2014-07-19 17:36:43 -04:00
meadowstream
fe3875f2a9 put instructions inside of pause menu 2014-07-19 16:19:07 -04:00
meadowstream
c8a8e1e9ca removed intro JSON, kept keypress, consolidated initialization to a single function 2014-07-17 21:11:05 -04:00
meadowstream
2af21065af Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-17 07:52:06 -04:00