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

298 commits

Author SHA1 Message Date
garrettdreyfus
16c4502a1c pausing fixed 2014-05-25 11:15:22 -04:00
garrettdreyfus
1db9d66474 no shadow 2014-05-25 11:05:05 -04:00
garrettdreyfus
b8526741c3 scoreScalar deleted 2014-05-25 10:55:49 -04:00
garrettdreyfus
138e0e5b2c Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 
Conflicts:
	js/main.js
 2014-05-25 10:52:20 -04:00
garrettdreyfus
bf3c247533 clean script created 2014-05-25 10:51:25 -04:00
meadowstream
2a4c971d67 Merge branch 'gh-pages' 2014-05-25 10:42:31 -04:00
meadowstream
3388dfa022 merged 2014-05-25 10:42:09 -04:00
meadowstream
c6613ad794 added real scaling 2014-05-25 10:41:06 -04:00
garrettdreyfus
2b52b64165 deleted blocks can not partake in combos 2014-05-25 10:20:32 -04:00
garrettdreyfus
3f0040c213 got rid of useless lane calculation 2014-05-25 10:08:09 -04:00
garrettdreyfus
fe0cbb72c9 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris 2014-05-25 10:03:42 -04:00
garrettdreyfus
79ae18dc6f added Attached lane, fixes checking 2014-05-25 10:03:28 -04:00
meadowstream
63d33c7e11 merged 2014-05-25 01:12:06 -04:00
meadowstream
10a24d092e centered, resized canvas. made system to augment different aspects of the game for different devices. 2014-05-25 01:11:24 -04:00
garrettdreyfus
aeb17cfec5 better scoring 2014-05-25 00:59:56 -04:00
garrettdreyfus
edab5b7118 added back the enter key 2014-05-25 00:44:25 -04:00
garrettdreyfus
70330a40bf Merge branch 'master' of http://github.com/teamsnowman/hextris into gh-pages 
Conflicts:
	js/main.js
 2014-05-25 00:41:01 -04:00
garrettdreyfus
944245f639 fixed checking 2014-05-25 00:39:23 -04:00
garrettdreyfus
8db46856f7 better input 2014-05-24 22:44:23 -04:00
meadowstream
078093eff4 readded pausing onblur, removed debugger statements 2014-05-24 22:10:12 -04:00
meadowstream
482a3ef7b9 removed false gameovers, added css for local fonts 2014-05-24 21:12:12 -04:00
meadowstream
df82f5fee8 changed ramping in difficulty 2014-05-24 19:50:57 -04:00
meadowstream
10c8a0b28a fixed issues surrounding white blocks 2014-05-24 18:28:32 -04:00
meadowstream
0f9484b7e6 added ability to restart game at any time using enter, removed logging 2014-05-24 16:39:25 -04:00
meadowstream
d7ea9b6628 started to add ability to restart game at any time by pressing enter 2014-05-24 16:39:04 -04:00
meadowstream
bf6368cdba added ability to turn hexagon during startup 2014-05-24 16:35:32 -04:00
meadowstream
70b404e161 fixed conflicts around input.js and pausing 2014-05-24 16:04:57 -04:00
meadowstream
74cf58facc fixed speeding up used to create an additional concurrent game loop when enter was pressed 2014-05-24 16:02:14 -04:00
Michael Yang
598acaae87 hacky fix to drop blocks on gameover 2014-05-24 16:01:24 -04:00
Michael Yang
6c073cacdb ended spawning blocks on gameover 2014-05-24 15:59:13 -04:00
meadowstream
bc11f11d07 set paused to always call requestAnimFrame 2014-05-24 15:56:29 -04:00
Michael Yang
477c5aba6d Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-24 15:52:38 -04:00
Michael Yang
7e762ebe77 center hex snaps on gameover 2014-05-24 15:52:25 -04:00
garrettdreyfus
18299e433b Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-24 15:51:32 -04:00
meadowstream
2645e32474 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-24 15:51:13 -04:00
garrettdreyfus
5eb36f205a Merge branch 'master' of http://github.com/teamsnowman/hextris 
Conflicts:
	js/main.js
 2014-05-24 15:51:03 -04:00
