Commit graph

89 commits

Author SHA1 Message Date
shadow8t4
a20a910f1d Button soudnds 2017-11-30 14:32:12 -06:00
Steven Leal
6832045bd9 added mission complete sound and spyCaught sound 2017-11-30 14:27:16 -06:00
Steven Leal
4c415db023 guards can't keep giving spies points after someone wins 2017-11-30 14:11:04 -06:00
Steven Leal
cf64a7cfc7 added timeout after game win 2017-11-30 13:55:45 -06:00
Steven Leal
118230c128 fixed button transparency 2017-11-30 13:42:51 -06:00
Randall
f88d4e5998 Fixed issue preventing spies from moving. 2017-11-30 13:34:49 -06:00
Steven Leal
68275766d4 merged spy-ui-update 2017-11-30 13:21:33 -06:00
Steven Leal
7f20ebd211 merged spy-ui-update 2017-11-30 12:55:47 -06:00
Steven Leal
ba6f0e539f sweet interaction ui changes and mission updates 2017-11-30 12:07:05 -06:00
Randall
90144e086f Now preventing pause from being opened in camera zoom-in. 2017-11-30 12:04:40 -06:00
Randall
2919692ed4 Merge branch 'master' into menu 2017-11-30 11:40:42 -06:00
darrelmarek
07a3822d16 Added in game menu 2017-11-30 11:10:59 -06:00
darrelmarek
6d96db65a8 Instructions 2017-11-30 10:25:04 -06:00
Randall
e311d1eaf9 Merge branch 'master' into adding-sounds 2017-11-30 09:50:55 -06:00
Steven Leal
7a42e6f961 Can capture spies without breaking the game now! 2017-11-30 08:35:56 -06:00
Alexander Huddleston
e4909d9d81 Splash screen now displays properly and loads MainMenu when it's done. 2017-11-30 02:06:40 -06:00
Randall Dolifka
cfd8448087 Fixed bug with spies receiving guard notifications. 2017-11-30 00:11:21 -06:00
Randall Dolifka
794614dd13 Removed another incompletable mission. 2017-11-29 23:50:24 -06:00
Randall Dolifka
a96b17cd69 Added instructions for guards and spies, removed missions that do not exist. 2017-11-29 23:48:04 -06:00
Randall Dolifka
28c8a38a49 Literally just needed to change the name and it works. 2017-11-29 23:01:58 -06:00
Randall Dolifka
15300caa23 Changed error logging level, removed default CompleteMission. 2017-11-29 22:53:52 -06:00
Randall Dolifka
0032b3b3ba Updated text to match new font; fixed line endings again. 2017-11-29 22:49:53 -06:00
Randall Dolifka
9baa4042dc Merge branch 'master' into feature/communications 2017-11-29 22:46:06 -06:00
Randall Dolifka
f7a20035a1 Fixed score bars; fixed line endings. 2017-11-29 22:39:12 -06:00
Randall Dolifka
6b91eb1069 Added guard notification and mission log UI; now tracking missions. Things might be broken idk. 2017-11-29 22:29:40 -06:00
Darrel Marek
4a431034a0 Hooked up start and exit buttons 2017-11-27 20:27:19 -06:00
Randall Dolifka
14634378ef Fixed guard camera UIs such that status text is rendered appropriately for all cameras 2017-11-26 21:23:09 -06:00
Randall
30dff852ba Erge branch 'master-with-aesthetics' 2017-11-14 14:55:28 -06:00
Randall
d7a03d4267 Fixed indentation. 2017-11-09 14:54:12 -06:00
Randall
6d229ffbfa Merge branch 'feature/guard-screen' into master-with-aesthetics 2017-11-09 14:43:48 -06:00
Steven
edc557811f almost finished guard camera raycasting 2017-11-09 14:04:38 -06:00
darrelmarek
19356be1fe Tried to implement rummage - not quite there 2017-11-09 10:29:30 -06:00
Steven
4d871b48f8 GuardCamera Raycast works 2017-11-09 02:07:37 -06:00
Steven
aea5f6382c Merge remote-tracking branch 'origin/player-object-interactions' 2017-11-09 00:02:59 -06:00
Steven
ff0652636d created MissionObject 2017-11-08 22:34:47 -06:00
darrelmarek
c6bd926a74 Removed old levels, renamed current level, raised characters up, added bookcase 2017-11-07 15:52:38 -06:00
Randall Dolifka
fc1fdcd89c Added more notes for future work. 2017-11-05 22:07:06 -06:00
Randall Dolifka
041e4d4e08 Added preview mode for guard cameras - now they can be viewed all at once. Needs UI changes to make this more usable. 2017-11-05 22:02:03 -06:00
darrelmarek
768661517d added couch, increased navmesh offset on characters 2017-11-02 15:49:51 -05:00
darrelmarek
f711b69fd4 removed an unecessary debug log 2017-11-02 14:31:33 -05:00
darrelmarek
4df23fb3fe tweaked anim times more 2017-11-02 14:28:20 -05:00
Steven
4d9f59e3c4 init commit 2017-10-31 13:33:08 -05:00
darrelmarek
697d009656 tweaked anim times 2017-10-26 15:42:30 -05:00
darrelmarek
e17b9a4c21 Added new models ! 2017-10-24 16:05:54 -05:00
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