garrettdreyfus
|
181a6546f6
|
Merge branch 'master' of http://github.com/teamsnowman/wastedtime
|
2014-05-17 19:16:57 -04:00 |
|
garrettdreyfus
|
3e6eed4697
|
4 in a row
|
2014-05-17 19:16:55 -04:00 |
|
Michael Yang
|
a18387cc84
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-17 19:07:10 -04:00 |
|
Michael Yang
|
d6ede4673b
|
edited end screen message
|
2014-05-17 19:06:51 -04:00 |
|
Michael Yang
|
d1ef109877
|
added overlays to modal screens
|
2014-05-17 19:02:28 -04:00 |
|
Noah Moroze
|
f87e84563f
|
Fixed merge conflicts
|
2014-05-17 18:55:03 -04:00 |
|
Noah Moroze
|
d26b8e5fb8
|
Gray line
|
2014-05-17 18:54:37 -04:00 |
|
lengstrom
|
9109c73d10
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-17 18:52:19 -04:00 |
|
lengstrom
|
5756881d69
|
added gravity
|
2014-05-17 18:52:15 -04:00 |
|
Michael Yang
|
0514e560ea
|
added init/reset function
|
2014-05-17 18:47:37 -04:00 |
|
Michael Yang
|
b31789f17e
|
added start and end screens
|
2014-05-17 18:34:02 -04:00 |
|
Noah Moroze
|
c5e769713e
|
Score
|
2014-05-17 18:22:12 -04:00 |
|
Noah Moroze
|
3d57cc0e09
|
Added score
|
2014-05-17 17:38:11 -04:00 |
|
lengstrom
|
fb16e5c189
|
added formatting
|
2014-05-17 17:37:52 -04:00 |
|
garrettdreyfus
|
08628860bd
|
checking working no anims
|
2014-05-17 17:28:15 -04:00 |
|
Michael Yang
|
d7fc58cc11
|
oops
|
2014-05-17 17:19:23 -04:00 |
|
Michael Yang
|
076b5d0864
|
holy crap wow how did we fix these merge conflicts
|
2014-05-17 17:15:55 -04:00 |
|
Michael Yang
|
4be426fe84
|
added modals, changed game shape, changed colors
|
2014-05-17 17:10:35 -04:00 |
|
lengstrom
|
d7c7466d43
|
fixed collision detection
|
2014-05-17 17:02:24 -04:00 |
|
lengstrom
|
39231c75aa
|
added bad collision detection
|
2014-05-17 16:53:14 -04:00 |
|
lengstrom
|
846bf5115e
|
sort of fixing collision detection
|
2014-05-17 16:48:55 -04:00 |
|
lengstrom
|
6fdc17827a
|
added more stuff
|
2014-05-17 15:08:10 -04:00 |
|
lengstrom
|
b2f379994f
|
merged
|
2014-05-17 15:02:19 -04:00 |
|
lengstrom
|
3a79b488de
|
fixed fps issue + doing some cd
|
2014-05-17 15:01:16 -04:00 |
|
Noah Moroze
|
9002775d34
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-17 14:46:22 -04:00 |
|
Noah Moroze
|
b57b26aba7
|
blah
|
2014-05-17 14:46:14 -04:00 |
|
lengstrom
|
b15af9dd10
|
Revamped collision system
|
2014-05-17 14:25:22 -04:00 |
|
garrettdreyfus
|
bad7f9160e
|
CHECKING WORKS
|
2014-05-17 14:15:16 -04:00 |
|
Noah Moroze
|
12a6a2059f
|
fixed merge conflict, adjusted width of block
|
2014-05-17 14:08:09 -04:00 |
|
Noah Moroze
|
15f553693e
|
changed blocks to trapezoids
|
2014-05-17 14:02:09 -04:00 |
|
lengstrom
|
701e5e0848
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-17 13:55:10 -04:00 |
|
lengstrom
|
0ce085fa34
|
added collision detection
|
2014-05-17 13:55:02 -04:00 |
|
Noah Moroze
|
82bc8deeb1
|
Addin fat stacks
|
2014-05-17 13:43:56 -04:00 |
|
Michael Yang
|
ba1e55d8e7
|
fixed block width calculation
|
2014-05-17 13:34:57 -04:00 |
|
lengstrom
|
f41c210f20
|
merged
|
2014-05-17 13:04:15 -04:00 |
|
lengstrom
|
4ad7fafed5
|
merged + added lines
|
2014-05-17 13:03:50 -04:00 |
|
Michael Yang
|
2d61f08e19
|
with noah, fixed clock rotation
|
2014-05-17 12:57:48 -04:00 |
|
Michael Yang
|
b13a649539
|
noah is kewl
|
2014-05-17 12:50:12 -04:00 |
|
garrettdreyfus
|
02fb7b4df9
|
included checking.js
|
2014-05-17 12:45:22 -04:00 |
|
garrettdreyfus
|
496c577389
|
no ===
|
2014-05-17 12:43:40 -04:00 |
|
lengstrom
|
03dc0643de
|
merged
|
2014-05-17 12:43:27 -04:00 |
|
garrettdreyfus
|
ed808dff60
|
no <<
|
2014-05-17 12:43:08 -04:00 |
|
lengstrom
|
18553acf2d
|
added stuff
|
2014-05-17 12:42:56 -04:00 |
|
Noah Moroze
|
8e525bce6c
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-17 12:42:02 -04:00 |
|
Noah Moroze
|
1c77af6bd6
|
Fixed mod arithmetic
|
2014-05-17 12:41:54 -04:00 |
|
garrettdreyfus
|
5900887866
|
vertical checking working
|
2014-05-17 12:39:49 -04:00 |
|
lengstrom
|
b4d006a0e5
|
merged files
|
2014-05-17 12:30:40 -04:00 |
|
lengstrom
|
3851284032
|
added blocks
|
2014-05-17 12:29:46 -04:00 |
|
Noah Moroze
|
f936253e58
|
yes
|
2014-05-17 12:16:56 -04:00 |
|
Michael Yang
|
f8cf88beaf
|
fixed polygon function
|
2014-05-17 11:55:58 -04:00 |
|