Commit graph

505 commits

Author SHA1 Message Date
meadowstream
c72aca0a57 added more stuff 2014-05-17 15:08:10 -04:00
meadowstream
bbf990f3ad merged 2014-05-17 15:02:19 -04:00
meadowstream
e71fc74eb7 fixed fps issue + doing some cd 2014-05-17 15:01:16 -04:00
Noah Moroze
b843b42712 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 14:46:22 -04:00
Noah Moroze
e24de152fb blah 2014-05-17 14:46:14 -04:00
meadowstream
bda88c3531 Revamped collision system 2014-05-17 14:25:22 -04:00
garrettdreyfus
fd2b237e44 CHECKING WORKS 2014-05-17 14:15:16 -04:00
Noah Moroze
753adc4c65 fixed merge conflict, adjusted width of block 2014-05-17 14:08:09 -04:00
Noah Moroze
3ebe08d047 changed blocks to trapezoids 2014-05-17 14:02:09 -04:00
meadowstream
72325517cc Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 13:55:10 -04:00
meadowstream
5bc78e8081 added collision detection 2014-05-17 13:55:02 -04:00
Noah Moroze
63081fa230 Addin fat stacks 2014-05-17 13:43:56 -04:00
Michael Yang
2bc6560ba4 fixed block width calculation 2014-05-17 13:34:57 -04:00
meadowstream
b4877c3e97 merged 2014-05-17 13:04:15 -04:00
meadowstream
91b8969839 merged + added lines 2014-05-17 13:03:50 -04:00
Michael Yang
4e5d93b31f with noah, fixed clock rotation 2014-05-17 12:57:48 -04:00
Michael Yang
4666d2c129 noah is kewl 2014-05-17 12:50:12 -04:00
garrettdreyfus
53c83a395a included checking.js 2014-05-17 12:45:22 -04:00
garrettdreyfus
79928b6ea6 no === 2014-05-17 12:43:40 -04:00
meadowstream
ec3b98a5b2 merged 2014-05-17 12:43:27 -04:00
garrettdreyfus
77a76b1b46 no << 2014-05-17 12:43:08 -04:00
meadowstream
a42dbca9ff added stuff 2014-05-17 12:42:56 -04:00
Noah Moroze
14e6c357ba Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 12:42:02 -04:00
Noah Moroze
106edd1489 Fixed mod arithmetic 2014-05-17 12:41:54 -04:00
garrettdreyfus
8ccb835df0 vertical checking working 2014-05-17 12:39:49 -04:00
meadowstream
258e961548 merged files 2014-05-17 12:30:40 -04:00
meadowstream
6dc80e01c8 added blocks 2014-05-17 12:29:46 -04:00
Noah Moroze
fc193d0519 yes 2014-05-17 12:16:56 -04:00
Michael Yang
cf79fbefde fixed polygon function 2014-05-17 11:55:58 -04:00
Michael Yang
7b9a8d90d8 merge again 2014-05-17 11:27:00 -04:00
Michael Yang
52225849fd fixed the width and height stuff 2014-05-17 11:25:33 -04:00
Noah Moroze
28cdadb6b8 Fixed styles 2014-05-17 11:22:26 -04:00
Michael Yang
f0f2b2d08d merge conflict resolve 2014-05-17 11:18:28 -04:00
Michael Yang
58b4c3998a fixed merge, kinda 2014-05-17 11:16:41 -04:00
meadowstream
665a75c3f7 merged 2014-05-17 11:15:53 -04:00
meadowstream
012b231fd6 fixed render function + added basic demos for green / yellow stuff 2014-05-17 11:13:10 -04:00
Michael Yang
98d8ae9622 added polygon clock drawing code 2014-05-17 11:11:54 -04:00
Noah Moroze
2f10730990 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 11:03:14 -04:00
Noah Moroze
7fd1cef2d1 Real MATH 2014-05-17 11:03:11 -04:00
meadowstream
8fa1eb78c6 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 10:52:49 -04:00
meadowstream
39d0d52878 added blocks + tests for blocks - not sure if works yet 2014-05-17 10:52:25 -04:00
Noah Moroze
34db8854ed Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 10:43:19 -04:00
Noah Moroze
31ce597c09 MATH 2014-05-17 10:43:16 -04:00
meadowstream
b993f4dbbc fixed render loop 2014-05-17 10:28:48 -04:00
meadowstream
42f4ae2407 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 10:27:03 -04:00
meadowstream
6ada98b1bc added canvas 2014-05-17 10:26:55 -04:00
Noah Moroze
f910628e27 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 10:24:47 -04:00
Noah Moroze
f35f38759e Basic entities 2014-05-17 10:24:39 -04:00
meadowstream
9d354fb384 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 10:23:29 -04:00
meadowstream
652c9a8c85 added main loop + render loop + animFrame 2014-05-17 10:22:40 -04:00