7 commits

Author	SHA1	Message	Date
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
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	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

Renamed from Project Undercover/Assets/Scripts/GameManager.cs (Browse further)