Commit graph

48 commits

Author SHA1 Message Date
darrelmarek
4df23fb3fe tweaked anim times more 2017-11-02 14:28:20 -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
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
e518a5d87f spys and npcs change colors again 2017-10-13 19:34:01 -05:00
Leal
f284cf88eb removed extraneous options list 2017-10-12 14:48:42 -05:00
steven2gleal
3867e5166b fixed value 2017-10-10 14:26:28 -05:00
Steven
21397a8ee4 character interactions are good yo 2017-10-10 12:43:11 -05:00
Steven
c2d8c78028 work in progress 2017-10-09 18:55:07 -05:00
Steven
2a3c2839d5 basics for interactions are now very stable 2017-10-09 02:03:39 -05:00
Steven
ed145ddc56 stabilized character interactions 2017-10-08 18:37:19 -05:00
Steven
6a72fda395 removed extraneous debug statements 2017-10-05 13:53:29 -05:00
Steven
a3658418a2 fixed progress bar starting at non zero value after 1st use 2017-10-05 13:00:09 -05:00
Steven
1f4855712a synced up npc communication, still need to fix spy to spy communication 2017-10-05 03:13:27 -05:00
steven2gleal
6384117110 reduced collision radius 2017-10-03 15:32:45 -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
darrelmarek
f791fb4688 Added 'new' keyword back
unity versions...
2017-09-28 14:56:54 -05:00
darrelmarek
573da23984 Fixed CameraOcclusionProtector warning
removed unnecessary 'new' keyword
2017-09-28 14:32:53 -05:00
steven2gleal
d649e64d77 fixed guards in text 2017-09-28 13:36:17 -05:00
steven2gleal
4860caa9ff Merge branch 'feature/info-ui' 2017-09-28 13:25:20 -05:00
Steven
d5772a143d fixed spy's icon during gameplay 2017-09-28 02:35:03 -05:00
Steven
80ad880d65 room selector for lobby added 2017-09-28 01:42:24 -05:00
Steven
aa85cea860 improving lobby 2017-09-28 01:17:01 -05:00
Steven
93c5aae93d loading scene 2017-09-27 23:59:33 -05:00
Steven
2bcee7add8 agent removed 2017-09-27 23:56:52 -05:00
Steven
ef859cbd0d testing network instantiation of npcs 2017-09-27 23:40:27 -05:00
Randall Dolifka
a1345ee929 Added info UI component for each player type. 2017-09-27 21:30:57 -05:00
darrelmarek
283ebf3956 small tweaks 2017-09-26 16:44:11 -05:00
darrelmarek
8e1a969a8c Fixed getrandomlocation 2017-09-26 16:27:21 -05:00
darrelmarek
72a61792f0 Networked instantiate
npcs
2017-09-26 16:07:13 -05:00
Steven
fc808f7608 added laser sights and better loading 2017-09-21 06:48:52 -05:00
Steven
d08eb2bb7d added networking, win conditions, missions, guards, and music 2017-09-21 04:59:13 -05:00
darrelmarek
c622cc2b97 Random colors for NPC and player + Added a wall 2017-09-18 15:04:18 -05:00
darrelmarek
810d76520c AI now uses NavMesh + tweaks 2017-09-18 12:43:50 -05:00
darrelmarek
62d26f586c Added basic guard camera, spy camera, and right-click-to-move 2017-09-18 11:10:49 -05:00
darrelmarek
a0312d35ca Mouse implementation 1 2017-09-13 17:29:22 -05:00
darrelmarek
7bc8fffdd0 Fixing things 2
Added project undercover back
2017-09-13 12:40:42 -05:00
darrelmarek
a04e2dfd20 Fixing things 1 2017-09-13 12:35:43 -05:00
darrelmarek
f2aadd2b7b Added base project for Project Undercover 2017-09-13 11:21:50 -05:00