Commit Graph

244 Commits

Author SHA1 Message Date
d0d82b882c Merge branch 'main' of https://github.com/Lautha1/TheKingsRace Fall-SGX 2021-12-13 14:14:53 -06:00
c93414c6d0 Spawn King and Fixed Respawning on Clients 2021-12-13 14:14:02 -06:00
Evan Nydahl
bfa91240b2 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2021-12-13 13:58:09 -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
Melbyj1125
6c09c3e976 Merge branch 'MelbyFinalSprint' 2021-12-13 13:12:46 -06:00
Melbyj1125
3c3708f869 Changed Player Stats and altered kick hit box 2021-12-13 13:06:47 -06:00
Katherine
45b666e05b Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-12-13 12:30:28 -06:00
Katherine
981e254e8b Final Touches
>King's Placement function teaked slightly
2021-12-13 12:26:06 -06:00
ae287e391a Fixed PlayerMovevment Bug 2021-12-13 12:24:29 -06:00
wheatv3015
de0f6c1a0b Lightmap Data
-Generated lightmaps for the level
2021-12-11 16:04:09 -06:00
Katherine
c75832d545 King Place Temp Finished
>Attempted to edit King Place, nothing much came of it
2021-12-10 23:22:31 -06:00
Melbyj1125
c3889509c5 Merge branch 'MelbyFinalSprint' 2021-12-10 23:17:37 -06:00
Vincent Wheat
597e59264d Updates
-Archer In Scene
-Time for race 7 minutes
-Camera Path Adjusted
-Trees added in scene
-End Collider added to race
2021-12-10 23:15:36 -06:00
Melbyj1125
e8710ba6d9 Updated player prefabs
they use continuous rigid body now
2021-12-10 22:38:46 -06:00
Melbyj1125
946e2146a3 grapple still doesn't work fixed some other values with prefabs 2021-12-10 22:36:40 -06:00
6abcb5afba Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-12-10 22:31:40 -06:00
2c2a13ff84 Finished Networking the Boulder 2021-12-10 22:30:40 -06:00
Vladdie
bc31ecf4bc Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-12-10 22:08:42 -06:00
Vladdie
87d92d515b Archer prefab fixed 2021-12-10 22:01:44 -06:00
Vincent Wheat
7348d3644d MetaData + Spawn Quaternions
-Meta data for moved king scripts
-Added quaternions for spawning players facing the correct directions
2021-12-10 21:58:55 -06:00
Katherine
6fe14abe62 King placement prototype
>King can place objects on the race track
>It is based on their cursor location in 3D space
>Objects need to be switched for their proper abilities
>Objects need to snap to Grid
2021-12-10 21:46:42 -06:00
Vincent Wheat
b74c71004d Merge branch 'Killzone' 2021-12-10 21:39:12 -06:00
Vincent Wheat
87a4475f48 Reorganization
-KillZones are now network prefabs
-Reorganized files to remove redundancy
2021-12-10 21:38:24 -06:00
Vladdie
de2d018b61 Merge branch 'ArcherV3' 2021-12-10 21:27:22 -06:00
Vincent Wheat
d339775e4c Merge branch '80PercentEffort' 2021-12-10 21:05:07 -06:00
Vincent Wheat
acdac8b00a Updates
-Boulder Prefab
-Boulder Spawning
-Plains Layout
-Painted Terrain
2021-12-10 21:03:36 -06:00
Vladdie
ccbd0e4b8a Arrow is now firing proper 2021-12-10 21:01:54 -06:00
1fe41e62c3 Merge branch 'NetworkedRespawning' 2021-12-10 20:56:31 -06:00
a70528107f Finished Network Based Respawning 2021-12-10 20:55:59 -06:00
Katherine
98d69fdfea Grid Dynamic Reveal/Raycasting
>Grid Dynamic Reveal works in the actual scene
>Created duplicate scene to practice impliment the King
>Layed out the full Grid on the terrain
>Used Raycasting to find the position of the cursor in 3D world space
>Have the object that is going to be placed follow the King's Cursor
2021-12-10 20:31:00 -06:00
Seth Berrier
ee4d5bc81f Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-12-10 18:56:45 -06:00
Seth Berrier
d5c2ae4a0a Updating gource scripts 2021-12-10 18:56:41 -06:00
Melbyj1125
82e7cdd729 Merge branch 'MelbyFinalSprint' 2021-12-10 18:31:08 -06:00
Melbyj1125
610d8b832e Player Teleport Implemented 2021-12-10 18:29:51 -06:00
dd9a7b625c Beginning of KillZone work 2021-12-10 18:29:16 -06:00
Evan Nydahl
65efe2c69e Merge branch 'crunchySprint' into main 2021-12-10 18:08:17 -06:00
Melbyj1125
4504190533 Merge branch 'MelbyFinalSprint' 2021-12-10 18:07:27 -06:00
Melbyj1125
4c8cbcf82e grapple still has issues 2021-12-10 18:05:54 -06:00
Vincent Wheat
6a8b1a6680 Updates
-Textured Terrain
-Adjusted Height over track
-added more obstacles
2021-12-10 17:20:28 -06:00
Evan Nydahl
66b72a797e -edited animation a little--consistently stops animation when player
stops moving
2021-12-10 16:41:48 -06:00
Vladdie
2106f18624 Archer updates 2021-12-10 15:22:52 -06:00
a9a19cb56a Fixed Lobby Text Not Updating After First Round 2021-12-10 15:14:16 -06:00
Katherine
8c6de35fd7 Merge branch 'main' into KingImp 2021-12-10 14:15:04 -06:00
Katherine
68b6953734 King's Grid reveal upadate
>Forgot to add certain files to the previous Git commit
>Refer to previous commit for the explination of pushed files
2021-12-10 14:00:29 -06:00
Katherine
5b28eb768d Kings Grid Implemented
>King's UI can make the Grid appear
>King's movemnt allows the grid to dynamicaly enable and disable
>Code is designed to be flexiable to fit different sizings of
grids/King's FOV
2021-12-10 13:56:47 -06:00
Evan Nydahl
a5da0f2017 Merge branch 'main' into crunchySprint 2021-12-10 13:46:39 -06:00
Evan Nydahl
9d25687dcc -bleh 2021-12-10 13:44:33 -06:00
Melbyj1125
45ce1576b5 updated debug and network player prefab 2021-12-10 13:42:32 -06:00
Melbyj1125
9bc571dded added debug updates to regular scripts 2021-12-10 13:30:43 -06:00
Melbyj1125
614e0aa685 Fixed Kick 2021-12-10 13:27:00 -06:00