Commit Graph

509 Commits

Author SHA1 Message Date
Evan Nydahl
11c0408dbc Fixed typo in animationManager (used dWallRun) 2022-05-01 16:23:46 -05:00
Evan Nydahl
9fc03ab00f Put fall animation on network 2022-04-29 17:05:22 -05:00
Evan Nydahl
18d090e562 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2022-04-29 16:59:00 -05:00
Evan Nydahl
2c9f5ad6ce Revert King Back To non controller 2022-04-29 16:58:35 -05:00
Vladdie
a1f833f7a9 Merge branch 'suffering' 2022-04-29 16:54:03 -05:00
Vladdie
0896918100 hate sound. fuck 2022-04-29 16:42:05 -05:00
Evan Nydahl
b9045356d4 Falling animations 2022-04-29 16:29:01 -05:00
Evan Nydahl
471ae3ef87 Merge branch 'finalController' into main 2022-04-29 14:59:33 -05:00
Evan Nydahl
56c64dfac4 Animation edits 2022-04-29 14:56:49 -05:00
Vladdie
6038fc26b0 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-04-29 14:35:49 -05:00
Vincent Wheat
cd4624a600 Update BoulderSpawn.cs
Refactored BoulderSpawn
2022-04-29 12:13:03 -05:00
Melbyj1125
678dacf0e5 modified hook and adding testing 2022-04-29 03:23:24 -05:00
Vladdie
c9a4757e3c Merge branch 'help' 2022-04-28 23:56:33 -05:00
Vladdie
058729edb8 button noises 2022-04-28 23:53:47 -05:00
Melbyj1125
f44774f92f the hover text modifies with replaced buttons 2022-04-28 00:47:39 -05:00
Melbyj1125
be3177ef8e lobby scene buttons update 2022-04-27 23:35:14 -05:00
Melbyj1125
f1278f55bb fixed bodyswapping issue 2022-04-27 22:28:42 -05:00
Vladdie
d7747c64fb Merge branch 'main' of https://github.com/Lautha1/TheKingsRace
Merging in Audio?
2022-04-27 20:04:26 -05:00
Evan Nydahl
c500bf2649 Merge branch 'controllerKing' into main 2022-04-27 19:57:13 -05:00
Vladdie
94104e2d6d Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-04-27 19:54:18 -05:00
Evan Nydahl
b0fb0f9e09 ReAssigned Controller and added colliders for controller in pasue menu 2022-04-27 19:52:01 -05:00
Katherine
f5e071c125 Merge branch 'KingAllensZoom' 2022-04-27 19:28:37 -05:00
Katherine
dc5feb6eff King Zoom Functionality
>The King can now zoom
>UI follows them in
>Then can rotate their Veiw up and down
2022-04-27 19:24:31 -05:00
Melbyj1125
911707f761 Merge branch 'RebindingControls' 2022-04-27 19:00:53 -05:00
Melbyj1125
ae7116c1aa in bed with the goblin 2022-04-27 18:59:46 -05:00
Evan Nydahl
030cd225bf Merge dAerialScript 2022-04-27 18:54:24 -05:00
Evan Nydahl
2907c3f3eb Merge branch 'animations4' into main 2022-04-27 18:52:05 -05:00
Evan Nydahl
6856a88702 Fine tuned animations 2022-04-27 18:49:42 -05:00
Vladdie
362e35c86f Merge branch 'audioPAIN' 2022-04-27 18:33:31 -05:00
Vladdie
13d334962d added audio to button hover/press in Lobby 2022-04-27 17:50:30 -05:00
Vincent Wheat
33a20e03bb Fixed Spawning In Scene
Fixed spawn locations on the new platform
Increased rotate spin speed
Moved spawn platform
Made spin bumpers triggers
2022-04-27 17:14:30 -05:00
Melbyj1125
e6c72e305f Merge branch 'OptionsControlsUI' 2022-04-27 16:21:49 -05:00
Vincent Wheat
72ed4e2cd9 Postgame updates
Added models to post game scene
2022-04-27 16:20:39 -05:00
Melbyj1125
ecc0ea7e00 Idk what Ive done 2022-04-27 16:14:09 -05:00
Katherine
534661973a Merge branch 'IfitsbrokeYellatKateFlowchat' 2022-04-27 13:01:56 -05:00
Katherine
029f4a1e52 King Zoom
>File added
>Nothing in it, just a placeholder to push onto main
2022-04-27 12:59:26 -05:00
Melbyj1125
28cabc7fd6 Merge branch 'GrappleWasAMistake' 2022-04-27 12:58:51 -05:00
Evan Nydahl
3ebde4266d Merge branch 'runnerUI3' into main 2022-04-27 12:44:19 -05:00
Evan Nydahl
ffbd9a3a7a Made some changes to GameManager and controls scene (and added some
animations)
2022-04-27 12:41:52 -05:00
Katherine
8414113717 Slime Float Fixed
>Slime turns around when it gets to the end of ground
>The slime is fully put together
>It needs bugfixing and testing, but all the pieces are there
2022-04-27 10:15:50 -05:00
Melbyj1125
48289a5d60 Updated networked Grapple 2022-04-27 01:44:38 -05:00
Melbyj1125
6560a303d5 Grapple Finally Feels Satisfactory 2022-04-27 01:42:29 -05:00
Melbyj1125
f83d22eab8 bug fixes 2022-04-27 00:37:38 -05:00
Melbyj1125
16a02b2332 updated networked grapple 2022-04-25 15:24:35 -05:00
Melbyj1125
e072f3e181 Fixed Grapple Momentum & Added swappable buttons 2022-04-25 14:18:41 -05:00
7515fc15d8 Possible Fix to Pause Menu Enable Desync 2022-04-25 13:36:49 -05:00
2a780ac346 Networked Player Model Body Swapping 2022-04-25 13:35:31 -05:00
41a7908cd0 Merge branch 'NetworkModel' 2022-04-25 12:19:43 -05:00
431667ea67 Add initial file for Networking Model 2022-04-25 12:16:00 -05:00
Melbyj1125
1910501020 Added body parts to networked player 2022-04-25 02:05:18 -05:00