Noah
|
3b43d9b159
|
Merge branch 'development' into feature/RoomAlignment
|
2024-04-23 13:45:44 -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 |
|
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 |
|
Abraham Blain
|
90e040676f
|
Added bomb timeout
|
2024-04-23 11:45:53 -04: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 |
|
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 |
|
cbrown
|
3d4658f9a0
|
Merge branch 'development' into feature/Spear-Trap
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 15:42:34 -04:00 |
|
cbrown
|
e6969d0805
|
HOTFIX: Removed half distance check on MoveFloor component
|
2024-04-22 15:32:35 -04:00 |
|
cbrown
|
ed3fc42dea
|
Merge branch 'development' into feature/Swinging-Blade
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 15:06:46 -04:00 |
|
cbrown
|
d1fe9789eb
|
Small fix to the MoveFloor script
|
2024-04-22 14:43:40 -04: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
|
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 |
|
|
|
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 |
|
|
|
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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
Abraham
|
897d1055c6
|
Merge remote-tracking branch 'origin/development' into AR-Controls
|
2024-04-16 12:28:26 -04:00 |
|
