Commit graph

488 commits

Author SHA1 Message Date
Garrett Finucane
66d1d97983 Merge branch 'master' of http://github.com/hextris/hextris 2014-08-24 12:41:06 -04:00
Garrett Finucane
3eaa7a9a2c added hit detection in inner hexagon 2014-08-24 12:40:50 -04:00
Logan Engstrom
210bd9b917 added rush helper functions 2014-08-24 12:12:41 -04:00
Logan Engstrom
a12dd79bbd reverted back to js 2014-08-24 12:09:04 -04:00
Logan Engstrom
0aa06862e7 prepping for prod 2014-08-18 23:12:59 -04:00
Logan Engstrom
43d6c60778 made game easier + made gradient more smooth 2014-08-18 23:09:11 -04:00
Garrett Finucane
54330cc1c0 Merge branch 'dev' of http://github.com/hextris/hextris into dev 2014-08-18 20:10:08 -04:00
Garrett Finucane
1fb48b814b Merge branch 'gh-pages' of http://github.com/hextris/hextris into dev 2014-08-18 20:09:50 -04:00
Garrett Finucane
ce6709cb9a setInterval for physics 2014-08-18 20:09:46 -04:00
Logan Engstrom
b5f6c215d9 made game time based, made game faster 2014-08-18 19:56:03 -04:00
Logan Engstrom
a3aa5b64cc Update Block.js 2014-08-18 19:12:12 -04:00
Garrett Finucane
9e97e73165 share on twitter 2014-08-18 17:39:57 -04:00
Garrett Finucane
e01eee7db4 Merge branch 'dev' into gh-pages 2014-08-18 14:06:00 -04:00
Garrett Finucane
b27a199a29 restart only shows on pause 2014-08-18 14:05:55 -04:00
Garrett Finucane
2b6068d264 Merge branch 'IceManQ-colorblind' into dev 2014-08-18 09:42:00 -04:00
IceManQ
f82ce2e608 Color blind mode
This is a very basic implementation of a color blind system, I added a
simple button under play (that doesn't fade)
2014-08-18 08:27:09 -04:00
Logan Engstrom
83cc10e4be made wavegen time based 2014-08-18 00:04:26 -04:00
Garrett Finucane
d7b8ae461a properly time based 2014-08-17 23:58:17 -04:00
Rex Feng
53d1da9d67 fix Found a Bug Go Here url 2014-08-17 13:13:41 -04:00
Logan Engstrom
2e17d5df4f added difficulty 2014-08-10 21:40:01 -04:00
Noah Moroze
d2b80fe2f3 Prevented highscores from being unsaved after quitting from game over screen 2014-08-09 21:02:41 -04:00
Garrett Finucane
7e673ef3b6 fixed pause button not resetting on restart 2014-08-09 09:39:02 -04:00
meadowstream
5097e7bf3c added extra test parameter to initializaiton 2014-08-03 01:25:18 -04:00
meadowstream
7ba0be0e3d upped difficulty for mobile 2014-08-01 22:30:43 -04:00
meadowstream
686352fc65 merged 2014-08-01 21:37:19 -04:00
meadowstream
54a6f5c2c0 added support for scores in the range of [0, 999999999] 2014-08-01 21:35:20 -04:00
garrettdreyfus
fd167d4599 fixed highscores not being saved 2014-08-01 21:31:24 -04:00
meadowstream
1ccccea7ad added far higher difficulty cap 2014-08-01 09:12:22 -04:00
Garrett Finucane
3ae8fb1291 fixed highscore doubling? 2014-07-31 16:55:56 -04:00
Garrett Finucane
9a84149a91 fixed highscore doubling? 2014-07-31 16:47:44 -04:00
meadowstream
99187e4cc9 modified combo modifier 2014-07-28 21:20:44 -04:00
meadowstream
3d2b2a2564 icreased combo time" 2014-07-27 21:30:50 -04:00
meadowstream
4e9fee8880 Merge branch 'gh-pages' of https://github.com/hextris/hextris into gh-pages 2014-07-27 21:29:06 -04:00
meadowstream
8174f59b18 made minimum speed larger 2014-07-27 21:28:56 -04:00
Garrett Finucane
f6513fcdd7 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-27 21:23:57 -04:00
Garrett Finucane
baea4e4301 changed comboTime to 3 2014-07-27 21:23:41 -04:00
meadowstream
ecdc93bfce raised nextGen cap 2014-07-27 20:56:25 -04:00
meadowstream
a544bb3966 removed randInt from updating wavegens" 2014-07-27 20:13:51 -04:00
meadowstream
3424303588 slight changes to wave gen 2014-07-27 20:07:12 -04:00
meadowstream
42d8e2536b Merge branch 'gh-pages' of https://github.com/hextris/hextris into gh-pages 2014-07-27 20:06:52 -04:00
meadowstream
c058745071 updated wave generation slightly 2014-07-27 20:06:31 -04:00
Garrett Finucane
94e71a3b21 changed comboTime to 4 2014-07-27 20:05:12 -04:00
Garrett Finucane
0323e721d5 changed comboTime to 4 2014-07-27 20:04:44 -04:00
meadowstream
b8460c0740 fixed merge conflicts 2014-07-27 20:01:41 -04:00
meadowstream
07858cddc5 updated wavegen times 2014-07-27 20:00:54 -04:00
Garrett Finucane
bd8b244b29 changed comboTime to 3.5 2014-07-27 19:56:49 -04:00
Garrett Finucane
b2ea2c3981 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-27 19:53:02 -04:00
Garrett Finucane
7258791d9c changed comboTimer to be based on waves 2014-07-27 19:52:48 -04:00
meadowstream
405d26665f increase speed slightly 2014-07-27 19:21:06 -04:00
meadowstream
78fe31577e removed debugger statements. made larger hitboxes for buttons. fixed garrett's github link. 2014-07-27 19:10:40 -04:00