Commit graph

75 commits

Author SHA1 Message Date
Noah Moroze
6b40e6ecdc Merge 2014-05-25 23:55:20 -04:00
Noah Moroze
56bc252977 Save state during game 2014-05-25 23:52:35 -04:00
Michael Yang
ff2978b9ad refactor for days 2014-05-25 22:50:13 -04:00
Michael Yang
83607bf806 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:30:04 -04:00
Michael Yang
91b3c3f925 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:29:36 -04:00
garrettdreyfus
6ef7f09da7 you dont spell parent parrent 2014-05-25 22:29:34 -04:00
Michael Yang
035ae2da91 fixed onblur pausing bug 2014-05-25 22:28:04 -04:00
garrettdreyfus
58d8016a28 more comments in entities 2014-05-25 22:17:26 -04:00
garrettdreyfus
c7061997f6 no circular references halfway comments 2014-05-25 22:06:15 -04:00
Michael Yang
918c8ab924 create update.js, render.js 2014-05-25 21:49:03 -04:00
meadowstream
4371164e45 added new block destruction effects. broke pausing 2014-05-25 19:53:02 -04:00
meadowstream
464a7dde43 added mobile version 2014-05-25 18:27:25 -04:00
meadowstream
8fb791fbac Merge branch 'master' into gh-pages 2014-05-25 11:17:10 -04:00
meadowstream
9c3521880b added scaling 2014-05-25 11:16:33 -04:00
garrettdreyfus
1db9d66474 no shadow 2014-05-25 11:05:05 -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
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
944245f639 fixed checking 2014-05-25 00:39:23 -04:00
meadowstream
482a3ef7b9 removed false gameovers, added css for local fonts 2014-05-24 21:12:12 -04:00
meadowstream
10c8a0b28a fixed issues surrounding white blocks 2014-05-24 18:28:32 -04:00
meadowstream
bf6368cdba added ability to turn hexagon during startup 2014-05-24 16:35:32 -04:00
Michael Yang
6c073cacdb ended spawning blocks on gameover 2014-05-24 15:59:13 -04:00
Michael Yang
477c5aba6d Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-24 15:52:38 -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
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
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
Michael Yang
19fa87eb5a improved drawPolygon, changed inner hex 2014-05-24 15:06:57 -04:00
garrettdreyfus
6d1b01853d blocks fade in on shoot 2014-05-24 14:12: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
0992939823 fixed pausing 2014-05-24 12:57:27 -04:00
meadowstream
51c479ed77 made timing for wavegeneration iteration rather than time based 2014-05-24 12:09:46 -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
3ec79fcb35 added new startanim 2014-05-23 16:13:28 -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
meadowstream
32136d48ce added more extensive shaking + cleaned up some code 2014-05-22 19:30:40 -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