Kip Taylor
|
86bf49d282
|
Merge branch 'development' into Obstical-Work
|
2024-04-23 14:19:51 -04:00 |
|
Kip Taylor
|
58f23250b9
|
Fire ob added
|
2024-04-23 14:19:33 -04:00 |
|
Caleb Brown
|
9e09e17550
|
Merge pull request 'feature/RoomAlignment' (#24) from feature/RoomAlignment into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/24
|
2024-04-23 18:12:31 +00:00 |
|
Kip Taylor
|
8d6eb84bfe
|
Merge branch 'development' into Obstical-Work
|
2024-04-23 14:09:46 -04:00 |
|
Noah
|
df3c487807
|
Merge branch 'development' into feature/RoomAlignment
|
2024-04-23 14:07:55 -04:00 |
|
Caleb Brown
|
d784215dab
|
Merge pull request 'feature/Swinging-Axe-booogaloo' (#20) from feature/Swinging-Axe-booogaloo into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/20
|
2024-04-23 18:05:23 +00:00 |
|
Kip Taylor
|
dd7cc6aa19
|
Merge branch 'development' into feature/Swinging-Axe-booogaloo
|
2024-04-23 13:59:47 -04:00 |
|
Kip Taylor
|
03729d6ccf
|
Merge branch 'development' into Obstical-Work
|
2024-04-23 13:56:11 -04:00 |
|
Kip Taylor
|
a80f8936d9
|
Green room updating and main room
|
2024-04-23 13:56:00 -04:00 |
|
Noah
|
1176df33bb
|
move spawn points
|
2024-04-23 13:54:23 -04:00 |
|
Noah
|
3b43d9b159
|
Merge branch 'development' into feature/RoomAlignment
|
2024-04-23 13:45:44 -04:00 |
|
Noah Calderon
|
d6b4a8fe00
|
Merge pull request 'feature/occlusion-mat' (#23) from feature/occlusion-mat into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/23
|
2024-04-23 17:38:55 +00:00 |
|
cbrown
|
7055f5611c
|
Merge branch 'development' into feature/occlusion-mat
|
2024-04-23 13:14:30 -04:00 |
|
cbrown
|
4280f9f7e9
|
Added fake occlusion material
|
2024-04-23 13:14:20 -04:00 |
|
Kip Taylor
|
a4050af022
|
Merge branch 'development' into Obstical-Work
# Conflicts:
# Assets/CoursePrefabs/AR Content Control Room 1.prefab
|
2024-04-23 13:00:38 -04:00 |
|
Kip Taylor
|
baf421843a
|
Moved objects
|
2024-04-23 12:59:56 -04:00 |
|
Kip Taylor
|
e55fba92ab
|
Fixing scripts and adding objects
|
2024-04-23 12:53:11 -04:00 |
|
Caleb Brown
|
288155d6ac
|
Merge pull request 'feature/ball-sucker-trigger' (#22) from feature/ball-sucker-trigger into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/22
|
2024-04-23 16:50:36 +00:00 |
|
cbrown
|
a237c2efb1
|
Added Ball Attraction force trigger to hole
|
2024-04-23 12:35:13 -04:00 |
|
Kip Taylor
|
887ce10607
|
Merge branch 'development' into Obstical-Work
|
2024-04-23 12:27:12 -04:00 |
|
Noah
|
fa8889bc0f
|
save point
|
2024-04-23 12:12:01 -04:00 |
|
cbrown
|
ab04b76de0
|
Merge branch 'development' into feature/ball-sucker-trigger
|
2024-04-23 11:46:17 -04:00 |
|
Caleb Brown
|
417d74c484
|
Merge pull request 'feature/LoadingCourseOnPlane' (#21) from feature/LoadingCourseOnPlane into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/21
|
2024-04-23 15:43:36 +00:00 |
|
Noah
|
81310d0779
|
Merge branch 'development' into feature/LoadingCourseOnPlane
|
2024-04-23 11:15:29 -04:00 |
|
Noah
|
52f19289f1
|
Good To Go
|
2024-04-23 11:14:59 -04:00 |
|
Kip Taylor
|
6d2d1b116c
|
Fina laxe fixes
|
2024-04-23 11:12:08 -04:00 |
|
Kip Taylor
|
bc31e72110
|
Axe anime fix i Pray
|
2024-04-23 11:10:56 -04:00 |
|
cbrown
|
513fae84fb
|
Merge remote-tracking branch 'origin/feature/LoadingCourseOnPlane' into feature/ball-sucker-trigger
|
2024-04-23 11:07:00 -04:00 |
|
Caleb Brown
|
58bd883592
|
Merge pull request 'Swinging axe' (#19) from feature/Swinging-Axe into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/19
|
2024-04-23 14:51:12 +00:00 |
|
Kip Taylor
|
f3719571ae
|
Removing tax lab add
|
2024-04-23 10:31:06 -04:00 |
|
Kip Taylor
|
5ddfdbb64f
|
Swinging axe
|
2024-04-23 10:28:52 -04:00 |
|
Noah
|
1e0552bc57
|
Merge branch 'development' into feature/LoadingCourseOnPlane
|
2024-04-23 08:51:54 -04:00 |
|
Caleb Brown
|
16ee0da99f
|
Merge pull request 'Spear Trap' (#15) from feature/Spear-Trap into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/15
|
2024-04-22 19:46:53 +00:00 |
|
cbrown
|
3d4658f9a0
|
Merge branch 'development' into feature/Spear-Trap
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 15:42:34 -04:00 |
|
Caleb Brown
|
cfefb33d7e
|
Merge pull request 'HOTFIX: Removed half distance check on MoveFloor component' (#18) from hotfix/move-floor-distance-scale-check into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/18
|
2024-04-22 19:37:05 +00:00 |
|
cbrown
|
e6969d0805
|
HOTFIX: Removed half distance check on MoveFloor component
|
2024-04-22 15:32:35 -04:00 |
|
Caleb Brown
|
c0b0092845
|
Merge pull request 'feature/Swinging-Blade' (#14) from feature/Swinging-Blade into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/14
|
2024-04-22 19:11:05 +00:00 |
|
cbrown
|
ed3fc42dea
|
Merge branch 'development' into feature/Swinging-Blade
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 15:06:46 -04:00 |
|
Caleb Brown
|
711e73f8da
|
Merge pull request 'feature/Moving-Floor-Up-Down' (#13) from feature/Moving-Floor-Up-Down into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/13
|
2024-04-22 18:48:31 +00:00 |
|
cbrown
|
350fa0b8e8
|
Merge branch 'development' into feature/Moving-Floor-Up-Down
|
2024-04-22 14:43:59 -04:00 |
|
cbrown
|
d1fe9789eb
|
Small fix to the MoveFloor script
|
2024-04-22 14:43:40 -04:00 |
|
Caleb Brown
|
70c080ef60
|
Merge pull request 'Moving Floor Build' (#12) from feature/Moving-Floor into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/12
|
2024-04-22 18:14:24 +00:00 |
|
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 |
|