Commit graph

7 commits

Author SHA1 Message Date
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
Steven
d4ed074352 rockets and explosions 2017-09-05 19:44:20 -05:00
calebp
7908220b64 Level 0 Completed 2017-09-05 16:34:26 -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
darrelmarek
6fb03d3296 Added prefabs for commonly used objects
Prefabs are objects that are repeated and are the same. The tiles for example should be prefabs.
2017-09-04 12:13:59 -05:00