wbrawner/hextris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
590 commits 3 branches 1 tag 27 MiB
Commit graph

437 commits

Author SHA1 Message Date
Garrett Finucane
44a7a70d78 added share buttons 2014-07-20 21:47:08 -04:00
Garrett Finucane
a8f0b93940 gh star buttons 2014-07-20 20:41:11 -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
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
Garrett Finucane
d80156e3e0 Fixed the small text 2014-07-04 09:46:14 -04:00
meadowstream
03692b426e added custom fonts to Text() object 2014-07-03 19:07:51 -04:00
meadowstream
70f1226c48 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-03 18:25:30 -04:00
meadowstream
0f27875b33 fixed block initialization animation playing during pause 2014-07-03 18:25:15 -04:00
Garrett Finucane
3be0152d14 fixed tiny text issue 2014-07-03 17:51:13 -04:00
meadowstream
1ebf854153 Replaced raw unicode with String.fromCharCode() 2014-07-03 16:39:29 -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
01de2bd6c5 added drawKey(key, x, y) to draw any key at any given (x,y) 2014-07-03 01:24:35 -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
3764ececd8 Fixed flickering after pause 2014-07-02 11:10:36 -04:00
Garrett Finucane
4090f36b83 Title screen fades in and out 2014-07-02 10:58:02 -04:00
meadowstream
0eebf24cd7 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-01 22:30:13 -04:00
meadowstream
94e70f9e31 standardized block fall speed on hexagon 2014-07-01 22:30:01 -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
7fec2e36a1 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-06-30 22:45:14 -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
1372087e59 fixed clicking in hextris 2014-06-30 21:56:14 -04:00
Garrett Finucane
13c1243adb new comboTimer 2014-06-30 21:31:54 -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
Garrett Finucane
0e6b54ef82 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-30 12:13:50 -04:00
Garrett Finucane
6edb912365 new combotimer 2014-06-30 12:13:21 -04:00
meadowstream
93b8e4276a Removed spacebar speedup 2014-06-29 14:35:10 -04:00
meadowstream
c92124375c fixed bug in which pause btn didn't show up after resuming a game 2014-06-29 14:25:40 -04:00
meadowstream
feea8c4b85 removed useless opacity settings 2014-06-28 15:33:31 -04:00
meadowstream
32eef0bc72 fixed demo level faultily calling the game over after start 2014-06-28 14:42:55 -04:00
meadowstream
b07a0a140c reverted changes around transition from start screen -> gameplay 2014-06-28 14:34:30 -04:00
meadowstream
b3aac51fd3 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
meadowstream
f90ba95cd5 fixed white gaps, added saveState to .unload handler 2014-06-28 12:01:41 -04:00
meadowstream
efba90831d fixed white gaps caused by constant, needless scaling during export 2014-06-28 11:57:22 -04:00
meadowstream
1b59126ed7 fixed start btn not starting saved games, removed useless debugging lines 2014-06-28 11:48:45 -04:00
meadowstream
b1676d912e fixed clicking on btn, started adding start->play transition anims 2014-06-28 11:24:47 -04:00
meadowstream
5e60841fb6 converted animLoop to a switch case 2014-06-27 22:15:16 -04:00