185 Commits

Author	SHA1	Message	Date
Evan Nydahl	38e01ac1e5	Edited UI functions for functionallity in network ... -Added popups to map	2022-03-11 15:10:48 -06:00
Evan Nydahl	51056bc3d5	Refactored ui code to work with new state base player	2022-03-09 13:52:34 -06:00
Melbyj1125	7ae4b643a1	Fixed a lot of the issues we addressed on Monday	2022-03-09 02:16:56 -06:00
Evan Nydahl	03a96b8c67	Merge branch 'fixAnimator' into main	2022-03-07 14:13:20 -06:00
Evan Nydahl	ee02e1eb59	Added animator to no debug	2022-03-07 14:10:49 -06:00
Melbyj1125	ad6df78c0e	Merge branch 'main' of https://github.com/Lautha1/TheKingsRace	2022-03-07 12:05:43 -06:00
Melbyj1125	b9ff40688b	Changes to debug and state machine	2022-03-07 12:02:37 -06:00
Evan Nydahl	ab552e5467	Merge branch 'animationController' into main	2022-03-07 11:26:13 -06:00
Evan Nydahl	d2f75987e8	Animation Controller ... -Added rough animator diagram--needs more work -Added a animator manager script to handle animation priority	2022-03-07 11:23:17 -06:00
Melbyj1125	71d7a84725	can kick other players but there is a problem ... Recovering from ragdoll has problems & host can't kick others for some reason	2022-03-02 15:08:49 -06:00
Melbyj1125	141c2f3d32	Merge branch 'GrappleBroad'	2022-03-02 14:17:49 -06:00
Melbyj1125	48bdf66fc6	player shouldn't kick themselves	2022-03-02 14:17:14 -06:00
Melbyj1125	9b9e847ba9	modified debug kick	2022-03-02 14:12:35 -06:00
Julia Butenhoff	4724c80146	Finished and Fixed the Reset Button	2022-03-02 14:11:15 -06:00
Melbyj1125	d0f27de496	should be able to kick player?	2022-03-02 13:56:24 -06:00
Melbyj1125	a6be528388	Merge branch 'WeatherPause'	2022-03-02 12:58:58 -06:00
Melbyj1125	741dae95cd	weather and pause functionality implemented	2022-03-02 12:56:22 -06:00
Melbyj1125	00c3495461	pause disables inputs instead of scripts	2022-03-01 19:53:23 -06:00
Melbyj1125	0ef78f3eb5	wind should work rn	2022-03-01 17:46:50 -06:00
Melbyj1125	a47ee0c406	started modifying wind	2022-02-28 15:19:19 -06:00
Julia Butenhoff	ad30ba0140	Merge branch 'ResetButton'	2022-02-28 14:07:46 -06:00
Julia Butenhoff	3f51b34aec	Added a Button to Reset to Last Checkpoint ... - Unable to test to verify if it works until the Respawn Positions are in the game scene	2022-02-28 14:03:46 -06:00
Melbyj1125	b80aea96fd	updated weather values	2022-02-28 13:44:20 -06:00
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	d9629ec555	lose Mom on wall and kick renetworked	2022-02-23 13:55:30 -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
Melbyj1125	167f7840a0	created a debug prefab	2022-02-18 13:56:10 -06:00
Melbyj1125	820b11dd61	Did some bugfixing and commented on everything	2022-02-17 20:55:23 -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
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
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
Evan Nydahl	6cd3024767	General changes ... 1. Added tetzlaff ui changes (code may need to be shortened)	2022-02-09 13:51:06 -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
Julia Butenhoff	9c15b44b6f	Potential Fix for Kick	2022-02-07 12:16:58 -06:00