Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-04-26 02:00:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
437 Commits 20 Branches 1 Tag 620 MiB
ab552e5467
Commit Graph

437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Julia Butenhoff
7e40b39f04 Weather now cancel's after a set duration 2022-03-04 18:52:21 -06:00
Julia Butenhoff
3fdd63f886 Removed Option for title scene 2022-03-04 14:13:14 -06:00
Julia Butenhoff
8d2e1b0bf1 Weather Spawns for the players (doesn't yet despawn) 2022-03-04 14:10:30 -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
Julia Butenhoff
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
685053ec78 modified player max speed 2022-03-02 12:59:56 -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
Vincent Wheat
2812d0b0e2 Update Game-Mountain.unity 
Turned off mesh renderer of pitfalls
 2022-02-28 14:13:39 -06:00
Vincent Wheat
e693175f5e Update Game-Mountain.unity 
Turned off invisible walls to be hidden in scene
 2022-02-28 14:12:44 -06:00
Vincent Wheat
9725ec1706 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-02-28 14:11:26 -06:00
Vincent Wheat
54758d5513 Added Respawn Points 
-RespawnPoints added across map
-Killzone respawn points linked
 2022-02-28 14:11:24 -06:00
Julia Butenhoff
ad30ba0140 Merge branch 'ResetButton' 2022-02-28 14:07:46 -06:00
Julia Butenhoff
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
627638f33b added weather wheel to king canvas 2022-02-28 14:02:21 -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
Vincent Wheat
5308a29ae2 Updates to Game-Mountain 
-Added Crumbling platforms correctly
-Added reset zones
-Added basic particle systems for mapwide debugging
-Added tags for particle systems
 2022-02-28 12:56:40 -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
Vincent Wheat
3d98a06afd Merge branch 'LevelLayout' 2022-02-28 11:35:43 -06:00
Vincent Wheat
f394241741 Boulder 
-Boulder debugged, still needs to apply force
-Updated Game-Mountain
 2022-02-28 11:30:55 -06:00
Julia Butenhoff
028ad52dc9 Modified Pitfall to Now Use a Transform For Respawning 
- Will need to update all instances in scene with a new respawn point
  game object
 2022-02-27 14:20:05 -06:00
Julia Butenhoff
ce7822e7e9 Networked Crumbling Platforms 
- Need to replace all objects in scene with new prefab
 2022-02-27 14:16:47 -06:00
Melbyj1125
46dff8f663 doors no longer collide with frame & fixed mom hit 2022-02-25 14:56:30 -06:00
Vincent Wheat
a9b5c1831b Updated Scene 
Adjusted hashes for boulder prefabs
Updated preloader network manager
Added obstacles to foothills
 2022-02-25 14:19:23 -06:00
Melbyj1125
4ab94edb59 Merge branch 'MomSlide' 2022-02-23 14:00:03 -06:00
Melbyj1125
d9629ec555 lose Mom on wall and kick renetworked 2022-02-23 13:55:30 -06:00
Vladdie
b8fe8c46fe Merge branch 'whyarrowvibe' 2022-02-23 13:44:28 -06:00
Katherine
b1f254131f Merge branch 'KingMess' 2022-02-23 13:28:12 -06:00
Katherine
0655b86352 King Abilities/Radial Menu bugfixes 
>Radial Menu has been bugfixed so the players have a harder time
breaking things
>King abilities have had some repeated code moved into a seperate class
 2022-02-23 13:18:54 -06:00
Julia Butenhoff
29f663d982 Merge branch 'despawnGatesKick' 2022-02-23 13:07:59 -06:00
Julia Butenhoff
966c85c646 Made gates despawn after being kicked and timer 2022-02-23 13:06:24 -06:00
Vincent Wheat
2b281864b0 Update Game-Mountain.unity 
-Added floor tags
 2022-02-23 12:53:18 -06:00
Melbyj1125
b9a573a97d fixed an interaction between slide and fall 2022-02-23 07:57:18 -06:00
Melbyj1125
65a7008d24 slide no longer rotates player 
this means that currently the model doesn't rotate but that will be
rectified once we have the animations
 2022-02-23 00:00:43 -06:00
Vincent Wheat
c455af3fc3 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-02-21 14:42:27 -06:00
Vincent Wheat
88157e15da Merge branch 'FoothillObstacles' 2022-02-21 14:42:08 -06:00
Vincent Wheat
34164f7a03 Adjustments to Scene 
-Adjusted Game-Mountain
-Added King head and prefab
 2022-02-21 14:40:08 -06:00