lengstrom
|
18553acf2d
|
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
|
8e525bce6c
|
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 |
|
Noah Moroze
|
1c77af6bd6
|
Fixed mod arithmetic
|
2014-05-17 12:41:54 -04:00 |
|
garrettdreyfus
|
8ccb835df0
|
vertical checking working
|
2014-05-17 12:39:49 -04:00 |
|
garrettdreyfus
|
5900887866
|
vertical checking working
|
2014-05-17 12:39:49 -04:00 |
|
meadowstream
|
258e961548
|
merged files
|
2014-05-17 12:30:40 -04:00 |
|
lengstrom
|
b4d006a0e5
|
merged files
|
2014-05-17 12:30:40 -04:00 |
|
meadowstream
|
6dc80e01c8
|
added blocks
|
2014-05-17 12:29:46 -04:00 |
|
lengstrom
|
3851284032
|
added blocks
|
2014-05-17 12:29:46 -04:00 |
|
Noah Moroze
|
fc193d0519
|
yes
|
2014-05-17 12:16:56 -04:00 |
|
Noah Moroze
|
f936253e58
|
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
|
f8cf88beaf
|
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
|
23f3331311
|
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 |
|
Michael Yang
|
ee8f94f68e
|
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 |
|
Noah Moroze
|
f9f00a53dd
|
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
|
b08247dfe9
|
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 |
|
Michael Yang
|
b191dde5e9
|
fixed merge, kinda
|
2014-05-17 11:16:41 -04:00 |
|
meadowstream
|
665a75c3f7
|
merged
|
2014-05-17 11:15:53 -04:00 |
|
lengstrom
|
ad62664bfc
|
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 |
|
lengstrom
|
8064f86dda
|
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 |
|
Michael Yang
|
4964162145
|
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
|
530b926a41
|
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 |
|
Noah Moroze
|
32907eef36
|
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 |
|
lengstrom
|
9f88cef7d6
|
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 |
|
lengstrom
|
ddd2630692
|
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
|
66e0c1c2b6
|
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 |
|
Noah Moroze
|
4646514de8
|
MATH
|
2014-05-17 10:43:16 -04:00 |
|
meadowstream
|
b993f4dbbc
|
fixed render loop
|
2014-05-17 10:28:48 -04:00 |
|
lengstrom
|
a35706ce3d
|
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 |
|
lengstrom
|
b4a2bd9df1
|
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 |
|
lengstrom
|
710d17c827
|
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 |
|