garrettdreyfus
68273a6a23 deleting is back 2014-05-24 15:50:01 -04:00
meadowstream
cbba963675 fixed block detection 2014-05-24 15:48:48 -04:00
meadowstream
f6d208917e removed debugger statements 2014-05-24 15:46:35 -04:00
Michael Yang
367bbd8656 fixed restart bug 2014-05-24 15:42:40 -04:00
meadowstream
4491ef2d28 made anim slower 2014-05-24 15:41:44 -04:00
meadowstream
e853555ef5 boundary renders below hex 2014-05-24 15:39:27 -04:00
meadowstream
d0b8c563c6 merged boundary systems 2014-05-24 15:37:21 -04:00
meadowstream
2c6759262a added new block initialization animation 2014-05-24 15:35:38 -04:00
garrettdreyfus
5cdc671f0d outline 2014-05-24 15:31:57 -04:00
Michael Yang
eebc76cb06 whoops, now properly merged 2014-05-24 15:10:28 -04:00
Michael Yang
a3b74202b8 merge conflict resolved 2014-05-24 15:07:58 -04:00
Michael Yang
19fa87eb5a improved drawPolygon, changed inner hex 2014-05-24 15:06:57 -04:00
garrettdreyfus
43e011e884 Merge branch 'master' of http://github.com/teamsnowman/hextris 
Conflicts:
	js/main.js
 2014-05-24 14:53:22 -04:00
