Commit Graph

345 Commits

Author SHA1 Message Date
e0f5db1f8a Made the Slime Spawn on Network
- Debuffs don't apply properly yet
2022-03-23 14:02:40 -05:00
Melbyj1125
0a9b171498 Merge branch 'MomentumLoss' 2022-03-21 14:09:21 -05:00
Melbyj1125
861600d557 ignores floor layer 2022-03-21 14:06:53 -05:00
Katherine
febcbbd57f Merge branch 'MountGrid' 2022-03-21 13:23:56 -05:00
Katherine
9ce623bda0 Mountain Grid
>Mountain has a grid
>King can place on the mountain
>Objects are proberly rotated
>KingGrid has begun to be cleaned up
>Grid Reveal no longer cuts off rows
2022-03-21 12:26:27 -05:00
Melbyj1125
ebf15ceb66 adjusted momentum loss 2022-03-20 07:12:46 -05:00
Melbyj1125
4d806060a7 losing momentum when hitting a block should work
player also rotates to face the direction they are moving
2022-03-20 06:53:42 -05:00
Evan Nydahl
3481c5087a Added dCoolDown for debugPlayer
-This change was required due to change in base cooldown script
2022-03-14 21:54:21 -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
87c6095623 Merge branch 'MomGrappleOther' 2022-03-13 19:01:48 -05:00
Evan Nydahl
bc9a6715da Fixed playerCanvas issues with ui 2022-03-11 15:27:54 -06:00
Melbyj1125
2921c8a344 King Lobby is mostly finished 2022-03-11 15:19:24 -06:00
Evan Nydahl
38e01ac1e5 Edited UI functions for functionallity in network
-Added popups to map
2022-03-11 15:10:48 -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
Vincent Wheat
ae66378ca1 Merge branch 'JustWednesdayThings' 2022-03-09 14:12:13 -06:00
Vincent Wheat
ea632960a8 Playtest1Feedback
-Adjusted Left1 boulders to be smaller and faster
-Added serializable scale to boulder spawn
-Adjusted some sliding obstacle heights
-relinked respawn zone in last pit of foothills
-Plains left 1 adjusted bumper strength and added catch platform
-Imported assets for archer towers and cannons, materials need to be gleeked with
2022-03-09 14:11:02 -06:00
Evan Nydahl
51056bc3d5 Refactored ui code to work with new state base player 2022-03-09 13:52:34 -06:00
Melbyj1125
7ae4b643a1 Fixed a lot of the issues we addressed on Monday 2022-03-09 02:16:56 -06:00
Evan Nydahl
03a96b8c67 Merge branch 'fixAnimator' into main 2022-03-07 14:13:20 -06:00
Evan Nydahl
ee02e1eb59 Added animator to no debug 2022-03-07 14:10:49 -06:00
Melbyj1125
ad6df78c0e Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-03-07 12:05:43 -06:00
Melbyj1125
b9ff40688b Changes to debug and state machine 2022-03-07 12:02:37 -06:00
Vincent Wheat
f0a4bff323 Merge branch 'Foothills' 2022-03-07 11:52:57 -06:00
Evan Nydahl
ab552e5467 Merge branch 'animationController' into main 2022-03-07 11:26:13 -06:00
Evan Nydahl
d2f75987e8 Animation Controller
-Added rough animator diagram--needs more work
-Added a animator manager script to handle animation priority
2022-03-07 11:23:17 -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
Vincent Wheat
ffdc7092bf Everything is crumbling
hahahahaha
2022-03-04 14:09:33 -06:00
Melbyj1125
71d7a84725 can kick other players but there is a problem
Recovering from ragdoll has problems & host can't kick others for some
reason
2022-03-02 15:08:49 -06:00
Melbyj1125
141c2f3d32 Merge branch 'GrappleBroad' 2022-03-02 14:17:49 -06:00
Melbyj1125
48bdf66fc6 player shouldn't kick themselves 2022-03-02 14:17:14 -06:00
Melbyj1125
9b9e847ba9 modified debug kick 2022-03-02 14:12:35 -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
741dae95cd weather and pause functionality implemented 2022-03-02 12:56:22 -06:00
Melbyj1125
00c3495461 pause disables inputs instead of scripts 2022-03-01 19:53:23 -06:00
Melbyj1125
0ef78f3eb5 wind should work rn 2022-03-01 17:46:50 -06:00
Melbyj1125
a47ee0c406 started modifying wind 2022-02-28 15:19:19 -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
dcf9ce2a7a Merge branch 'ColGate' 2022-02-28 13:50:52 -06:00
Katherine
b8dbb271c6 Merge branch 'PolishTheImp' 2022-02-28 13:49:26 -06:00
Katherine
95ba7a6673 King Grid/Quick push
>Pushing King changes to main
>Have made some changes to the King's Grid
>Started on the Mountain Grid
2022-02-28 13:46:24 -06:00
Melbyj1125
b80aea96fd updated weather values 2022-02-28 13:44:20 -06:00
Melbyj1125
5b6b4a2cb9 weather wheel and weather adjustments 2022-02-28 13:42:51 -06:00
Katherine
949c225ccc Slime Arrows and KingGrid edits
>Added arrows to the slime's movement
>Readjusted the grid to fir with new design
>Added the King model to the scene
2022-02-28 12:19:49 -06:00