Commit Graph

23 Commits

Author SHA1 Message Date
dd089d2b22 Merge Conflicts & Override Changes
Override changes for the entire room to ensure heirchary conflicts are solved and static / no static issues.
Deleted Emergency button
Rebaked lighting
Checked general static issues
Aside from canvas and buttons / backboard Did not mess with any other tutorial objects
2024-01-12 14:23:01 -05:00
d1b85234a7 Merge branch 'development' into test/input-test
All seems to be running correctly. Took my side of the changes for the two conflicts. Had to re add lfs files
2024-01-11 09:45:52 -05:00
Cody Wright
b4656bf24a Fixed watch texture
added the missing watch texture and corrected the watch orientation
2024-01-09 15:38:27 -05:00
Cody Wright
2000dd89b7 Watch in position
The watch is in the correct position and shows the time
2024-01-09 13:22:13 -05:00
Cody Wright
1ade2108d7 Updated watch model
WIP: working on trying to move watch position to right wrist and follow its position and rotation
2024-01-08 15:01:39 -05:00
Cody Wright
2316a316a0 Revert "Add Watch To Wrist"
This reverts commit 7cbfb62cf4.
2024-01-05 16:51:53 -05:00
bb85b2ab81 Checking
Setup getting it functioning, works
added the sdk fix
2024-01-05 16:00:12 -05:00
Cody Wright
7cbfb62cf4 Add Watch To Wrist
WIP: added watch to right hand but the origin for watch is off and causes the watch to be ofset from the wrist
2024-01-05 12:43:58 -05:00
bddafeb271 Added locomotion input testing
- Added teleport to new and old scene
- Bugged movement for controller
2023-12-14 15:07:14 -05:00
6d12cb95f3 Meta quest hands free
- Added Hands free support
- Added pinch and touch and wheel support
- ALL but movement and teleporting works , still some small bugs other than that
2023-12-13 11:47:31 -05:00
345ac8d576 Added meta quest movement
- Added metaquest movement with L/R
- Retargeted to android
2023-11-29 08:49:07 -05:00
Joshua Latham
77c551632d Added stick movement to left hand to adjust position and hopefullly fixed buttons in stand alone build 2023-11-08 11:56:01 -05:00
Joshua Latham
96bf6a2156 Stratasys MC450 VR v1.0 2023-11-08 00:49:01 -05:00
Joshua Latham
554d7b5caa Added furnishings prefabs, models, and materials 2023-11-07 21:36:29 -05:00
Joshua Latham
323a6b5b86 First pass at updated room design 2023-11-07 18:37:30 -05:00
Joshua Latham
e39ed3d013 Reorganized prefabs and test scenes. 2023-11-07 13:22:50 -05:00
Joshua Latham
d72630105f Fixed teleportation. Hands are offset from the head now though. 2023-11-06 23:32:54 -05:00
Joshua Latham
a99f7bccad Added prefabe with hands for player 2023-11-06 10:22:50 -05:00
Joshua Latham
d7c13a014a Updated lighting 2023-11-06 07:20:30 -05:00
Joshua Latham
9e1b249f4a Updated room model and lighting 2023-11-03 14:14:26 -04:00
Noah
33ae462d75 MAVRIC changing out spool 2023-11-01 12:19:10 -04:00
Noah
bab3773862 added model and prefabs 2023-11-01 10:51:29 -04:00
Joshua Latham
1dea5a0c4c Adding XR project and BasicScene for Stratasys development 2023-10-30 08:42:18 -04:00