garrettdreyfus
e07386038f pauses when you leave the tab 2014-05-24 14:52:21 -04:00
meadowstream
4aae004ba6 added fade in for hexagonal boundary 2014-05-24 14:41:14 -04:00
garrettdreyfus
ae13307b64 Merge branch 'master' of http://github.com/teamsnowman/hextris 2014-05-24 14:38:36 -04:00
garrettdreyfus
6eb89aefdd not sure 2014-05-24 14:38:35 -04:00
Michael Yang
33dc99827f Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-24 14:37:55 -04:00
Michael Yang
19d02687b0 fixed height vs originalHeight drawing 2014-05-24 14:37:29 -04:00
garrettdreyfus
8863a41f69 wavegen back to normal 2014-05-24 14:15:07 -04:00
garrettdreyfus
23a15852cf Merge branch 'master' of http://github.com/teamsnowman/hextris 2014-05-24 14:12:44 -04:00
garrettdreyfus
6d1b01853d blocks fade in on shoot 2014-05-24 14:12:33 -04:00
meadowstream
aa75117137 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-24 14:12:19 -04:00
meadowstream
f28e510b9b Merge branch 'gh-pages' 2014-05-24 14:12:13 -04:00
meadowstream
085e04c2c9 fixed importing and exporting game data 2014-05-24 14:12:01 -04:00
garrettdreyfus
3f0f3f1e86 better boundry line 2014-05-24 14:08:40 -04:00
garrettdreyfus
73b51be3a8 pausing fixed 2014-05-24 13:59:01 -04:00
garrettdreyfus
8c14cc9463 no undefined colors 2014-05-24 13:56:41 -04:00
garrettdreyfus
19ae89369a checking working again 2014-05-24 13:25:33 -04:00
garrettdreyfus
e1979053b5 blocks being generated no checking happening 2014-05-24 13:24:03 -04:00
garrettdreyfus
9116411bb9 better modular arithmetic 2014-05-24 13:11:17 -04:00
meadowstream
7a934ca976 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-24 12:57:38 -04:00
meadowstream
0992939823 fixed pausing 2014-05-24 12:57:27 -04:00
garrettdreyfus
7c8830472a thread safe(lol :)) light ui 2014-05-24 12:48:46 -04:00
meadowstream
154eea7a1b fixed issues around blocks not revolving + updated generation mehcanics 2014-05-24 12:21:29 -04:00
meadowstream
51c479ed77 made timing for wavegeneration iteration rather than time based 2014-05-24 12:09:46 -04:00
meadowstream
bfc020af6a Merge branch 'master' into gh-pages 2014-05-23 23:28:44 -04:00
meadowstream
bf7cf8c0f8 generations of waves start at a faster speed but reach mins slower 2014-05-23 23:27:58 -04:00
meadowstream
37c015dab7 made # of sides more dynamic 2014-05-23 22:46:01 -04:00
meadowstream
1c56603bc2 added more variety in block generation 2014-05-23 22:41:55 -04:00
garrettdreyfus
3dad2f1e9c less consolidateBlocks 2014-05-23 21:36:59 -04:00
meadowstream
4cc4ca6dea changed randomGEneration function to have faster rampup, longer amount of time in the more fun zone 2014-05-23 20:49:57 -04:00
meadowstream
518c72f844 added beginnings of new wave system 2014-05-23 20:23:31 -04:00
meadowstream
95f9613899 added bouncing anim v2 2014-05-23 16:50:18 -04:00
meadowstream
3ec79fcb35 added new startanim 2014-05-23 16:13:28 -04:00
Noah Moroze
47e0e9632d Properly set default highscores 2014-05-23 13:01:51 -04:00
Michael Yang
324aaa7b5d added localStorage highscores 2014-05-23 01:51:16 -04:00
Michael Yang
aef9eb31c9 added high score displaying 2014-05-23 01:10:12 -04:00
Michael Yang
2a398e255b added navbar, added pausing, changed score rendering 2014-05-23 00:51:03 -04:00
meadowstream
7aadcb8fe1 added analytics v2 2014-05-22 21:06:52 -04:00
garrettdreyfus
6514598b6c Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris 2014-05-22 20:44:25 -04:00
garrettdreyfus
29e71d9479 faster fade 2014-05-22 20:44:14 -04:00
Noah Moroze
642ef7cd31 Removed space-to-speed-up until we figure out an alternative 2014-05-22 20:36:48 -04:00
meadowstream
e4bdde9fd1 added new waves system, starting to redo start screen 2014-05-22 20:22:20 -04:00
meadowstream
28d612c734 merged 2014-05-22 19:32:58 -04:00
meadowstream
32136d48ce added more extensive shaking + cleaned up some code 2014-05-22 19:30:40 -04:00
garrettdreyfus
d5eedd0f5b fixed scoring 2014-05-22 19:30:01 -04:00
garrettdreyfus
96412e5233 no more disappearing blocks 2014-05-22 19:08:08 -04:00
meadowstream
567852279f added shaking when the hexagon is hit by blocks 2014-05-22 19:01:39 -04:00
meadowstream
f0b279274d added recording system 2014-05-22 17:04:57 -04:00
meadowstream
3222f2184e merged 2014-05-22 16:38:32 -04:00
meadowstream
c9ef3d04b2 added import/export system 2014-05-22 16:36:32 -04:00
Garrett Finucane
23c8a89047 fixed combos and added wavegen 2014-05-22 15:42:05 -04:00
Garrett Finucane
cbd56c8826 minor fixes wavegen a thing now 2014-05-22 15:29:35 -04:00
Garrett Finucane
a8b6d36fd7 added combo detecting 2014-05-22 14:19:58 -04:00
Garrett Finucane
9fac2d2f8f got rid of cruft 2014-05-22 13:53:24 -04:00
meadowstream
4607423e09 fixed falling mechanics, tint and opacity no longer conflict 2014-05-22 13:26:44 -04:00
meadowstream
4ee2ffbd2b now, only blocks that need to fall go into a state of falling after 
blocks below them are destroyed
 2014-05-22 13:10:26 -04:00
meadowstream
f5a3056823 blocks now fade out based on their opacity before being destroyed 2014-05-22 13:01:39 -04:00
meadowstream
dafb4b6fe2 added opacity / tint properties 2014-05-21 18:39:02 -04:00
meadowstream
56d34d4d2d removed innerhtml scoring statement 2014-05-21 17:44:34 -04:00
meadowstream
6eb13b72a4 removed useless translation + did some jslinting 2014-05-21 17:41:18 -04:00
meadowstream
5cc9210781 Merge branch 'master' into gh-pages 2014-05-21 17:39:49 -04:00
Michael Yang
f6ecba5024 fixed merge conflicts 2014-05-21 17:31:19 -04:00
Michael Yang
797701c4e4 changed shadow to gradient 2014-05-21 17:18:18 -04:00
garrettdreyfus
02a46580af Merge branch 'master' of http://github.com/teamsnowman/hextris into gh-pages 
Conflicts:
	js/checking.js
 2014-05-20 22:39:03 -04:00
