Commit Graph

640 Commits

Author SHA1 Message Date
Melbyj1125
1910501020 Added body parts to networked player 2022-04-25 02:05:18 -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
Vincent Wheat
9edf343fe1 Updated Game Mountain
Added more popsicle fences
2022-04-22 16:43:51 -05:00
Evan Nydahl
0f6673c247 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2022-04-22 15:05:23 -05:00
Melbyj1125
440b94af8c Saved Controls 2022-04-22 15:04:38 -05:00
Evan Nydahl
4b625d2000 Merge branch 'animationFix2' into main 2022-04-22 15:03:08 -05:00
Evan Nydahl
db1c8b5740 Added highlight ref to cool down script in NetSMP 2022-04-22 15:02:39 -05:00
Evan Nydahl
2453723138 Made some edits to player model
-have to have animation use this model each
-edited ui for player abillity box
2022-04-22 14:59:59 -05:00
Melbyj1125
a39ce2ef3c Merge branch 'BobaFettsBrother' 2022-04-22 14:53:26 -05:00
Melbyj1125
d32cb2a834 Modified Controls Screen 2022-04-22 14:52:41 -05:00
Vincent Wheat
22e15d9293 Updates to Game Mountain
-Retagged reset zones
-Added more picket fences
2022-04-22 14:12:30 -05:00
Vincent Wheat
27eed68e54 Merge branch 'POOP' 2022-04-22 13:38:15 -05:00
Vincent Wheat
eda34f1db6 updates
-Added fences to valley and plains
-Updated reset zone prefabs
2022-04-22 13:36:42 -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
Vincent Wheat
b92d2b1aea Update Game-Mountain.unity
-Added popsicle stick fences, almost done with valley
2022-04-20 14:19:21 -05:00
Melbyj1125
370de48610 Merge branch 'MoreUIYay' 2022-04-20 14:10:24 -05:00
Melbyj1125
71570dc2a4 added springs but they may get undone by evan 2022-04-20 14:09:33 -05:00
f52a87b20f Merge branch 'FixPlayerCardNotUpdatingBug' 2022-04-20 14:05:50 -05:00
559daec916 Fixed Bug with Non-Updating Player Cards? 2022-04-20 14:05:27 -05:00
Melbyj1125
f6dfe068c5 updated pause menu visuals 2022-04-20 13:40:42 -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
86ac0fd50e added some visuals and buttons 2022-04-20 13:21:11 -05:00
0a3f7cb865 Added Networking to the Runner Animations 2022-04-20 13:01:51 -05:00
Vincent Wheat
96b7b34b48 Retagged doors as kickable 2022-04-20 12:28:10 -05:00
Vincent Wheat
b7b4476ffa Update Game-Mountain.unity 2022-04-20 12:09:05 -05:00
Vincent Wheat
147d8cf976 Merge branch 'Gr8B8M8' 2022-04-20 12:07:32 -05:00
Vincent Wheat
76bf58606a Popsicle Stick Fences
-Put wood blocks on the floor layer
-Broke apart popsicle sticks into prefabs
2022-04-20 11:55:12 -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
07fa652332 updated some king lobby stuff and img aspects 2022-04-18 23:14:15 -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