Commit Graph

143 Commits

Author SHA1 Message Date
Melbyj1125
6b893f8a77 Merge branch 'MelbySprint5-2' 2021-12-10 13:19:11 -06:00
2927985f7c Merge branch 'WinLossTrans' 2021-12-10 13:13:01 -06:00
4b2cbadf67 Fixed Post Game Winner's Text 2021-12-10 13:10:40 -06:00
Melbyj1125
1f5c7bce0d slight bumper adjustment 2021-12-10 13:09:08 -06:00
Vladdie
57460cded2 Merge branch 'ArcherRoom' 2021-12-10 12:53:54 -06:00
Vladdie
8b9c12f19a Fixed Archer 2021-12-10 12:44:44 -06:00
Evan Nydahl
549af282cc -added rough animation controller 2021-12-10 12:37:32 -06:00
Melbyj1125
e91afb02f4 Bumper has been fixed sort of
You need to use 2 colliders one thats a trigger and one thats not and it
will work properly
2021-12-10 12:34:13 -06:00
Melbyj1125
c44afd50a8 Jump has been reworked again but it works now
Glide has been fixed again
Wallrun has been fixed again
player can now short hop
2021-12-10 06:52:59 -06:00
Evan Nydahl
f5317ea27f -added and colored archer
-added and colored tree
-added bumpers
2021-12-08 15:37:22 -06:00
989a47dca9 Partially updating WinScreen 2021-12-08 14:23:30 -06:00
5bccece90b Runners Properly Despawn and Spectate After Map Completion 2021-12-08 13:44:38 -06:00
Evan Nydahl
64b920c3d5 -created a script for breakable objects
-updated block prefabs (updated size/added breakable script)
-added demo scene for blocks/breakable script
2021-12-07 18:35:05 -06:00
Melbyj1125
bd36986887 Reworked Jumping slightly
Added Coyote Jump
Fixed Wallrun Again
Fixed Glider
2021-12-06 14:16:41 -06:00
ecc526d653 Corrected player despawning wrong player
- Still won't properly despawn if not host though
2021-12-06 14:16:34 -06:00
df4a3f0173 Mostly working EndBox Collider
- Currently deletes the wrong player upon enter
- Still needs to swap to proper scene on all players finished
2021-12-03 14:14:29 -06:00
Vincent Wheat
5a8b657e16 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-12-03 13:59:32 -06:00
Vincent Wheat
3f3199d1dc Merge With Main 2021-12-03 13:58:58 -06:00
Vincent Wheat
1701b07b26 Merge branch 'RespawningInScene' 2021-12-03 13:56:33 -06:00
Evan Nydahl
36da5ec848 Resolved many merge conflicts 2021-12-03 13:55:32 -06:00
Evan Nydahl
e0cfb655f8 Merge branch 'controller' into main 2021-12-03 13:42:41 -06:00
Katherine
555ca22573 Merge branch 'KingsAbs' 2021-12-03 13:37:23 -06:00
Evan Nydahl
97b727b3db -changed cooldown thing (only needed for dodge and boost). May want to
deprecate these
-slight edits to mountain path
2021-12-03 13:32:37 -06:00
Vladdie
01e7fdb297 Merge branch 'ArcherTesting' 2021-12-03 13:31:49 -06:00
Melbyj1125
7e450955b2 Merge branch 'Sprint5Melby' 2021-12-03 13:27:33 -06:00
Vladdie
4b17a2e339 Updates to archer, changes needed on targeting. 2021-12-03 13:22:59 -06:00
Katherine
7d69730cc8 King UI Started
>King has a UI with buttons
>Clicking the buttons is parsed into the correct function
>Grid and Placement still needs to be implemented
2021-12-03 13:22:48 -06:00
Vincent Wheat
a31ac1b79f Slowdown Zones
-Added script for slowing player movement
-Updated Terrain Layouts
2021-12-03 13:22:09 -06:00
Melbyj1125
17d804080d Gate created and player tagged correctly 2021-12-03 13:17:12 -06:00
Melbyj1125
55885e2ef1 Wallrun allows players to hop off wall again 2021-12-03 10:51:37 -06:00
Evan Nydahl
20db245902 -Modified mountain (may need more changes later)
-Added full controller support for all abillities that will be in the game
(grapple is currently set to x)
2021-12-01 15:38:24 -06:00
Melbyj1125
57385b47b4 Player Items now carry over to the next scene 2021-12-01 14:23:14 -06:00
8e945a4d81 Merge branch 'WinLossTrans' 2021-12-01 13:55:39 -06:00
Vincent Wheat
10a9f8d1ca Updates to terrain sculpting
-Updated Terrains for plains, valley
-Added respawn mechanic
-Added PlayerMovement respawn support
2021-12-01 13:51:46 -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
Katherine
27d3d5f4ab King Movement
>King Movement, both Horizontal and and Circular implemented
>King Abilites changed to work with Player's getHit function
2021-12-01 12:43:45 -06:00
155882e8e6 Added initial objects into PostGame scene 2021-11-29 14:13:38 -06:00
Evan Nydahl
02410a642f Resolved naming conflicts and reorganized 2021-11-29 13:54:29 -06:00
Evan Nydahl
edb74552c4 Merge branch 'grayboxPlains' into main 2021-11-29 13:48:18 -06:00
Evan Nydahl
4912786883 -started controller thing 2021-11-29 13:29:10 -06:00
Vincent Wheat
ba68320a8f Merge branch 'TerrainScuplting' 2021-11-29 13:27:31 -06:00
7185e3b870 Correct Visibility and Naming Issue 2021-11-29 12:17:28 -06:00
58050dbc85 Merge branch 'PlayerEnable' 2021-11-29 12:12:24 -06:00
wheatv3015
49dea1fcde updates 2021-11-29 12:05:38 -06:00
Melbyj1125
fdc44a27f0 Merge branch 'InventoryNetworking' 2021-11-29 12:03:19 -06:00
Melbyj1125
33cf07a9ae Semi-Fixed Wallrunning 2021-11-29 11:53:49 -06:00
Evan Nydahl
1366273e54 Mountain/Controller progress
-more obstacles added to the mountain
-finish line was added at the top of the mountain
-installed new input package
2021-11-29 11:51:09 -06:00
6f948c0c48 Added Overall Race Timer and PlayerHUD template 2021-11-28 11:31:17 -06:00
df5107a1bc Implemented a 321 coundown 2021-11-22 14:22:01 -06:00
Melbyj1125
665b1c793f Inventory UI implemented
Networking should work
2021-11-22 13:52:06 -06:00