garrettdreyfus
8219515329 NO LAG ctx.shadowBlur=25 2014-05-20 22:33:50 -04:00
Noah Moroze
08abf881e4 Got rid of extraneous debugger call 2014-05-20 20:39:19 -04:00
Noah Moroze
2a597967c7 Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-20 20:33:51 -04:00
Noah Moroze
af6c0b1380 Render score on canvas for better performance 2014-05-20 20:33:44 -04:00
Garrett Finucane
82415e4054 Delete hey.js 2014-05-20 19:56:58 -04:00
garrettdreyfus
9a58400e5b no debugger 2014-05-20 17:52:57 -04:00
garrettdreyfus
9f1e6aaca2 no diagonals for real 2014-05-20 17:09:39 -04:00
garrettdreyfus
137d2567ec no diagonals 2014-05-20 16:59:58 -04:00
garrettdreyfus
04318e34a6 Merge branch 'master' of http://github.com/teamsnowman/hextris into newFlow 
Conflicts:
	js/checking.js
	js/entities.js
 2014-05-20 16:50:21 -04:00
garrettdreyfus
6cf19f9bc5 Mark and sweep ftw 2014-05-20 16:48:11 -04:00
lhs local
ee37562974 kinda working 2014-05-20 14:34:02 -04:00
Noah Moroze
80d904cee6 Split loop into game update and render, separated graphics-related code 2014-05-20 08:30:14 -04:00
Noah Moroze
219106870a Fixed boundary hexagon 2014-05-20 08:05:21 -04:00
garrettdreyfus
a8d93aef47 spiral shooting 2014-05-20 07:13:32 -04:00
Garrett Finucane
fe310d2fe8 better sounds two at a time 2014-05-19 22:28:27 -04:00
Michael Yang
a5f55c4272 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-19 22:17:06 -04:00
Michael Yang
456789c81b added shadows 2014-05-19 22:16:43 -04:00
meadowstream
6e6d6b0356 made blocks smaller. still have to update the boundary to reflect this. 2014-05-19 21:52:31 -04:00
meadowstream
e4488d96b6 (hopefully) made canvas lines crisper 2014-05-19 21:21:16 -04:00
Garrett Finucane
368d4fea66 why you no work 2014-05-19 20:47:19 -04:00
meadowstream
5c8da16e10 made keys fire on keydown rather than keyup 2014-05-19 17:07:18 -04:00
meadowstream
a96331e954 fixed white gaps + added gravity back in 2014-05-19 16:36:28 -04:00
meadowstream
232fc71421 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-19 16:31:24 -04:00
Garrett Finucane
278244ceea always use var kids 2014-05-19 16:27:50 -04:00
meadowstream
3987460f47 added index 2014-05-19 16:22:30 -04:00
meadowstream
6201181f03 added angular velocity 2014-05-19 15:49:05 -04:00
Garrett Finucane
4e3bcecc24 Merge branch 'master' of http://github.com/teamsnowman/hextris 2014-05-19 13:25:31 -04:00
Garrett Finucane
8979d8250b some nice sounds 2014-05-19 13:25:20 -04:00
Noah Moroze
eef78ff7e1 Added rotation animation for hexagon 2014-05-19 13:18:49 -04:00
Garrett Finucane
a56c017467 Fixed checking as far as I can tell 2014-05-19 10:36:13 -04:00
Garrett Finucane
0d4dff2f4d more sensible timing 2014-05-18 23:35:11 -04:00
Garrett Finucane
7e4b9a2106 more sensoble timing 2014-05-18 23:34:05 -04:00
Noah Moroze
dbebe07139 Fixed the WHITTEEEE GAPS 2014-05-18 23:14:55 -04:00
Mathew Huusko V
ee706f3704 Support retina displays (multiple X rendering) 2014-05-18 14:48:50 -04:00
Mathew Huusko V
4965e7a956 Some simple reformatting, fix a couple linting errors 2014-05-18 14:15:13 -04:00
Mathew Huusko V
4f3c746212 Organize project slightly, clean html 2014-05-18 14:12:33 -04:00