Commit graph

189 commits

Author SHA1 Message Date
Garrett Finucane
06a3a31e11 highscores 2014-07-19 21:46:05 -04:00
lengstrom
6dabf4e65c added button to go to main menu from the pause menu 2014-07-19 17:36:43 -04:00
lengstrom
80ccc10b46 removed intro JSON, kept keypress, consolidated initialization to a single function 2014-07-17 21:11:05 -04:00
lengstrom
cb5154318d added fading helpText, removed old ogg declarations, removed old ogg
files
2014-07-16 00:09:27 -04:00
lengstrom
401c0873af removed music 2014-07-16 00:06:23 -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
981f36f9f4 intro leads in and loop loops 2014-07-06 10:38:33 -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
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
2190441404 fixed issues around pausing and toggling the info button at the same time 2014-07-05 00:32:54 -04:00
lengstrom
5e9343cdb9 added alternate text 2014-07-04 22:23:19 -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
lengstrom
90de4a7b04 removed sample play at startup 2014-07-04 14:52:14 -04:00
lengstrom
f81f05e347 fixed "press p to continue" text occurring in mobile browsers 2014-07-04 14:14:39 -04:00
Garrett Finucane
da2a4f3edf 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
9022ecb29b limited infinite speed rotations 2014-07-04 13:23:00 -04:00
lengstrom
75a103610f made combo / score text larger 2014-07-04 13:08:44 -04:00
Garrett Finucane
1309a1867a 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
f03a822d52 clock to hex 2014-07-04 12:47:37 -04:00
lengstrom
88c1ac2607 fixed merge conflicts 2014-07-04 12:45:51 -04:00
Garrett Finucane
109edf092e Clock to Hex 2014-07-04 12:42:44 -04:00
lengstrom
55dcf3af02 replaced comboMultiplier -> comboTime 2014-07-04 12:42:22 -04:00
lengstrom
3ae89724cb changed delay length 2014-07-03 16:31:45 -04:00
lengstrom
bf2b33c7a5 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
lengstrom
a614f5aec7 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-02 23:51:43 -04:00
lengstrom
13caa4c48e removed entities.js from index.html 2014-07-02 23:51:34 -04:00
Garrett Finucane
47664aa63c Title screen fades in and out 2014-07-02 10:58:02 -04:00
Garrett Finucane
a231dd8a77 unhid all the buttons 2014-07-01 11:18:13 -04:00
Garrett Finucane
95c0816557 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-01 11:03:06 -04:00
Garrett Finucane
352988ab4a no more -2 gameState 2014-07-01 11:02:52 -04:00
lengstrom
508002d16e fixed issue in which waves would restart after resuming the game 2014-06-30 22:45:00 -04:00
Garrett Finucane
9a3ac314c6 restart icon shown on resume 2014-06-30 13:34:55 -04:00
Garrett Finucane
ad48ad0a40 added restart button 2014-06-30 12:29:26 -04:00
lengstrom
36ec1a9b64 Removed spacebar speedup 2014-06-29 14:35:10 -04:00
lengstrom
4297dffefa fixed bug in which pause btn didn't show up after resuming a game 2014-06-29 14:25:40 -04:00
lengstrom
5004a5cf34 fixed demo level faultily calling the game over after start 2014-06-28 14:42:55 -04:00
lengstrom
13be0a5db8 reverted changes around transition from start screen -> gameplay 2014-06-28 14:34:30 -04:00
lengstrom
31c4b4d96a removed white gaps, changed method for starting previously saved game to calling resumeGame (after init is called) 2014-06-28 13:44:43 -04:00