Commit Graph

476 Commits

Author SHA1 Message Date
Vincent Wheat
72ed4e2cd9 Postgame updates
Added models to post game scene
2022-04-27 16:20:39 -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
Katherine
368a2f4a6a King Hail
>Hail has a marker now
>It dynamically scales
2022-04-22 18:48:47 -05:00
Evan Nydahl
ce836bd08a Merge branch 'fixedS' into main 2022-04-22 18:26:49 -05:00
Evan Nydahl
2d5fed72ef Changed Networked cooldown script to be same one as debug cooldown 2022-04-22 18:25:54 -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
Katherine
f98bc54182 King Art
>Added Mitch's Goo and Bumper to the game
>Added Kong's Blue Slime
>Make the sime's eyes properly move to the correct direction
2022-04-22 13:02:33 -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
26dc9d1af6 Merge branch 'LobbyUIFixing' 2022-04-20 13:23:37 -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
Evan Nydahl
027fdc0dcb Merge branch 'changeRunnerUI' into main 2022-04-19 13:44:28 -05:00
Melbyj1125
5900708638 Merge branch 'AddingUIAssets' 2022-04-19 13:41:52 -05:00
Evan Nydahl
228e81daa9 Moved layout of runnerUI 2022-04-19 13:41:28 -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
a9a444a143 Fixed Kicked Blocks Not Despawning On Network 2022-04-17 01:26:55 -05:00
522ff7ceb2 Fixed Persisting of Objects Past Game (COMPLETED) 2022-04-17 00:58:55 -05:00
ae29ef3021 Apply Potential Fix to Persisting Objects Post Game 2022-04-17 00:17:14 -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
889cc1ae2b Fixed another archer null reference 2022-04-16 21:05:22 -05:00
Melbyj1125
42f6910e1f Created offset arrays 2022-04-16 19:18:32 -05:00