caleb-brown/UDRIGEEKCup2024
1
0
Fork 0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-22 07:08:51 -05:00
Code Releases Activity
59 Commits 32 Branches 1 Tag 618 MiB
961d177a2e
Commit Graph

59 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cbrown
88a97eef70 Merge remote-tracking branch 'origin/feature/AR-Anchoring' into hotfix/kickout-hole 
# Conflicts:
#	Assets/Scenes/TestControls.unity
 2024-04-16 17:02:04 -04:00
cbrown
547524f267 HOTFIX: Fixed hole collider/ball interaction 2024-04-16 16:34:39 -04:00
cbrown
0f16bba9af HOTFIX: Fixed through hole collisions 2024-04-16 16:23:46 -04:00
Abraham
3c4857dd18 adjusted floor position 2024-04-16 16:21:35 -04:00
cbrown
1db33f4af1 Hotfix: exported fbx for kickout_hole 2024-04-16 15:49:32 -04:00
cbrown
6b34f941fb WIP 2024-04-16 15:39:29 -04:00
Abraham
434f0dd5fc has ar content anchor to camera rotation, as well 2024-04-16 14:56:32 -04:00
Abraham
4d625f1977 Added terrain physics script to greens 2024-04-16 14:32:09 -04:00
Abraham
01ed438924 Auto stash before merge of "AR-Controls" and "origin/development" 2024-04-16 14:31:01 -04:00
Abraham
a6c2ed783a Added basic ar anchoring 2024-04-16 14:30:43 -04:00
cbrown
875c921d18 Minor Refactor to the hole trigger componet 2024-04-16 14:11:13 -04:00
Joshua Latham
173dc55e7e Merge branch 'development' into CourseDesign 2024-04-16 14:00:20 -04:00
Abraham
40749464d4 Merge remote-tracking branch 'origin/development' into AR-Controls 2024-04-16 13:57:43 -04:00
Abraham
b839e7a41b parented ar content under single transform for easy positioning 2024-04-16 13:57:36 -04:00
Joshua Latham
6102279e90 Added Dungeon content and reference scans 2024-04-16 13:20:50 -04:00
Caleb Brown
99b6677ebe Merge pull request 'Created Golf Control system' (#1) from AR-Controls into development 
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/1
 2024-04-16 16:51:57 +00:00
Abraham
897d1055c6 Merge remote-tracking branch 'origin/development' into AR-Controls 2024-04-16 12:28:26 -04:00
Abraham
2a436692f4 added probuilder to fix merge conflict 2024-04-16 12:27:41 -04:00
Caleb Brown
34e8b2ae94 Merge pull request 'MAVRIC-2471: Added Stencil Buffer (Hole) and create Sample StencilBuffer example scene' (#2) from feature/MAVRIC-2471 into development 
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/2
 2024-04-16 15:34:00 +00:00
cbrown
00269d1f31 MAVRIC-2471: Added basic material to the Hole Mesh 2024-04-16 11:24:00 -04:00
cbrown
9ec5baa352 MAVRIC-2471: Added Stencil Buffer (Hole) and create Sample StencilBuffer example scene 2024-04-16 11:17:09 -04:00
Abraham
ecf1043028 Added variable resetter 2024-04-16 10:31:20 -04:00
Abraham
c2b607572f reset variables and changed scene reloader to use string 2024-04-16 09:36:59 -04:00
Abraham
a67e679f2c Fixed stroke counter not updating 2024-04-16 09:31:29 -04:00
Abraham
3a5f9ea5a3 ball reposition 2024-04-15 21:48:56 -04:00