cbrown
|
7763de0276
|
Disabled mesh renderer
|
2024-04-23 17:14:14 -04:00 |
|
cbrown
|
59625219f5
|
Merge branch 'development' into feature/ardk-occlusion
|
2024-04-23 15:28:03 -04:00 |
|
cbrown
|
3e325e5855
|
WIP: ARDK Occlusion
|
2024-04-23 15:27:41 -04:00 |
|
Caleb Brown
|
e36570f22c
|
Merge pull request 'Obstical-Work' (#27) from Obstical-Work into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/27
|
2024-04-23 18:38:36 +00:00 |
|
Kip Taylor
|
7741e80828
|
Merge branch 'development' into Obstical-Work
# Conflicts:
# Assets/CoursePrefabs/AR Content Control Room 1.prefab
# Assets/CoursePrefabs/AR Content Green Room.prefab
# Assets/CoursePrefabs/AR Content Main Room 1.prefab
# Assets/Scenes/TAC Lab.unity
|
2024-04-23 14:34:07 -04:00 |
|
Caleb Brown
|
a73cf79b2f
|
Merge pull request 'Portraits' (#26) from feature/Portraits into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/26
|
2024-04-23 18:30:02 +00:00 |
|
Kip Taylor
|
8c84bc53bd
|
Merge branch 'development' into Obstical-Work
# Conflicts:
# Assets/CoursePrefabs/AR Content Green Room.prefab
# Assets/CoursePrefabs/AR Content Main Room 1.prefab
|
2024-04-23 14:28:32 -04:00 |
|
Abraham Blain
|
e5c75397f1
|
Merge remote-tracking branch 'origin/development' into feature/Portraits
|
2024-04-23 14:25:12 -04:00 |
|
Caleb Brown
|
24c8635300
|
Merge pull request 'Spear/Bomb placement' (#25) from feature/Placing-Spears-Bombs into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/25
|
2024-04-23 18:22:55 +00:00 |
|
Abraham Blain
|
bc540ea9da
|
Placed even more portraits
|
2024-04-23 14:22:18 -04:00 |
|
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 |
|
Abraham Blain
|
a3db22de46
|
Merge remote-tracking branch 'origin/development' into feature/Portraits
|
2024-04-23 14:16:37 -04:00 |
|
Abraham Blain
|
7723f53430
|
Merge remote-tracking branch 'origin/development' into feature/Placing-Spears-Bombs
|
2024-04-23 14:16:03 -04:00 |
|
Abraham Blain
|
8eb341167c
|
Placing more portraits
|
2024-04-23 14:15:40 -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 |
|
Abraham Blain
|
a48fc16087
|
Merge remote-tracking branch 'origin/development' into feature/Placing-Spears-Bombs
|
2024-04-23 13:56:00 -04:00 |
|
Kip Taylor
|
a80f8936d9
|
Green room updating and main room
|
2024-04-23 13:56:00 -04:00 |
|
Abraham Blain
|
feff763e73
|
reverted ar main room rotation
|
2024-04-23 13:55:26 -04:00 |
|
Noah
|
1176df33bb
|
move spawn points
|
2024-04-23 13:54:23 -04:00 |
|
Abraham Blain
|
4ee16e6538
|
Auto stash before merge of "origin/development" and "feature/Portraits"
|
2024-04-23 13:53:53 -04:00 |
|
Abraham Blain
|
8fb1caf7ea
|
Merge remote-tracking branch 'origin/development' into feature/Portraits
|
2024-04-23 13:47:18 -04:00 |
|
Abraham Blain
|
2a84b8ae49
|
Added camera looking portraits
|
2024-04-23 13:47:11 -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 |
|
Abraham Blain
|
482d1b17e3
|
added spear trap to main room
|
2024-04-23 11:55:44 -04:00 |
|
Abraham Blain
|
37ed1d1934
|
Merge branch 'development' into feature/Obstacles-On-Course
|
2024-04-23 11:48:10 -04:00 |
|
Abraham Blain
|
9c34971064
|
Updated from dev
|
2024-04-23 11:47:32 -04:00 |
|
cbrown
|
ab04b76de0
|
Merge branch 'development' into feature/ball-sucker-trigger
|
2024-04-23 11:46:17 -04:00 |
|
Abraham Blain
|
90e040676f
|
Added bomb timeout
|
2024-04-23 11:45:53 -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 |
|