Commit graph

171 commits

Author SHA1 Message Date
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
e4c62bda74 plant's good now 2017-11-30 13:47:26 -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
Randall
e6fcb10f3f Added camera overlay, made subsequent tweaks to some panel text/opacity. 2017-11-30 11:32:39 -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
5ad32c3146 Added Spash into build, now pops up first on open. 2017-11-30 09:54:35 -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
0c07952c96 Merge branch 'master' into feature/communications 2017-11-29 23:12:25 -06:00
Randall Dolifka
5293f60c7d Merge branch 'master' into adding-sounds 2017-11-29 23:07:35 -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
shadow8t4
1d15426aa4 Changed splash image and added button sounds. 2017-11-29 19:20:54 -06:00
Alexander Huddleston
490fbcb04d I still need to change the button sounds and add a script to the splash scene, but I need to go to bed. 2017-11-28 22:52:26 -06:00
darrelmarek
cae22cb713 made everything exo 2017-11-28 15:30:48 -06:00
Alexander Huddleston
26b6dac6ea Pushing all created audio assets. 2017-11-28 02:43:52 -06:00
Darrel Marek
4a431034a0 Hooked up start and exit buttons 2017-11-27 20:27:19 -06:00
Darrel Marek
b9b59168bc Created main menu 2017-11-27 17:56:51 -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
darrelmarek
d3d8ce970c added animations including rummage 2017-11-10 09:30:13 -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
darrelmarek
ee23823e17 added couch, plants, and table; added rummaging animation 2017-11-09 10:18:58 -06:00
Steven
b90f683105 changed to working animation 2017-11-09 02:13:24 -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
c1b6fba839 exporting .blend files as .fbx files 2017-11-08 23:52:43 -06:00
Steven
ff0652636d created MissionObject 2017-11-08 22:34:47 -06:00
darrelmarek
f9542183d2 added statue 2017-11-08 15:38:37 -06:00
darrelmarek
abd676f6d8 prefab stuff i dont know 2017-11-07 15:53:28 -06:00
darrelmarek
c6bd926a74 Removed old levels, renamed current level, raised characters up, added bookcase 2017-11-07 15:52:38 -06:00