Joshua Latham
|
d1d5c2345e
|
Merge pull request 'Fixed hole and ball issues. Created gameplay prefabs.' (#16) from Holeandballupdates into feature/LoadingCourseOnPlane
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/16
|
2024-04-22 17:47:35 +00:00 |
|
Joshua Latham
|
bac34dfcaf
|
Should fix stroke count and reset issues.
|
2024-04-22 13:40:07 -04:00 |
|
Joshua Latham
|
fca315e745
|
Merge branch 'feature/LoadingCourseOnPlane' into Holeandballupdates
|
2024-04-22 13:01:20 -04:00 |
|
Joshua Latham
|
2cdd2896af
|
Fixed hole and ball issues. Created gameplay prefabs.
|
2024-04-22 12:15:01 -04:00 |
|
Noah
|
4ecc72cc3a
|
Added team ID
|
2024-04-22 11:51:00 -04:00 |
|
Noah
|
240f28e34d
|
Merge branch 'development' into feature/LoadingCourseOnPlane
|
2024-04-22 11:47:12 -04:00 |
|
Noah
|
5a9c2748cb
|
Merge branch 'feature/LoadingCourseOnPlane' of https://udrimavric.com/MAVRIC/UDRIGolf2024 into feature/LoadingCourseOnPlane
|
2024-04-22 11:46:34 -04:00 |
|
Noah
|
00f6421ec3
|
Added Spawn points
|
2024-04-22 11:45:49 -04:00 |
|
Joshua Latham
|
9e0faf5386
|
Updated prefabs to have colliders respond to Hole events.
|
2024-04-22 11:12:26 -04:00 |
|
Noah
|
6fac57dc51
|
save point
|
2024-04-22 10:33:22 -04:00 |
|
|
|
0764212875
|
Merge branch 'feature/Moving-Floor-Up-Down' into feature/Swinging-Blade
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 09:51:14 -04:00 |
|
|
|
9ca0bf5ba9
|
Final changes for script
|
2024-04-22 09:50:47 -04:00 |
|
|
|
c57b958220
|
Merge branch 'feature/Moving-Floor-Left-Right' into feature/Moving-Floor-Up-Down
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 09:49:51 -04:00 |
|
|
|
1fcf2fa4b0
|
fixes
|
2024-04-22 09:48:40 -04:00 |
|
|
|
13394322e2
|
fixed, added script and way more functionality.
|
2024-04-22 09:47:46 -04:00 |
|
|
|
f477607d05
|
Editing and fixing center of sickles
|
2024-04-22 09:22:22 -04:00 |
|
|
|
4e455c0a45
|
Fixin stuffs
|
2024-04-22 08:56:15 -04:00 |
|
Abraham
|
ded53d8ce2
|
Created Spear Trap and Multi-Spear Trap
|
2024-04-21 22:15:04 -04:00 |
|
Noah
|
0ccbe59c30
|
save point
|
2024-04-21 21:57:49 -04:00 |
|
Noah
|
97593365fe
|
adjust GamePlayUI
|
2024-04-21 20:45:58 -04:00 |
|
Noah
|
dee8e442ae
|
save point
|
2024-04-21 19:52:47 -04:00 |
|
|
|
eab4124525
|
Final fixes
|
2024-04-21 09:35:33 -04:00 |
|
|
|
99819bdfea
|
Added Spinning Sickles
Fun little sickles
|
2024-04-21 09:30:49 -04:00 |
|
|
|
5ba2a7dee9
|
Fixes to overides
|
2024-04-21 08:34:09 -04:00 |
|
|
|
a5b64e99d5
|
Fixing scene
|
2024-04-21 08:28:23 -04:00 |
|
|
|
3cc7957726
|
Setting For Left right and Up Down Moving
|
2024-04-21 08:25:14 -04:00 |
|
|
|
25e6460039
|
Distinction between LR and UD
|
2024-04-21 08:07:31 -04:00 |
|
|
|
b8c3a5d791
|
Moving Floor Build
|
2024-04-21 08:02:16 -04:00 |
|
Noah
|
87932c92e4
|
update images
|
2024-04-19 15:14:17 -04:00 |
|
Noah
|
6172a95304
|
Save Point
|
2024-04-19 14:37:47 -04:00 |
|
Joshua Latham
|
63649d6557
|
Merge pull request 'feature/FloorRamp' (#11) from feature/FloorRamp into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/11
|
2024-04-19 18:00:16 +00:00 |
|
|
|
89b9912466
|
Merge branch 'development' into feature/FloorRamp
# Conflicts:
# Assets/CoursePrefabs/Animations.meta
# Assets/Obstacles.meta
# Assets/PolygonDungeon/URP_ExtractMe.unitypackage.meta
# Assets/Scenes/TestControls.unity
|
2024-04-19 11:58:43 -04:00 |
|
Joshua Latham
|
5301719fcd
|
Merge pull request 'feature/Bombs' (#10) from feature/Bombs into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/10
|
2024-04-19 15:16:23 +00:00 |
|
|
|
d0eb0b18d3
|
Animation funtime
Added anims for skeles
|
2024-04-19 08:50:04 -04:00 |
|
|
|
c2a25c90d9
|
Cleaning code
|
2024-04-19 08:10:17 -04:00 |
|
|
|
b3a0f0df6d
|
Fix OCD
|
2024-04-19 08:03:41 -04:00 |
|
|
|
15328b11a2
|
Floor_Ramp FInished
|
2024-04-19 07:58:54 -04:00 |
|
|
|
0cb9b92f45
|
Fun coliders
12
|
2024-04-19 07:23:36 -04:00 |
|
|
|
1b162a4e2a
|
Ramp changes
|
2024-04-19 06:49:28 -04:00 |
|
|
|
88a3d4eddb
|
Testing ramp Coliders
|
2024-04-19 06:42:46 -04:00 |
|
Abraham Blain
|
bc356e3a94
|
Merge remote-tracking branch 'origin/development' into feature/Bombs
|
2024-04-18 12:52:13 -04:00 |
|
Abraham Blain
|
6de65b7923
|
Created Bomb obstacle
|
2024-04-18 12:52:07 -04:00 |
|
Joshua Latham
|
7d8505111f
|
Merge pull request 'CourseDesign' (#9) from CourseDesign into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/9
|
2024-04-18 15:04:00 +00:00 |
|
Joshua Latham
|
85a7b3993b
|
Merge branch 'development' into CourseDesign
|
2024-04-18 10:59:15 -04:00 |
|
Joshua Latham
|
5f98e8c62d
|
Main room should be fully playable now.
|
2024-04-18 10:47:50 -04:00 |
|
Joshua Latham
|
83f04a655b
|
Fixed orientation or AR content prefabs. Continuing to add colliders to Main room.
|
2024-04-18 10:26:27 -04:00 |
|
Caleb Brown
|
903f6dda7b
|
Merge pull request 'CourseDesign' (#8) from CourseDesign into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/8
|
2024-04-18 14:23:54 +00:00 |
|
Joshua Latham
|
13a7b9ece5
|
Added more colliders to Main Room. Cleaned up other prefabs.
|
2024-04-18 09:19:43 -04:00 |
|
Joshua Latham
|
961d177a2e
|
Added colliders to Control and Green rooms. Main still WIP.
|
2024-04-18 00:59:55 -04:00 |
|
Joshua Latham
|
f5d586f5a0
|
Merge branch 'development' into CourseDesign
|
2024-04-17 22:04:48 -04:00 |
|
