Commit Graph

326 Commits

Author SHA1 Message Date
Katherine
35c5c41f5a Slime Temp and Bug fixes
>Fixed some bakes with the Hail
>Fixed the movement bugs with the king's movement
>Added the Slime in a semi-functional state
2022-02-10 15:54:16 -06:00
Katherine
3c1e36726a King Grid and Hail
>King Grid should be fixed
>Hail has been updated having shadows spawn better
>This is achived through raycasting, and isn't perfect on sloped
surfaces
>King Place is also updated to fix some issues the networking caused
2022-02-08 13:37:53 -06:00
9c15b44b6f Potential Fix for Kick 2022-02-07 12:16:58 -06:00
b278e511ff Fixed Blocks Not Placing For Clients 2022-02-04 20:02:55 -06:00
215d709915 Merge branch 'ElRedDeLaReyDos' 2022-02-04 19:26:37 -06:00
91c420490a Boxes spawn from king placing 2022-02-04 19:25:53 -06:00
Evan Nydahl
b61cf12128 Adjustments
1. Adjusted player indicators and added a line
2. Reapplied game objects to dash and nitro
3. Readjust keybindings for nitro and dash
2022-02-04 15:20:50 -06:00
Evan Nydahl
83efaf4a34 Merge branch 'stuff' into main 2022-02-04 14:50:42 -06:00
Evan Nydahl
ed8b9ffa91 Added Lots of features
1. Added rough fx for erruption
2. Created a sign prefab for level use
3. fixed UI cooldown
2022-02-04 14:38:33 -06:00
849254a0ef Start working on Box Placing for the King
- Places locally, need to sync to clients
2022-02-04 14:22:52 -06:00
Vincent Wheat
1990592920 Repaired Grid Prefab
-Repaired Grid Prefab
2022-02-04 13:44:36 -06:00
Vincent Wheat
2685f9b002 Merge branch 'VerticalMountain' 2022-02-04 13:40:49 -06:00
Vincent Wheat
094455e3cf Update Game-Mountain.unity
-Updated Mountain Path
-Updated Gates
2022-02-04 13:39:45 -06:00
04d92b39ee Started fixing KingUI 2022-02-04 13:37:54 -06:00
Katherine
212a17ad7e Merge branch 'KingGrid' 2022-02-04 13:13:46 -06:00
Katherine
f9a3c15239 King Hail Implementation
>The King can spawn hail by clicking and dragging from two seperate
points
>Fixed some bugs with the King's grid
>Boxes placement cleaned up
2022-02-04 13:10:49 -06:00
e846ebc8c8 Modified the Gates and KickController to sync kicks and apply force
- Now the kicking of gates will sync over the network
- Needs review from Justin to verify this won't break other kickable
  items
2022-02-03 23:14:58 -06:00
Melbyj1125
8d5b2c9193 minor fix to boulder 2022-02-02 18:41:43 -06:00
Melbyj1125
ba1b2706a6 fixed kick sort of, fixed bumper and boulder
Fix for kick works but is kind of strange and I want to adjust it later
in the future
2022-02-02 18:38:16 -06:00
1949de0754 Temporarily disable archer towers while buggy 2022-02-02 13:23:05 -06:00
7ebea33830 Still trying to fix the item bug 2022-02-02 13:16:12 -06:00
651bc24abf Fixed an issue when you take no items into a game 2022-02-02 13:10:42 -06:00
cc3bd3d706 Possible Fixes To Net Bugs 2022-02-02 12:46:48 -06:00
e009b33e54 Adjusted Game vars back to Network Versions 2022-02-02 12:26:53 -06:00
Melbyj1125
dd27705eee updated non debug files 2022-02-02 08:56:29 -06:00
Melbyj1125
df1b7f5448 Fixed an issue with wallrun moving the player up
Still needs adjustments to be more flexible and maybe allow the player
to wall run from standing still to allow for vertical wallrun sections.
2022-02-02 08:48:30 -06:00
Melbyj1125
f683a48b84 Rebalanced Items & Bug Fixed
I updated the player prefabs to be more in line with one another and
increased the max speed they can have
2022-02-02 00:08:06 -06:00
Melbyj1125
bf874ddc84 Updated nitro restoring functionality and buffing 2022-02-01 21:07:45 -06:00
Melbyj1125
c5ae603e8f swing feels a lot more complete
Takes into accoutn player height and speed
need to adjust slightly for better ingame feel when it is implemented
into the levels.
2022-02-01 20:32:55 -06:00
Melbyj1125
b2bd9783d4 Merge branch 'sprint3MelbySpring' 2022-01-31 14:23:48 -06:00
Melbyj1125
b63b814fe4 Small changes 2022-01-31 14:21:38 -06:00
Evan Nydahl
09ea1fe031 Fixed indicator and CooldownUI 2022-01-31 14:07:23 -06:00
Katherine
72e33adcbe King Place updated
>the king can place things on the grid, and they snap to the grid
>Hail and Slime are just placeholder objects at the moment
>Grid snapping might need to be cleaned up
2022-01-31 12:38:30 -06:00
Melbyj1125
37b9fab90a updated item sprites 2022-01-31 12:19:55 -06:00
Melbyj1125
ac441356bd updated cooldown to not throw errors 2022-01-31 12:15:32 -06:00
Melbyj1125
d50d057973 Merge branch 'sprint2MelbySpring' 2022-01-31 12:14:11 -06:00
Evan Nydahl
cd2dee89e8 Merge branch 'EvanBranch' into main 2022-01-31 12:12:00 -06:00
Evan Nydahl
72e39a92be Started Fixing UI 2022-01-31 12:09:46 -06:00
Melbyj1125
3c635eeb70 added the new sprites for the items 2022-01-31 12:08:24 -06:00
Vincent Wheat
66e0e66932 Merge branch 'MountainLayout' 2022-01-31 12:03:39 -06:00
Vincent Wheat
0a93f232b0 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-01-31 12:00:49 -06:00
Vincent Wheat
0ed51102ec Pre main merge
Pre merge commit for new branch
2022-01-31 11:59:58 -06:00
04c0d65041 Merge branch 'AddingRespawnDelay' 2022-01-31 11:52:58 -06:00
c6f1ecbbec First Attempt at making the arrow apply contact to objects 2022-01-31 11:00:30 -06:00
Melbyj1125
5f8d487c95 added swing movement easing and adjusted the ropeOffset
Still need to add player movement and height affecting momentum
2022-01-31 10:18:27 -06:00
Vincent Wheat
8ff9113c12 Update Game-Mountain.unity
First third of path around/up mountain is put in
2022-01-31 09:47:36 -06:00
Melbyj1125
e249e5d4d5 idle grapple calculations have been solidified
I can now move into adding how player speed and height effect these
things
2022-01-31 09:39:30 -06:00
Melbyj1125
93d2ce9c40 Adjusted prefabs and tags 2022-01-31 08:07:57 -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
8dcb4e11af Adjusted Respawn Delay and Added Respawning Text
- Respawning now takes 3 seconds
- Host also now must wait the same 3 seconds like the clients did
- Added a screen with text that says respawning so players are informed
  of what is happening
2022-01-29 00:12:28 -06:00