Commit graph

11 commits

Author SHA1 Message Date
calebp
b45d30714c Tweaked explosions and stuff. 2017-09-05 20:56:17 -05:00
calebp
3c43de1292 Merge branch 'master' into Level-Design
Probably merged conflicts appropriately.
2017-09-05 20:41:47 -05:00
calebp
926ad64a7e Merge branch 'master' into death-and-taxes
Discarded scene changes.
2017-09-05 20:38:10 -05:00
calebp
071230b9f2 Merge branch 'darrel'
Manually resolved conflicts. Discarded scene changes.
2017-09-05 20:30:22 -05:00
darrelmarek
e31811e4e6 Camera movement + Win condition 2017-09-05 20:11:49 -05:00
Steven
d4ed074352 rockets and explosions 2017-09-05 19:44:20 -05:00
Randall Dolifka
ccb07b34ed Added a deathbox and saws that trigger scene reload. 2017-09-05 15:51:57 -05:00
calebp
f859439915 Explosion work 2017-09-04 16:39:17 -05:00
calebp
f326d22dc1 Background work
Incomplete scripts but the tiles are in vertical alignment.  Need to push before bed so I can work on it tomorrow.  Will be testing if my laptop can run unity well enough.
2017-09-03 22:28:18 -05:00
Randall Dolifka
452939d4fb Maybe not. Trying this project thing again. 2017-09-03 15:16:12 -05:00
Randall Dolifka
0a38999746 Added initial Unity3D project for Game1. 2017-09-03 15:02:15 -05:00