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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
