Commit Graph

61 Commits

Author SHA1 Message Date
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
Melbyj1125
42f6910e1f Created offset arrays 2022-04-16 19:18:32 -05:00
9172b3592c Fixed Locking of Sprite Rotation for Weather Wheel
- Now the sprite properly locks to the correct weather using the final
  weather wheel asset
2022-04-13 20:46:18 -05:00
021f6e3b23 Modify Weather Wheel to Use Red Arrow to Spin
- Start using the new art assets
- NEED TO FIX ROTATION SETTING (KNOWN ISSUE)
2022-04-13 13:33:34 -05:00
3b7a356877 Weather Wheel Pointer Now Clickable to Trigger Wheel 2022-04-13 13:18:56 -05:00
Melbyj1125
7f4e2173ad fixed the issue with pausing while respawning: 2022-04-12 22:40:25 -05:00
2c1d8e33cd Reduced Weather Wheel Spin Timer 2022-04-11 13:51:09 -05:00
Melbyj1125
75813c3b4b Added delay to skyrim 2022-04-08 18:48:37 -05:00
Melbyj1125
6c8691a44d Fixexd UI Camera reference 2022-04-08 17:12:15 -05:00
Evan Nydahl
a291edd62e General Changes
-Edited animatpr so it doesn't have deprecated states
-Edited 321 countdown script so players can't pause during the countdown
-Added stub objects for the part switching mechanic (will need to be resized
when we get assets for them.
2022-04-06 13:43:37 -05:00
Evan Nydahl
1303aa775a Merge branch 'stuff' into main 2022-04-01 11:50:08 -05:00
Evan Nydahl
08453b455a Added a button to show controls in lobby scene.
-Will need to get a UI asset eventually.
-actual control text needs to be  edited to actual controls
2022-04-01 11:37:48 -05:00
c6576b6617 Disable the "Restart from Checkpoint" Button for the King
- They will never need to respawn so we can just make the button
  uninteractable for them
2022-03-30 09:55:08 -05:00
cfc1a12196 Fixed PauseMenu Cursor Locking
- Doesn't lock the king's cursor on unpause
- Does relock the runner's cursor on unpause
2022-03-25 03:03:51 -05:00
Evan Nydahl
3ef7f7d0fb Fixed bug with ui on networked
-chagne cool down script to call a function to populate player canvas
-Added populate call to three network scripts
2022-03-14 21:44:45 -05:00
60e3213d41 Fixed Weather Wheel Bugs
- Weather now applies to respawned players
- Weather now doesn't disable movement on respawned players
- Weather Wheel can't be spammed
2022-03-14 19:21:04 -05:00
9c7f6e2f8b Fixed the Respawn From Checkpoint Button
- Players now properly spawn at the zones they should
2022-03-14 18:49:50 -05:00
Melbyj1125
2921c8a344 King Lobby is mostly finished 2022-03-11 15:19:24 -06:00
Melbyj1125
122f144cf5 adding things to king lobby 2022-03-11 03:53:20 -06:00
Melbyj1125
f8fc2da95d king lobby stubbed & fixed clipping issue 2022-03-09 15:00:01 -06:00
7e40b39f04 Weather now cancel's after a set duration 2022-03-04 18:52:21 -06:00
8d2e1b0bf1 Weather Spawns for the players (doesn't yet despawn) 2022-03-04 14:10:30 -06:00
Melbyj1125
141c2f3d32 Merge branch 'GrappleBroad' 2022-03-02 14:17:49 -06:00
4724c80146 Finished and Fixed the Reset Button 2022-03-02 14:11:15 -06:00
Melbyj1125
d0f27de496 should be able to kick player? 2022-03-02 13:56:24 -06:00
Melbyj1125
a6be528388 Merge branch 'WeatherPause' 2022-03-02 12:58:58 -06:00
Melbyj1125
00c3495461 pause disables inputs instead of scripts 2022-03-01 19:53:23 -06:00
ad30ba0140 Merge branch 'ResetButton' 2022-02-28 14:07:46 -06:00
3f51b34aec Added a Button to Reset to Last Checkpoint
- Unable to test to verify if it works until the Respawn Positions are
  in the game scene
2022-02-28 14:03:46 -06:00
Melbyj1125
5b6b4a2cb9 weather wheel and weather adjustments 2022-02-28 13:42:51 -06:00
fe766cc4c3 Added the base for Weather Wheel
- Each thing stubbed out
2022-02-18 14:06:24 -06:00
011ba5cba1 Implemented a Local Pause Menu with Options For Controls/Quitting
- Actually displaying text with the controls on it needs to be added but
  there is a placeholder for it.
2022-02-17 14:01:17 -06:00
aff8e3fbcc Added Toggle Option to Use the MLAPI Relay
- Also cleaned up and merged title screen files into a single class
2022-02-16 23:48:56 -06:00
Melbyj1125
e74a1c61c0 adjusted anything that refered to playerMovement 2022-02-16 16:44:30 -06:00
Melbyj1125
7526d16f75 Implemented tooltips when hovering over an item
Added some placeholder images for the items in the game
made small adjustments to grapple
2022-01-31 08:05:17 -06:00
Evan Nydahl
55d2bb9fe1 -added a button to credit scene to title screen
-created credit screen
2021-12-13 13:53:31 -06:00
a9a19cb56a Fixed Lobby Text Not Updating After First Round 2021-12-10 15:14:16 -06:00
4b2cbadf67 Fixed Post Game Winner's Text 2021-12-10 13:10:40 -06:00
989a47dca9 Partially updating WinScreen 2021-12-08 14:23:30 -06:00
ca48a8516b PostGame Transitions To and From Successfully
- End of timer goes to PostGame
- Timer on PostGame returns to Lobby
- Resets PlayerData on return to Lobby
2021-12-01 13:34:53 -06:00
155882e8e6 Added initial objects into PostGame scene 2021-11-29 14:13:38 -06:00