Commit graph

Select branches

Hide pull requests

clay-improvements

gh-pages

master

v1.1

Mono Color

• 567f212f37 Merge branch 'master' of https://github.com/teamsnowman/wastedtime lengstrom 2014-05-24 15:51:13 -0400
• 5eb36f205a Merge branch 'master' of http://github.com/teamsnowman/hextris garrettdreyfus 2014-05-24 15:51:03 -0400
• 6ade58139f Merge branch 'master' of http://github.com/teamsnowman/hextris garrettdreyfus 2014-05-24 15:51:03 -0400
• 68273a6a23 deleting is back garrettdreyfus 2014-05-24 15:50:01 -0400
• a5539ae7be deleting is back garrettdreyfus 2014-05-24 15:50:01 -0400
• cbba963675 fixed block detection meadowstream 2014-05-24 15:48:48 -0400
• 635993dccb fixed block detection lengstrom 2014-05-24 15:48:48 -0400
• f6d208917e removed debugger statements meadowstream 2014-05-24 15:46:35 -0400
• 41d37b24d7 removed debugger statements lengstrom 2014-05-24 15:46:35 -0400
• 367bbd8656 fixed restart bug Michael Yang 2014-05-24 15:42:40 -0400
• c11cd336fe fixed restart bug Michael Yang 2014-05-24 15:42:40 -0400
• 4491ef2d28 made anim slower meadowstream 2014-05-24 15:41:44 -0400
• dcf4a38dd8 made anim slower lengstrom 2014-05-24 15:41:44 -0400
• e853555ef5 boundary renders below hex meadowstream 2014-05-24 15:39:27 -0400
• 36a1c2b924 boundary renders below hex lengstrom 2014-05-24 15:39:27 -0400
• d0b8c563c6 merged boundary systems meadowstream 2014-05-24 15:37:21 -0400
• b02759df23 merged boundary systems lengstrom 2014-05-24 15:37:21 -0400
• 2c6759262a added new block initialization animation meadowstream 2014-05-24 15:35:38 -0400
• bd65f6da30 added new block initialization animation lengstrom 2014-05-24 15:35:38 -0400
• 5cdc671f0d outline garrettdreyfus 2014-05-24 15:31:57 -0400
• 320ba2c046 outline garrettdreyfus 2014-05-24 15:31:57 -0400
• eebc76cb06 whoops, now properly merged Michael Yang 2014-05-24 15:10:28 -0400
• b1a39795fa whoops, now properly merged Michael Yang 2014-05-24 15:10:28 -0400
• a3b74202b8 merge conflict resolved Michael Yang 2014-05-24 15:07:58 -0400
• 82d4ab6f67 merge conflict resolved Michael Yang 2014-05-24 15:07:58 -0400
• 19fa87eb5a improved drawPolygon, changed inner hex Michael Yang 2014-05-24 15:06:57 -0400
• 9c2abda142 improved drawPolygon, changed inner hex Michael Yang 2014-05-24 15:06:57 -0400
• af612dcedb fixed touch maybe Michael Yang 2014-05-24 14:54:59 -0400
• 09c0125e92 fixed touch maybe Michael Yang 2014-05-24 14:54:59 -0400
• 43e011e884 Merge branch 'master' of http://github.com/teamsnowman/hextris garrettdreyfus 2014-05-24 14:53:22 -0400
• dc63b76cb3 Merge branch 'master' of http://github.com/teamsnowman/hextris garrettdreyfus 2014-05-24 14:53:22 -0400
• e07386038f pauses when you leave the tab garrettdreyfus 2014-05-24 14:52:21 -0400
• 2a3b9c08ac pauses when you leave the tab garrettdreyfus 2014-05-24 14:52:21 -0400
• 7d1a7ad6bf merged meadowstream 2014-05-24 14:42:16 -0400
• 04703ce649 merged lengstrom 2014-05-24 14:42:16 -0400
• 4aae004ba6 added fade in for hexagonal boundary meadowstream 2014-05-24 14:41:14 -0400
• d61f35e64d added fade in for hexagonal boundary lengstrom 2014-05-24 14:41:14 -0400
• ae13307b64 Merge branch 'master' of http://github.com/teamsnowman/hextris garrettdreyfus 2014-05-24 14:38:36 -0400
• a4ee273e8b Merge branch 'master' of http://github.com/teamsnowman/hextris garrettdreyfus 2014-05-24 14:38:36 -0400
• 6eb89aefdd not sure garrettdreyfus 2014-05-24 14:38:35 -0400
• 626d0ca3ad not sure garrettdreyfus 2014-05-24 14:38:35 -0400
• 33dc99827f Merge branch 'master' of https://github.com/teamsnowman/hextris Michael Yang 2014-05-24 14:37:55 -0400
• 7a84ee597a Merge branch 'master' of https://github.com/teamsnowman/hextris Michael Yang 2014-05-24 14:37:55 -0400
• 19d02687b0 fixed height vs originalHeight drawing Michael Yang 2014-05-24 14:37:29 -0400
• f304010964 fixed height vs originalHeight drawing Michael Yang 2014-05-24 14:37:29 -0400
• 8863a41f69 wavegen back to normal garrettdreyfus 2014-05-24 14:15:07 -0400
• 0641df1492 wavegen back to normal garrettdreyfus 2014-05-24 14:15:07 -0400
• 23a15852cf Merge branch 'master' of http://github.com/teamsnowman/hextris garrettdreyfus 2014-05-24 14:12:44 -0400
• ece80f89b8 Merge branch 'master' of http://github.com/teamsnowman/hextris garrettdreyfus 2014-05-24 14:12:44 -0400
• 6d1b01853d blocks fade in on shoot garrettdreyfus 2014-05-24 14:12:33 -0400
• c464192afe blocks fade in on shoot garrettdreyfus 2014-05-24 14:12:33 -0400
• aa75117137 Merge branch 'master' of https://github.com/teamsnowman/wastedtime meadowstream 2014-05-24 14:12:19 -0400
• 54c0d53a35 Merge branch 'master' of https://github.com/teamsnowman/wastedtime lengstrom 2014-05-24 14:12:19 -0400
• f28e510b9b Merge branch 'gh-pages' meadowstream 2014-05-24 14:12:13 -0400
• af3bc9ce1b Merge branch 'gh-pages' lengstrom 2014-05-24 14:12:13 -0400
• 085e04c2c9 fixed importing and exporting game data meadowstream 2014-05-24 14:12:01 -0400
• adac2c4425 fixed importing and exporting game data lengstrom 2014-05-24 14:12:01 -0400
• 3f0f3f1e86 better boundry line garrettdreyfus 2014-05-24 14:08:40 -0400
• 99fca37ea4 better boundry line garrettdreyfus 2014-05-24 14:08:40 -0400
• 73b51be3a8 pausing fixed garrettdreyfus 2014-05-24 13:59:01 -0400
• 0474c270cf pausing fixed garrettdreyfus 2014-05-24 13:59:01 -0400
• 8c14cc9463 no undefined colors garrettdreyfus 2014-05-24 13:56:41 -0400
• 5ff998146d no undefined colors garrettdreyfus 2014-05-24 13:56:41 -0400
• 19ae89369a checking working again garrettdreyfus 2014-05-24 13:25:33 -0400
• 7f969d2302 checking working again garrettdreyfus 2014-05-24 13:25:33 -0400
• e1979053b5 blocks being generated no checking happening garrettdreyfus 2014-05-24 13:24:03 -0400
• 39cfa47837 blocks being generated no checking happening garrettdreyfus 2014-05-24 13:24:03 -0400
• 9116411bb9 better modular arithmetic garrettdreyfus 2014-05-24 13:11:17 -0400
• 0b7e749d67 better modular arithmetic garrettdreyfus 2014-05-24 13:11:17 -0400
• 7a934ca976 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages meadowstream 2014-05-24 12:57:38 -0400
• d4314cca00 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages lengstrom 2014-05-24 12:57:38 -0400
• 0992939823 fixed pausing meadowstream 2014-05-24 12:57:22 -0400
• ca8936e385 fixed pausing lengstrom 2014-05-24 12:57:22 -0400
• 7c8830472a thread safe(lol :)) light ui garrettdreyfus 2014-05-24 12:48:46 -0400
• 71eda56c77 thread safe(lol :)) light ui garrettdreyfus 2014-05-24 12:48:46 -0400
• 154eea7a1b fixed issues around blocks not revolving + updated generation mehcanics meadowstream 2014-05-24 12:21:29 -0400
• 01ac3a9553 fixed issues around blocks not revolving + updated generation mehcanics lengstrom 2014-05-24 12:21:29 -0400
• 51c479ed77 made timing for wavegeneration iteration rather than time based meadowstream 2014-05-24 12:09:46 -0400
• f1ee299a16 made timing for wavegeneration iteration rather than time based lengstrom 2014-05-24 12:09:46 -0400
• bfc020af6a Merge branch 'master' into gh-pages meadowstream 2014-05-23 23:28:44 -0400
• 3c3dd63124 Merge branch 'master' into gh-pages lengstrom 2014-05-23 23:28:44 -0400
• bf7cf8c0f8 generations of waves start at a faster speed but reach mins slower meadowstream 2014-05-23 23:27:49 -0400
• 0e010bf3d5 generations of waves start at a faster speed but reach mins slower lengstrom 2014-05-23 23:27:49 -0400
• 37c015dab7 made # of sides more dynamic meadowstream 2014-05-23 22:46:01 -0400
• 869e37e100 made # of sides more dynamic lengstrom 2014-05-23 22:46:01 -0400
• 1c56603bc2 added more variety in block generation meadowstream 2014-05-23 22:41:55 -0400
• eac2ec4271 added more variety in block generation lengstrom 2014-05-23 22:41:55 -0400
• 3dad2f1e9c less consolidateBlocks garrettdreyfus 2014-05-23 21:36:59 -0400
• 4774b021d1 less consolidateBlocks garrettdreyfus 2014-05-23 21:36:59 -0400
• 4cc4ca6dea changed randomGEneration function to have faster rampup, longer amount of time in the more fun zone meadowstream 2014-05-23 20:49:57 -0400
• 2782e1b401 changed randomGEneration function to have faster rampup, longer amount of time in the more fun zone lengstrom 2014-05-23 20:49:57 -0400
• 15069ee08a Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages meadowstream 2014-05-23 20:23:41 -0400
• 52349e3500 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages lengstrom 2014-05-23 20:23:41 -0400
• 518c72f844 added beginnings of new wave system meadowstream 2014-05-23 20:22:53 -0400
• 63dbd47ee7 added beginnings of new wave system lengstrom 2014-05-23 20:22:53 -0400
• 7cfec3f1e1 added new wave system meadowstream 2014-05-23 20:22:53 -0400
• efdc672b44 added new wave system lengstrom 2014-05-23 20:22:53 -0400
• 95f9613899 added bouncing anim v2 meadowstream 2014-05-23 16:50:18 -0400
• 2a56b01c0b added bouncing anim v2 lengstrom 2014-05-23 16:50:18 -0400
• 3ec79fcb35 added new startanim meadowstream 2014-05-23 16:13:23 -0400