Commit graph

374 commits

Author SHA1 Message Date
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
Garrett Finucane
5f76602aaf fixed touble restart on mobile 2014-07-16 10:37:12 -04:00
meadowstream
4e6e49d991 added fading helpText, removed old ogg declarations 2014-07-16 00:08:57 -04:00
meadowstream
1e4b5a8e94 removed music 2014-07-16 00:06:23 -04:00
meadowstream
d69b721706 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-15 23:58:23 -04:00
meadowstream
1839a0381e c 2014-07-15 23:58:15 -04:00
Garrett Finucane
6466249b4d Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-07 10:55:26 -04:00
Garrett Finucane
e4edf9901e made looping and autoplay in js 2014-07-07 10:55:12 -04:00
meadowstream
17666fdbed disabled dragging on screen 2014-07-06 21:28:34 -04:00
Garrett Finucane
5b3e6b9187 no jagged lines switch no one line not multiple 2014-07-06 15:18:51 -04:00
Garrett Finucane
8a2fe354af removed spacing between timer and hexagon when zoomed 2014-07-06 14:50:19 -04:00
Garrett Finucane
73d275857b intro leads in and loop loops 2014-07-06 10:38:33 -04:00
meadowstream
764eb702a2 changed combotime coeff 2014-07-05 21:05:21 -04:00
meadowstream
cad6441fcc Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-05 17:44:39 -04:00
meadowstream
b4100e828b Removed count variable; extended combo time 2014-07-05 17:44:31 -04:00
Garrett Finucane
311e2ef734 mute unmute and audio 2014-07-05 17:18:23 -04:00
Garrett Finucane
838c707018 added audio and scaled comboTimer I think 2014-07-05 16:07:34 -04:00
Garrett Finucane
577c107146 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
ecb6a4baa4 started audio playing 2014-07-05 15:47:14 -04:00
meadowstream
f4d7623b73 added new sound files and deleted old ones 2014-07-05 11:59:23 -04:00
meadowstream
1f25b6ab91 added restart messages for mobile + modified those for desktop, added timeout before being able to restart 2014-07-05 10:21:07 -04:00
meadowstream
f6aa5a2567 misspelled messages 2014-07-05 10:00:36 -04:00
meadowstream
2b3168425e fixed end game text 2014-07-05 09:57:51 -04:00
meadowstream
debba1e2f9 fixed issues around pausing and toggling the info button at the same time 2014-07-05 00:32:54 -04:00
meadowstream
058d727aec added alternate text 2014-07-04 22:23:19 -04:00
Garrett Finucane
0dbf0e4a45 disabled click latency on mobile 2014-07-04 21:20:43 -04:00
Garrett Finucane
829df907f4 new demo play 2014-07-04 21:14:39 -04:00
Garrett Finucane
f1d491cc3a fixed pausing Paused -> paused 2014-07-04 20:33:26 -04:00
meadowstream
56e458851f almost done with tutorial. fixed devmode not being able to be enabled 2014-07-04 19:08:49 -04:00
meadowstream
18d1c6e6a9 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-04 16:43:01 -04:00
meadowstream
2f66138ddc Fixed instruction text in mobile 2014-07-04 16:42:55 -04:00
Garrett Finucane
daf202280d added click for non mobile 2014-07-04 16:08:01 -04:00
Garrett Finucane
94dc72d16b fixed blank thing 2014-07-04 16:04:16 -04:00
meadowstream
b63a0b88ba reduced difficulty for mobile 2014-07-04 15:05:38 -04:00
meadowstream
40cdddbb6b removed sample play at startup 2014-07-04 14:52:14 -04:00
meadowstream
283b002f2f made time between combos relative to the time between waves 2014-07-04 14:45:05 -04:00
meadowstream
69eb170012 fixed "press p to continue" text occurring in mobile browsers 2014-07-04 14:14:39 -04:00
Garrett Finucane
9db7b8bf55 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	js/main.js
2014-07-04 13:24:08 -04:00
Garrett Finucane
a710c4299e limited infinite speed rotations 2014-07-04 13:23:00 -04:00
meadowstream
02cc263dff made combo / score text larger 2014-07-04 13:08:44 -04:00
Garrett Finucane
3aac7eb439 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	js/checking.js
2014-07-04 12:48:44 -04:00
Garrett Finucane
be3706a346 clock to hex 2014-07-04 12:47:37 -04:00
meadowstream
ec592072d3 removed merge files 2014-07-04 12:46:42 -04:00
meadowstream
f3e39a6ddd fixed merge conflicts 2014-07-04 12:45:51 -04:00
Garrett Finucane
f27cb24988 Clock to Hex 2014-07-04 12:42:44 -04:00
meadowstream
2831ad3ddc replaced comboMultiplier -> comboTime 2014-07-04 12:42:22 -04:00