Commit graph

194 commits

Author SHA1 Message Date
Garrett Finucane
aadd535a6a share buttons centered 2014-07-20 22:36:45 -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
df8fc1f809 highscores 2014-07-19 21:46:05 -04:00
meadowstream
46d809cacf added button to go to main menu from the pause menu 2014-07-19 17:36:43 -04:00
meadowstream
c8a8e1e9ca removed intro JSON, kept keypress, consolidated initialization to a single function 2014-07-17 21:11:05 -04:00
meadowstream
766599bf01 added fading helpText, removed old ogg declarations, removed old ogg
files
2014-07-16 00:09:27 -04:00
meadowstream
1e4b5a8e94 removed music 2014-07-16 00:06:23 -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
73d275857b intro leads in and loop loops 2014-07-06 10:38:33 -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
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
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
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
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
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
meadowstream
c1e5617f9a changed delay length 2014-07-03 16:31:45 -04:00
meadowstream
4b4471d7f7 added devMode, disabled debugging functions. first version of tutorial is done. added delay to gamePlay after pressing start to let the UI elements fade out. 2014-07-03 16:30:56 -04:00
meadowstream
216da7ba81 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-02 23:51:43 -04:00
meadowstream
b100a0c722 removed entities.js from index.html 2014-07-02 23:51:34 -04:00
Garrett Finucane
4090f36b83 Title screen fades in and out 2014-07-02 10:58:02 -04:00
Garrett Finucane
01e84ce186 unhid all the buttons 2014-07-01 11:18:13 -04:00
Garrett Finucane
429de31d14 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-01 11:03:06 -04:00
Garrett Finucane
d8420a753e no more -2 gameState 2014-07-01 11:02:52 -04:00
meadowstream
63d5aaa2be fixed issue in which waves would restart after resuming the game 2014-06-30 22:45:00 -04:00
Garrett Finucane
62c3611334 restart icon shown on resume 2014-06-30 13:34:55 -04:00
Garrett Finucane
69da2a2d03 added restart button 2014-06-30 12:29:26 -04:00