Commit Graph

370 Commits

Author SHA1 Message Date
Melbyj1125
671a01cc16 fixed respawn and knockback respawn 2022-02-21 12:23:43 -06:00
Melbyj1125
39616f29ff Merge branch 'melbyBFC' 2022-02-18 14:00:01 -06:00
Melbyj1125
167f7840a0 created a debug prefab 2022-02-18 13:56:10 -06:00
Vincent Wheat
0a59ac5b59 Added Pause Menu to Game-Mountain 2022-02-18 13:32:06 -06:00
Vincent Wheat
89f93b98b0 Merge branch 'KillzoneRefinery' 2022-02-18 13:28:32 -06:00
Vincent Wheat
0c5b83a5c1 Update to Game-Mountain
-Added Grappling Hook Point prefab
-Added Pitfalls to foothills
-Finished grass in plains
-Added grappling hook points to mountain
2022-02-18 13:25:21 -06:00
Melbyj1125
820b11dd61 Did some bugfixing and commented on everything 2022-02-17 20:55:23 -06:00
9aa31d9cd7 Added the files for the MLAPI Relay Server
- This version of the server is modified from the other open sourced one
  on GitHub as we ignore the port when attempting to connect.
  Program.cs is modified as such
2022-02-17 14:13:58 -06:00
011ba5cba1 Implemented a Local Pause Menu with Options For Controls/Quitting
- Actually displaying text with the controls on it needs to be added but
  there is a placeholder for it.
2022-02-17 14:01:17 -06:00
aff8e3fbcc Added Toggle Option to Use the MLAPI Relay
- Also cleaned up and merged title screen files into a single class
2022-02-16 23:48:56 -06:00
Melbyj1125
e74a1c61c0 adjusted anything that refered to playerMovement 2022-02-16 16:44:30 -06:00
Melbyj1125
f0936f4cee State machine player is networked
small cleanups are still needed
2022-02-16 14:21:34 -06:00
Vincent Wheat
9f8c8852ce Updated Game-Mountain
-Added billboarding grass partially to planes
-Updated prefabs and preloader prefabs
-Resculpted pits into foothills
-Added last bit of invisible walls and killzones into foothills
2022-02-16 14:17:10 -06:00
Melbyj1125
dfd1687224 updated network behaviour spelling 2022-02-16 13:25:20 -06:00
Melbyj1125
32b0bf7154 added network behavior tags to state managers 2022-02-16 13:21:32 -06:00
Melbyj1125
87594614d5 Merge branch 'sprintActual2Melby' 2022-02-16 13:13:21 -06:00
Melbyj1125
ab3598eee4 added some comments 2022-02-16 12:31:11 -06:00
Melbyj1125
3ff60a830a bug with crouch fixed 2022-02-16 00:18:44 -06:00
Melbyj1125
095fe0a9cb Everything is StateMachined just bugtesting 2022-02-16 00:13:12 -06:00
Melbyj1125
ccbcbab71f Nitro has been State Machined 2022-02-15 23:05:05 -06:00
Melbyj1125
e2438dc364 Finished State Machining Dash 2022-02-15 22:33:26 -06:00
Melbyj1125
f580be178a Setup all the files so they can be state machined 2022-02-15 21:37:49 -06:00
Melbyj1125
833183d034 Finished the Movement and Aerial groups
Working on the Dash, Nitro, and offense groups now
2022-02-15 21:19:12 -06:00
Melbyj1125
ba3ac228f7 cant slide when falling 2022-02-14 13:11:05 -06:00
Melbyj1125
fc525861d4 added slide check functionality for certain functions 2022-02-14 12:55:36 -06:00
Melbyj1125
e1cf0bb094 Have a lot of the basic movement in the stateMachine
Will need to finish up and implement some of the ragdoll interactions
2022-02-14 00:32:37 -06:00
Vincent Wheat
f808e1e63a Update Game-Mountain.unity
-Turned off invisible wall visibility
-More forgiving respawn zones on the mountain
2022-02-11 14:11:25 -06:00
Vincent Wheat
0e3a8b54e9 Update Game-Mountain.unity
-Midway vertical platform adjusted
2022-02-11 13:16:35 -06:00
Melbyj1125
6f0b3a0d0b Debug Scripts have been cleaned up.
I won't apply this cleanup to the networked version yet because they
will be updated to a state machine anyways.
2022-02-10 21:37:19 -06:00
Vincent Wheat
338a74cd14 Update Game-Mountain.unity
-Added Foothill killzones... too many
2022-02-10 20:44:32 -06:00
Vincent Wheat
1803e97f70 Updates
-Updated Boulder prefab
-Startup Scene tweaked to feature new boulder
-Renamed old boulder prefab to BoulderDeprecated
-Finished adding invisible walls to Game-Mountain
-Updated preloader with new boulder prefab
2022-02-10 14:30:12 -06:00
Vincent Wheat
c8a50510c3 Merge branch 'MountainRefine' 2022-02-09 14:06:38 -06:00
Vincent Wheat
7775ce59fb Update Game-Mountain.unity
Added more invisible walls
2022-02-09 14:04:50 -06:00
Evan Nydahl
9ab8ee17fb Added KR_StartupScene 2022-02-09 14:01:25 -06:00
Evan Nydahl
a3b42bf2b7 Merge branch 'tetzUIComments' into main 2022-02-09 13:52:50 -06:00
Evan Nydahl
6cd3024767 General changes
1. Added tetzlaff ui changes (code may need to be shortened)
2022-02-09 13:51:06 -06:00
Vincent Wheat
c972ea3159 Update Game-Mountain Scene
-Added Invisible Walls to mountain, foothills
-Restructured vertical section at foot of mountain
-Resculpted and repainted some portions of foothills for better level flow
2022-02-09 12:02:43 -06:00
1f3f91ca17 Added Checks to See Who Quits Early and If We Need to Stop Early 2022-02-08 12:21:43 -06:00
Melbyj1125
8fbedf486d made dash use R button 2022-02-07 18:10:32 -06:00
Melbyj1125
fff8f4f17e Merge branch 'sprintV7Melby' 2022-02-07 15:44:29 -06:00
Vincent Wheat
045b26d3c5 Tag Fixes
Tagged Gate Doors as kickable
2022-02-07 14:39:18 -06:00
Vincent Wheat
21e280aa96 Merge branch 'MountainPath' 2022-02-07 14:36:37 -06:00
Vincent Wheat
a09e513076 Gate prefab updates, net manager updates
-Game mountain added level
-added gate model
2022-02-07 14:34:54 -06:00
9c15b44b6f Potential Fix for Kick 2022-02-07 12:16:58 -06:00
Melbyj1125
df02d905b3 Updated player prefabs and non debug scripts
I did remember to uncomment if(!isLocalPlayer) thing
2022-02-07 08:24:07 -06:00
Melbyj1125
574b1d9431 player can grab the grapple farther than the max
it will pull player in after they grab on
2022-02-06 21:38:13 -06:00
b278e511ff Fixed Blocks Not Placing For Clients 2022-02-04 20:02:55 -06:00
Melbyj1125
0188b9aa17 grapple is more consistent and has a better momentum fall off on release 2022-02-04 19:54:14 -06:00
215d709915 Merge branch 'ElRedDeLaReyDos' 2022-02-04 19:26:37 -06:00
91c420490a Boxes spawn from king placing 2022-02-04 19:25:53 -06:00