Commit graph

71 commits

Author SHA1 Message Date
Steven Leal
ba6f0e539f sweet interaction ui changes and mission updates 2017-11-30 12:07:05 -06:00
Steven Leal
7a42e6f961 Can capture spies without breaking the game now! 2017-11-30 08:35:56 -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
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
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
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
ee23823e17 added couch, plants, and table; added rummaging animation 2017-11-09 10:18:58 -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
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
shadow8t4
5363fd1c04 Updated TEST scene. 2017-10-31 15:07:41 -05:00
shadow8t4
dea0fe39e1 Added updated music. 2017-10-31 15:06:23 -05:00
Steven
4d9f59e3c4 init commit 2017-10-31 13:33:08 -05:00
darrelmarek
e17b9a4c21 Added new models ! 2017-10-24 16:05:54 -05:00
darrelmarek
e194ed24a9 more stuff 2017-10-24 14:29:07 -05:00
Darrel Marek
2e1c5e8444 not sure 2017-10-24 00:48:53 -05:00
Darrel Marek
8a25f18aeb even newer level.. (TEST) 2017-10-23 23:36:30 -05:00
darrelmarek
f53e6e309b lighting stuff.. 2017-10-23 16:20:40 -05:00
darrelmarek
bcabda17c4 Added base walls 2017-10-23 09:48:18 -05:00
darrelmarek
4f10820d5e Duplicated old level
works !
2017-10-23 08:26:23 -05:00
Randall
d188c3c08f Removed old guard test scene. No longer needed. 2017-10-17 15:05:16 -05:00
Randall
d68981698f Finished merging changes into combined test scene. 2017-10-17 15:04:31 -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
21397a8ee4 character interactions are good yo 2017-10-10 12:43:11 -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
b48c5c1f49 fixed glow script 2017-10-03 13:36:57 -05:00
Steven
3c72f37ac6 updated characters 2017-10-03 04:15:13 -05:00