Commit graph

9 commits

Author SHA1 Message Date
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
steven2gleal
dcfe0db24e experimenting with animator 2017-09-05 17:37:56 -05:00
Randall Dolifka
ccb07b34ed Added a deathbox and saws that trigger scene reload. 2017-09-05 15:51:57 -05:00
steven2gleal
b2501927a8 init commit to movement branch 2017-09-05 15:05:59 -05:00
calebp
f859439915 Explosion work 2017-09-04 16:39:17 -05:00
calebp
2e0f42908c Removed auto-scroll, set up initial environment
Also added a rocket feature
2017-09-04 11:33:52 -05:00