Commit Graph

101 Commits

Author SHA1 Message Date
Melbyj1125
7f0b3d1269 Hopefully fixed audio issues fixed credits & title 2022-05-05 22:39:55 -05:00
Kazinski
1b84ca68e1 Pain and suffering, need Evan. Audio added to POST/anim 2022-05-02 00:14:24 -05:00
Kazinski
97dd7735dd added ambient/jingles for weather. Fixed kingbumper 2022-05-01 16:56:29 -05:00
Melby
b2841aa4b9 Fixed Null Ref & Rain Issue 2022-05-01 14:59:57 -05:00
Melby
5455baed90 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-05-01 14:49:53 -05:00
Melby
e109cedfe4 Adjusted Glider Slightly 2022-05-01 14:47:08 -05:00
Kazinski
1999509b47 Audio input here 2022-05-01 14:44:17 -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
b021db4338 Fixed Weather to Utilize Multiple Partice Systems 2022-04-30 22:38:38 -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
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
b0fb0f9e09 ReAssigned Controller and added colliders for controller in pasue menu 2022-04-27 19:52:01 -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
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
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
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
2a780ac346 Networked Player Model Body Swapping 2022-04-25 13:35:31 -05:00
34601c58b2 Merge branch 'PausePitfallFix' 2022-04-22 18:22:54 -05:00
db8b95f710 Fixed Control Lock If Hit a Pitfall While Paused
- Also fixed a minor bug where you could refresh the IP if you weren't
  the host
2022-04-22 18:22:07 -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
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
559daec916 Fixed Bug with Non-Updating Player Cards? 2022-04-20 14:05:27 -05:00
2da01812ab IP Address can be refreshed if Network Error 2022-04-20 13:32:33 -05:00
Melbyj1125
abf0c7b8fd More UI stuff Bro I don't remember Ui hell rn 2022-04-20 02:34:25 -05:00
Melbyj1125
7791d79d18 Updated a lot of text to tmp and updated title 2022-04-19 23:53:18 -05:00
Melbyj1125
df99abcba7 added a bit of cost clarity 2022-04-18 22:58:26 -05:00
Melbyj1125
5144783b24 fixed button issue and reassigned body parts 2022-04-17 02:05:56 -05:00
Melbyj1125
e3a1e3ac43 Merge branch 'LobbyUIAdding' 2022-04-16 21:13:08 -05:00
Melbyj1125
7968c5af29 Lobby Images Appear in Correct Position 2022-04-16 21:05:48 -05:00