Commit graph

177 commits

Author SHA1 Message Date
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
055359cce4 fixed build settings 2017-09-28 14:26:40 -05:00
shadow8t4
cf89b86cdd I fixed the music loop. 2017-09-28 14:21:48 -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 Leal
85a8105707 Merge pull request #30 from jrdoli/lobby_manager_update
Lobby manager update
2017-09-28 02:45:23 -05:00
Steven
d5772a143d fixed spy's icon during gameplay 2017-09-28 02:35:03 -05:00
Steven
7945783e6b only connects to US server now 2017-09-28 02:07:40 -05:00
Steven
dac5b13d03 changed network preferences 2017-09-28 01:49:52 -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
darrelmarek
55fbca507a Navmesh stuff + Server settings 2017-09-26 15:24:16 -05:00
darrelmarek
7181b495ab photon server settings 2017-09-21 15:41:32 -05:00
darrelmarek
f73d503c9d Tweaked movement
NPCs were getting kinda stuck so I made their hitboxes smaller and made movement a little more natural
2017-09-21 10:16:49 -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
cf7826fd88 Merge branch 'master' into darrel 2017-09-14 15:01:12 -05:00
Darrel Marek
62752bb068 Merge + Squash My Changes (#18)
* Added base project for Project Undercover

* gitignore added

* Fixing things 1

* new gitignore

* Fixing things 2

Added project undercover back

* Mouse implementation 1
2017-09-14 15:00:36 -05:00
darrelmarek
43d366b7e5 Merge branch 'master' into darrel 2017-09-14 14:59:15 -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
df4f3749f5 new gitignore 2017-09-13 12:39:46 -05:00
darrelmarek
a04e2dfd20 Fixing things 1 2017-09-13 12:35:43 -05:00
darrelmarek
5afd113d05 gitignore added 2017-09-13 11:39:26 -05:00
darrelmarek
f2aadd2b7b Added base project for Project Undercover 2017-09-13 11:21:50 -05:00
steven2gleal
b01c146481 fixed shooting rockets when dead 2017-09-07 14:21:58 -05:00
darrelmarek
80217db197 Forgot this 2017-09-07 12:00:43 -05:00
darrelmarek
f2185b3033 Added main menu 2017-09-07 11:58:40 -05:00
darrelmarek
e30b3fdf69 Lowered musicvolume + tweaked reload time 2017-09-07 10:18:05 -05:00
Randall Dolifka
128b0a2489 Merged changes, added music to Level1. 2017-09-07 10:05:51 -05:00
Randall Dolifka
5e22ab82c1 Merge branch 'darrel' into randall-music 2017-09-07 10:02:05 -05:00
Randall Dolifka
7f967feb8b Forgot to save scene. 2017-09-07 10:01:50 -05:00
Randall Dolifka
2a2fc537df Added music, changed how death works. 2017-09-07 10:01:19 -05:00
darrelmarek
4d7cfd5887 Tweaked Level1 2017-09-07 09:57:38 -05:00
darrelmarek
009d0d196a Tweaked mechanics
Added a little friction and made the player less floaty
2017-09-07 08:22:59 -05:00
Steven
8883d48c3b added music and explosion sound 2017-09-07 02:06:06 -05:00
Steven
f5533407b9 Lots of changes 2017-09-07 00:50:49 -05:00
calebp
312afd0cae Bounding Issue
I actually caught another bounding bug after declaring the issue closed.  Shouldn't affect anything.
2017-09-06 14:15:15 -05:00
calebp
fb0e1596d7 Everyone tweaked stuff kinda. 2017-09-05 21:06:46 -05:00