Commit graph

309 commits

Author SHA1 Message Date
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
meadowstream
4c353b149f Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-22 21:06:38 -04:00
meadowstream
13ae9b6a98 added analytics 2014-05-22 21:06:33 -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
ced1f14b63 added favicon 2014-05-22 17:30:09 -04:00
meadowstream
2e7175f89a added jquery 2014-05-22 17:05:29 -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
4c98761609 removed asdf.png 2014-05-21 17:27:11 -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
meadowstream
42fc52e172 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-19 22:46:39 -04:00
meadowstream
8dfec16332 added type attributes 2014-05-19 22:46:35 -04:00