Commit Graph

402 Commits

Author SHA1 Message Date
Melbyj1125
5b6b4a2cb9 weather wheel and weather adjustments 2022-02-28 13:42:51 -06:00
Melbyj1125
46dff8f663 doors no longer collide with frame & fixed mom hit 2022-02-25 14:56:30 -06:00
Melbyj1125
4ab94edb59 Merge branch 'MomSlide' 2022-02-23 14:00:03 -06:00
Melbyj1125
d9629ec555 lose Mom on wall and kick renetworked 2022-02-23 13:55:30 -06:00
Vladdie
b8fe8c46fe Merge branch 'whyarrowvibe' 2022-02-23 13:44:28 -06:00
Katherine
b1f254131f Merge branch 'KingMess' 2022-02-23 13:28:12 -06:00
Katherine
0655b86352 King Abilities/Radial Menu bugfixes
>Radial Menu has been bugfixed so the players have a harder time
breaking things
>King abilities have had some repeated code moved into a seperate class
2022-02-23 13:18:54 -06:00
29f663d982 Merge branch 'despawnGatesKick' 2022-02-23 13:07:59 -06:00
966c85c646 Made gates despawn after being kicked and timer 2022-02-23 13:06:24 -06:00
Vincent Wheat
2b281864b0 Update Game-Mountain.unity
-Added floor tags
2022-02-23 12:53:18 -06:00
Melbyj1125
b9a573a97d fixed an interaction between slide and fall 2022-02-23 07:57:18 -06:00
Melbyj1125
65a7008d24 slide no longer rotates player
this means that currently the model doesn't rotate but that will be
rectified once we have the animations
2022-02-23 00:00:43 -06:00
Vincent Wheat
c455af3fc3 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-02-21 14:42:27 -06:00
Vincent Wheat
88157e15da Merge branch 'FoothillObstacles' 2022-02-21 14:42:08 -06:00
Vincent Wheat
34164f7a03 Adjustments to Scene
-Adjusted Game-Mountain
-Added King head and prefab
2022-02-21 14:40:08 -06:00
Melbyj1125
5b18d2845c Merge branch 'melbySprint8' 2022-02-21 14:39:21 -06:00
Melbyj1125
d9793a73db fixed gate hitbox issue 2022-02-21 14:38:33 -06:00
Evan Nydahl
80ef5b3cda Merge branch 'popUp' into main 2022-02-21 13:32:22 -06:00
Evan Nydahl
1e9c91b332 Asset updates
-Added popup prefab
-Added abstract script for interactables
2022-02-21 13:26:17 -06:00
Melbyj1125
66a4cd3c2d Merge branch 'minorMelbyAdjustments' 2022-02-21 12:33:44 -06:00
Melbyj1125
671a01cc16 fixed respawn and knockback respawn 2022-02-21 12:23:43 -06:00
Vincent Wheat
5c0497be88 Crumbling Platform
-Crumbling platform was added
-Minor fixes and improvement to level
-Added folders for WIP foothills obstacle sections
2022-02-21 12:08:32 -06:00
Vincent Wheat
7f5527e28b Added weather wheel to scene 2022-02-18 14:13:40 -06:00
Vincent Wheat
bbd6a5231f Merge branch 'FoothillGuts' 2022-02-18 14:10:39 -06:00
Vincent Wheat
40d6025490 Added Crumbling Platform
-Added crumbling platform script
-updated game mountain scene
2022-02-18 14:09:33 -06:00
9177b6106d Merge branch 'WeatherWheel' 2022-02-18 14:08:34 -06:00
fe766cc4c3 Added the base for Weather Wheel
- Each thing stubbed out
2022-02-18 14:06:24 -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
Katherine
de49e97f3f Radial Menu
>Radial Menu has been bugfixed and updated
>Clicking a button hides the menu
>Player can cancel placing something
2022-02-18 12:00:47 -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
Vladdie
9cdc30f970 Temp Commit 2022-02-16 13:03:01 -06:00
Katherine
640afc25c3 King Menu
>Radial menu has been added in a rough state
>Can be turned on and off
2022-02-16 13:02:16 -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