|
|
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 |
|
Joshua Latham
|
eb64e39a12
|
Merge pull request 'QR Code (TrackedImage) Course loading (Sample)' (#6) from feature/QR-Code into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/6
|
2024-04-17 21:00:58 +00:00 |
|
Joshua Latham
|
974e293bb3
|
Added more props from the Horror pack
|
2024-04-17 16:14:47 -04:00 |
|
cbrown
|
a65c3e4947
|
Updated courses sample scene to use the same 2 qr codes (just in a different reference library asset)
Also added Unity.Logging package and a very simple controller script
|
2024-04-17 15:30:37 -04:00 |
|
Joshua Latham
|
bcbbf97dd1
|
Added AR Content prefabs for first two holes. Still WIP
|
2024-04-17 13:23:41 -04:00 |
|
cbrown
|
a6ab9510f6
|
Added additional trackable image for a course
|
2024-04-17 12:55:05 -04:00 |
|
cbrown
|
9b3fe41fa0
|
Updated Renderer asset to include DebugAxes layer that will render on top of everything
|
2024-04-17 12:52:35 -04:00 |
|
cbrown
|
9a213bcaca
|
Removed old duplicate hole prefab
|
2024-04-17 12:51:05 -04:00 |
|
cbrown
|
cd7f9b740e
|
Updated Stencil sample scene
|
2024-04-17 12:30:02 -04:00 |
|
cbrown
|
687aca50c1
|
Moved Atoms assets
|
2024-04-17 12:29:39 -04:00 |
|
cbrown
|
4e65f9d551
|
Added XRContent tarball back
|
2024-04-17 12:01:12 -04:00 |
|
cbrown
|
5ce0af8bd1
|
Fixed Merge conflict
|
2024-04-17 12:00:54 -04:00 |
|
cbrown
|
177cfc1906
|
Merge branch 'development' into feature/QR-Code
# Conflicts:
# Assets/Prefabs/Hole/Hole.prefab
# Assets/Scenes/TestControls.unity
# Assets/Scripts/DeactivateColliderOnTrigger.cs
# Assets/Scripts/DeactivateColliderOnTrigger.cs.meta
# Assets/Scripts/OnColliderTrigger.cs
# Assets/Scripts/OnColliderTrigger.cs.meta
# Assets/Scripts/OnTrigger.cs
# Assets/Scripts/OnTrigger.cs.meta
|
2024-04-17 11:53:48 -04:00 |
|
Joshua Latham
|
6f0cfc88d7
|
Merge pull request 'CourseDesign' (#7) from CourseDesign into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/7
|
2024-04-17 15:42:31 +00:00 |
|
Joshua Latham
|
62539f6b6d
|
Merge branch 'development' into CourseDesign
|
2024-04-17 11:26:29 -04:00 |
|
Joshua Latham
|
a981e6dcba
|
Merge pull request 'feature/AR-Anchoring' (#5) from feature/AR-Anchoring into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/5
|
2024-04-17 15:14:45 +00:00 |
|
cbrown
|
d33742af13
|
🤷
|
2024-04-17 10:46:42 -04:00 |
|
cbrown
|
933b11cd75
|
Update to the XREnvironments
|
2024-04-17 10:44:52 -04:00 |
|
cbrown
|
275668133a
|
Moved QRCode stuff to Sample folder
|
2024-04-17 10:43:07 -04:00 |
|
cbrown
|
37c11b88b2
|
TrackedImages: Sample scene for multiple tracked images
|
2024-04-17 10:11:13 -04:00 |
|
Joshua Latham
|
ced869f4bc
|
Main room first draft
|
2024-04-16 23:31:30 -04:00 |
|
Joshua Latham
|
2093d37e54
|
Merge remote-tracking branch 'origin/hotfix/kickout-hole' into CourseDesign
|
2024-04-16 21:29:58 -04:00 |
|
Joshua Latham
|
be12f171f8
|
Control room course first draft.
|
2024-04-16 18:10:27 -04:00 |
|
Joshua Latham
|
78160aba2f
|
Merge branch 'feature/AR-Anchoring' into CourseDesign
|
2024-04-16 17:08:34 -04:00 |
|
