Commit graph

12 commits

Author SHA1 Message Date
Darrel Marek
8a25f18aeb even newer level.. (TEST) 2017-10-23 23:36:30 -05:00
darrelmarek
4f10820d5e Duplicated old level
works !
2017-10-23 08:26:23 -05:00
Randall
d68981698f Finished merging changes into combined test scene. 2017-10-17 15:04:31 -05:00
Randall
80e0c3bdb0 Manually merged in GameManager.cs 2017-10-17 14:47:28 -05:00
Randall
d05a0a88d0 Merge branch 'master' into feature/guard-cameras 2017-10-17 14:45:02 -05:00
Steven
45dda740a0 spies trigger win animation after 3 complete missions 2017-10-17 01:39:47 -05:00
Randall Dolifka
aabd87ea2e Cleaned up camera code, added locks to camera so only one player can control it at a time. 2017-10-16 22:08:59 -05:00
Steven
0c4f170fb8 added win animation 2017-10-15 02:38:13 -05:00
Steven
b9419896a8 added score ui and update-score animations 2017-10-14 18:53:16 -05:00
Steven
2a3c2839d5 basics for interactions are now very stable 2017-10-09 02:03:39 -05:00
Steven
1f4855712a synced up npc communication, still need to fix spy to spy communication 2017-10-05 03:13:27 -05:00
Steven
3c72f37ac6 updated characters 2017-10-03 04:15:13 -05:00