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 |
|
Noah Moroze
|
204f2180ae
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-17 10:18:41 -04:00 |
|
meadowstream
|
e99e147466
|
added server for later
|
2014-05-17 10:18:31 -04:00 |
|
Noah Moroze
|
47eed928cb
|
Gitignore
|
2014-05-17 10:18:28 -04:00 |
|
Noah Moroze
|
6c4daaed93
|
Got rid of DS_Store
|
2014-05-17 10:17:24 -04:00 |
|
Noah Moroze
|
5ecd8349de
|
Initial commit
|
2014-05-17 10:16:26 -04:00 |
|