Commit Graph

246 Commits

Author SHA1 Message Date
Melby
b2841aa4b9 Fixed Null Ref & Rain Issue 2022-05-01 14:59:57 -05:00
Kazinski
1999509b47 Audio input here 2022-05-01 14:44:17 -05:00
Vladdie
36d9c98a2b 50% audio implement 2022-05-01 06:46:35 -05:00
Vladdie
3a2896a2a7 Merge branch 'playerAudio' 2022-05-01 03:00:52 -05:00
Vladdie
a4cf3b3623 audio on jumps 2022-05-01 02:58:44 -05:00
Melbyj1125
08049acaae updated king visuals 2022-05-01 02:24:15 -05:00
Melbyj1125
2bba6bbaa6 Merge branch 'ActuallyMoveGrapple' 2022-05-01 00:04:47 -05:00
Melbyj1125
8e3dfdb9c2 glider rotates and new cursor 2022-05-01 00:02:51 -05:00
Vladdie
e672bbd20d changes to arrow 2022-04-30 14:03:59 -05:00
Vladdie
e960e7fce9 updates to archer/ui buttons 2022-04-29 20:04:09 -05:00
Vladdie
0896918100 hate sound. fuck 2022-04-29 16:42:05 -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
Melbyj1125
3c48f2d123 no more fuzzy text 2022-04-29 14:53:40 -05:00
Vladdie
6038fc26b0 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-04-29 14:35:49 -05:00
Melbyj1125
ffe51831d8 fixed issue I caused 2022-04-29 14:23:58 -05:00
Melbyj1125
678dacf0e5 modified hook and adding testing 2022-04-29 03:23:24 -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
c1e4dd2f00 Merge branch 'audio3' 2022-04-27 20:11:17 -05:00
Vladdie
a6ded77edb audio merge. 2022-04-27 20:03:39 -05:00
Evan Nydahl
c500bf2649 Merge branch 'controllerKing' into main 2022-04-27 19:57:13 -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
574288ff8c slight lobby adjustment 2022-04-27 19:15:08 -05:00
Melbyj1125
ae7116c1aa in bed with the goblin 2022-04-27 18:59:46 -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
Melbyj1125
6560a303d5 Grapple Finally Feels Satisfactory 2022-04-27 01:42:29 -05:00
Melbyj1125
c5bbdd1c77 small adjustments 2022-04-27 00:44:18 -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
Melbyj1125
1910501020 Added body parts to networked player 2022-04-25 02:05:18 -05:00
Evan Nydahl
e687d91f6e Merge branch 'optionsMenu' into main 2022-04-22 18:02:34 -05:00
Evan Nydahl
7a94d5d9a1 Added Additional logic to controls menu
-players can no longer leave with same keys and if
they do they will be set to default
-Added some additional changes to animator
2022-04-22 18:00:20 -05:00
Melbyj1125
71a58caee3 updated timer 2022-04-22 17:13:57 -05:00
Melbyj1125
d32cb2a834 Modified Controls Screen 2022-04-22 14:52:41 -05:00
Melbyj1125
7cdf2fc77b Adjusted Pause Menu 2022-04-22 03:39:29 -05:00
Melbyj1125
75871253aa finished visuals on most intro scenes 2022-04-22 02:59:41 -05:00
Melbyj1125
ce866c446a Merge branch 'Peema' 2022-04-22 01:06:17 -05:00
Melbyj1125
3c9790fed0 added all UI elements in Lobby & updated Credits 2022-04-22 01:03:56 -05:00
Melbyj1125
c7f1461787 updated controls in lobby 2022-04-21 22:07:10 -05:00
Evan Nydahl
251258fae3 Fixed NetworkedSMPRunners highlight dimensions 2022-04-21 21:46:20 -05:00
Evan Nydahl
e582e23ed2 Merge branch 'bindKeys' into main 2022-04-21 21:37:47 -05:00
Evan Nydahl
40bf057c67 Finished reBindable Keys
-created a GameManager script to hold keycode values
(will need to be added to preloader)
-created a Controls Menu Script (turns off and on gameobjects
depending if mouse/controler being used)
-created RebindKeys manager to handle key rebinds in controls menu
2022-04-21 21:32:33 -05:00