Commit graph

128 commits

Author SHA1 Message Date
Steven
edc557811f almost finished guard camera raycasting 2017-11-09 14:04:38 -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
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
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
697d009656 tweaked anim times 2017-10-26 15:42:30 -05:00
darrelmarek
2e44ff6a77 tweaked anims 2017-10-24 16:10:53 -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
jrdoli
2fedeebcfe Merge pull request #37 from jrdoli/feature/guard-cameras
Guard Cameras (Issue #26)
2017-10-17 15:06:05 -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
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 Leal
3acf32ea8b Merge pull request #38 from jrdoli/score-ui
Score ui
2017-10-17 14:30:30 -05:00
Steven
45dda740a0 spies trigger win animation after 3 complete missions 2017-10-17 01:39:47 -05:00
Randall Dolifka
629237a357 Updated to latest Unity I think. 2017-10-16 22:35:17 -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
Randall Dolifka
8d4ec72dda Removed VS files and updated .gitignore. 2017-10-16 17:01:40 -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 Leal
033d00d01c Merge pull request #36 from jrdoli/npc-interactions
Npc interactions
2017-10-10 12:45:34 -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
bb61bbc72d reduced collision radius 2017-10-03 15:37:45 -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