Commit graph

57 commits

Author SHA1 Message Date
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
calebp
b45d30714c Tweaked explosions and stuff. 2017-09-05 20:56:17 -05:00
calebp
3c43de1292 Merge branch 'master' into Level-Design
Probably merged conflicts appropriately.
2017-09-05 20:41:47 -05:00
calebp
926ad64a7e Merge branch 'master' into death-and-taxes
Discarded scene changes.
2017-09-05 20:38:10 -05:00
calebp
071230b9f2 Merge branch 'darrel'
Manually resolved conflicts. Discarded scene changes.
2017-09-05 20:30:22 -05:00
darrelmarek
63a6166683 Fixed camera 2017-09-05 20:15:43 -05:00
darrelmarek
e31811e4e6 Camera movement + Win condition 2017-09-05 20:11:49 -05:00
Steven
d4ed074352 rockets and explosions 2017-09-05 19:44:20 -05:00
steven2gleal
dcfe0db24e experimenting with animator 2017-09-05 17:37:56 -05:00
calebp
a48007ad24 Background Polish 2017-09-05 17:04:47 -05:00
calebp
7908220b64 Level 0 Completed 2017-09-05 16:34:26 -05:00
calebp
d04aceb7e9 More Level work 2017-09-05 15:59:38 -05:00
Randall Dolifka
ccb07b34ed Added a deathbox and saws that trigger scene reload. 2017-09-05 15:51:57 -05:00
steven2gleal
b2501927a8 init commit to movement branch 2017-09-05 15:05:59 -05:00
Shadow8t4
964a83343f ughgh 2017-09-04 17:37:09 -05:00
Shadow8t4
91c7137249 testing 2017-09-04 17:35:44 -05:00
calebp
f859439915 Explosion work 2017-09-04 16:39:17 -05:00
darrelmarek
6fb03d3296 Added prefabs for commonly used objects
Prefabs are objects that are repeated and are the same. The tiles for example should be prefabs.
2017-09-04 12:13:59 -05:00
calebp
2e0f42908c Removed auto-scroll, set up initial environment
Also added a rocket feature
2017-09-04 11:33:52 -05:00
calebp
f326d22dc1 Background work
Incomplete scripts but the tiles are in vertical alignment.  Need to push before bed so I can work on it tomorrow.  Will be testing if my laptop can run unity well enough.
2017-09-03 22:28:18 -05:00
calebp
3a91e4feb2 Background Setup
Created a camera-wide background and a duplicate and a script that I thought was going to allow for a looping background but I realized it doesn't follow player character.
2017-09-03 16:36:57 -05:00