Commit graph

611 commits

Author SHA1 Message Date
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
lengstrom
3fe1f18223 disabled dragging on screen 2014-07-06 21:28:34 -04:00
Garrett Finucane
fe61d1f245 no jagged lines switch no one line not multiple 2014-07-06 15:18:51 -04:00
Garrett Finucane
86e274b026 removed spacing between timer and hexagon when zoomed 2014-07-06 14:50:19 -04:00
Garrett Finucane
981f36f9f4 intro leads in and loop loops 2014-07-06 10:38:33 -04:00
lengstrom
95562ce62d changed combotime coeff 2014-07-05 21:05:21 -04:00
lengstrom
2bfd8e237c Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-05 17:44:39 -04:00
lengstrom
bb1f7f3ef7 Removed count variable; extended combo time 2014-07-05 17:44:31 -04:00
Garrett Finucane
ac9617818c mute unmute and audio 2014-07-05 17:18:23 -04:00
Garrett Finucane
3214022e00 added audio and scaled comboTimer I think 2014-07-05 16:07:34 -04:00
Garrett Finucane
d83b323e96 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	index.html
2014-07-05 15:47:48 -04:00
Garrett Finucane
6f445b1194 started audio playing 2014-07-05 15:47:14 -04:00
lengstrom
bb0e15b2ff added new sound files and deleted old ones 2014-07-05 11:59:23 -04:00
lengstrom
2184faa258 added restart messages for mobile + modified those for desktop, added timeout before being able to restart 2014-07-05 10:21:07 -04:00
lengstrom
011aff0a82 misspelled messages 2014-07-05 10:00:36 -04:00
lengstrom
a1a1f7e953 fixed end game text 2014-07-05 09:57:51 -04:00
lengstrom
2190441404 fixed issues around pausing and toggling the info button at the same time 2014-07-05 00:32:54 -04:00
lengstrom
0f4b3c39a3 added intro 2014-07-04 22:42:30 -04:00
lengstrom
5e9343cdb9 added alternate text 2014-07-04 22:23:19 -04:00
Garrett Finucane
ce39bdf5bd disabled click latency on mobile 2014-07-04 21:20:43 -04:00
Garrett Finucane
34b048838f new demo play 2014-07-04 21:14:39 -04:00
Garrett Finucane
c8829001ad fixed pausing Paused -> paused 2014-07-04 20:33:26 -04:00
lengstrom
1ec29672ec almost done with tutorial. fixed devmode not being able to be enabled 2014-07-04 19:08:49 -04:00
lengstrom
b767e7bd16 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-04 16:43:01 -04:00
lengstrom
5e17b57fcb Fixed instruction text in mobile 2014-07-04 16:42:55 -04:00
Garrett Finucane
a24cd2819f added click for non mobile 2014-07-04 16:08:01 -04:00
Garrett Finucane
731c0184dc fixed blank thing 2014-07-04 16:04:16 -04:00
lengstrom
eaa47b2fd8 reduced difficulty for mobile 2014-07-04 15:05:38 -04:00
Garrett Finucane
80e05aa4e8 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-04 14:59:09 -04:00