Abraham Blain
f8823fbeb7
fixed connection bug
2023-07-21 11:13:25 -04:00
Abraham Blain
3d0b77c7f1
added checks to server client code
2023-07-20 16:56:36 -04:00
Noah
166c7bd633
MAVRIC-1961 Save Point
2023-07-20 15:17:15 -04:00
Abraham Blain
98272b74d4
Incorporated AR-Netcode merge into demo scene
2023-07-19 22:36:14 -04:00
Noah
f97854018b
Merge branch 'netcode-update' into feature/MAVRIC-1961_Create_Animations
2023-07-19 13:12:09 -04:00
Abraham Blain
4f0e72af9b
added arfoundation submodule
2023-07-18 15:13:16 -04:00
Abraham Blain
72ccc1e92e
integrated AR-Netcode
2023-07-18 15:08:29 -04:00
Abraham Blain
950e095470
imported netcode package, created netcode-AR integration scene
2023-07-18 15:08:11 -04:00
Calderon, Noah F
990e839191
Merged PR 2009: MAVRIC-1959 Added most of the videos
...
MAVRIC-1959 Added most of the videos
Related work items: #1959 , #1960
2023-07-14 09:56:36 -04:00
Calderon, Noah
30a04cef61
MAVRIC-1959 remove pointless stop
2023-07-14 08:22:49 -04:00
Calderon, Noah
de1eb72af8
MAVRIC-1959 Added most of the videos
2023-07-13 17:24:26 -04:00
Blain, Abraham
275f10d37e
Merged PR 2008: Task 1988: AR Functionality
...
Updated and Installed Relevant AR packages for AR functionality, and test scene with AR session and XR session
Related work items: #1988
2023-07-11 12:10:47 -04:00
Abraham Blain
c2d6d65477
Merge remote-tracking branch 'origin/development' into AR-Update
2023-07-11 10:53:02 -04:00
Abraham Blain
1234636b60
Removed MAVRIC definitions editor package and added camera desc.
2023-07-11 10:52:34 -04:00
Calderon, Noah F
e626947fb6
Merged PR 2007: Add Warning Page
...
Added warning page and made it the first step
Related work items: #1991
2023-07-11 08:34:05 -04:00
Abraham Blain
b0c3ed3f7e
removed conflicting file lines
2023-07-10 11:44:20 -04:00
Abraham Blain
96b7fbf380
Revert "commited xr editor settings asset change"
...
This reverts commit 44889cc62a
2023-07-10 11:40:37 -04:00
Abraham Blain
44889cc62a
commited xr editor settings asset change
2023-07-10 11:21:31 -04:00
Abraham Blain
f6d1c4c476
updated ar packages again after merge
2023-07-06 21:40:23 -04:00
Abraham Blain
e188d7fdc3
Merge remote-tracking branch 'origin/development' into AR-Update
2023-07-06 21:30:17 -04:00
Abraham Blain
03cf0497f4
updated ui extensions
2023-07-06 21:27:55 -04:00
Calderon, Noah
786553fcf9
MAVRIC-1991 Clean Up
2023-07-06 15:39:26 -04:00
Calderon, Noah
a539b714ce
Merge branch 'development' into feature/MAVRIC-1991_Add_Warning_Step
2023-07-06 13:16:24 -04:00
Brown, Caleb M
a4bcb68e18
Merged PR 2004: MAVRIC-1986: Added Hololens UX Step controls
...
Created a Hololens version of the UI the @<UDRI\caldernf> created for the tablets (using the MAVRIC UX package). You should be able to move the content slates around by dragging them. You should also be able to pin the step controller nav bar in place, and unpin to anchor it to you.
To run:
- Switch to UWP (ARM64) platform
- Ensure `Hololens.scene` is the first index in the build settings
- Build & Run using device portal (or Build then sideload the application)
**COMMITS:**
- MAVRIC-1986: Added Odin Inspector
- MAVRIC-1986: Added MRTK3 packages
- MAVRIC-1986: Added an embedded version of MAVRIC UX package
- MAVRIC-1986: [WIP] Building Hololens UX prefabs for Step Controller stuff
- MAVRIC-1986: Created "slate" prefabs for flat content like videos or images
- Merge branch 'development' into feature/MAVRIC-1986_Hololens-UX-Components
- MAVRIC-1986: removed Unity Atoms SOs
- MAVRIC-1986: Updated project settings
- MAVRIC-1896: Fixed a couple of bugs with the startup/controller code
- MAVRIC-1986: Updated Hololens Content Slate prefabs
Related work items: #1986
2023-07-06 12:38:18 -04:00
Abraham Blain
fba6427caf
updated ar settings and test scene
2023-07-05 23:18:10 -04:00
Abraham Blain
65dbe7823a
Added AR packages
2023-07-05 22:41:42 -04:00
Calderon, Noah
0ace5addbf
MAVRIC-1991 Added Warning step
2023-07-05 15:55:42 -04:00
Brown, Caleb M
c95091d992
MAVRIC-1986: Changed default active state of step description slate
2023-07-05 15:16:52 -04:00
Brown, Caleb M
c777693a8c
MAVIRC-1986: Changed the title label
2023-07-05 15:05:58 -04:00
Brown, Caleb M
8cf7e2a07b
MAVRIC-1986: Added a Content Slate for the Step Description
2023-07-05 15:03:26 -04:00
Brown, Caleb M
b9d54a6ece
MAVRIC-1986: Updated Hololens Content Slate prefabs
2023-07-05 13:10:11 -04:00
Brown, Caleb M
c6c356c35a
MAVRIC-1896: Fixed a couple of bugs with the startup/controller code
2023-07-05 13:08:32 -04:00
Brown, Caleb M
8c26788441
MAVRIC-1986: Updated project settings
2023-07-05 13:06:38 -04:00
Brown, Caleb M
27a27d724b
MAVRIC-1986: removed Unity Atoms SOs
2023-07-05 13:04:43 -04:00
Brown, Caleb M
cd2b31a07f
Merge branch 'development' into feature/MAVRIC-1986_Hololens-UX-Components
...
# Conflicts:
# Assets/Prefabs.meta
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectSettings.asset
2023-07-05 06:37:47 -04:00
Calderon, Noah F
ecc18f2402
Merged PR 1997: Added work instructions and documents
...
Related work items: #1956 , #1957 , #1987
2023-07-03 15:10:51 -04:00
Calderon, Noah
e43d5c7726
MAVRIC-1957 video panel
2023-07-03 14:53:46 -04:00
Calderon, Noah
e6da468454
MAVRIC-1957 update video and document
2023-07-03 14:52:06 -04:00
Calderon, Noah
d9fd99c80e
MAVRIC-1957 Added MainScreen prefab to EOS
2023-07-03 13:40:46 -04:00
Calderon, Noah
c684bf0297
MAVRIC-1957 maybe this time....
2023-07-03 13:38:16 -04:00
Calderon, Noah
c5972c55af
MAVRIC-1957 update ui
2023-07-03 13:11:49 -04:00
Calderon, Noah
a74a263a12
MAVRIC-1957 face palm
2023-07-03 13:02:35 -04:00
Calderon, Noah
45a988f51c
MAVRIC-1957 Update UI
2023-07-03 12:55:46 -04:00
Calderon, Noah
df13955626
Merge branch 'development' into feature/MAVRIC-1957_Create_Work_Instructions
2023-07-03 12:52:12 -04:00
Calderon, Noah F
809bd98090
Merged PR 1996: Added simple frame work and eos data
...
the document will turn out black in editor play but if you build it the material will populate correctly. the resolution for the game view is ipad 3 gen 2048 by 1536(this is the specs for the Ipad). there will look like a gap in between the top, middle, and bottom view areas. But once again building to the ipad it will be corrected...apple...ugh
2023-07-03 12:45:29 -04:00
Calderon, Noah
759e66a83e
MAVRIC-1957 clean up
2023-07-03 12:34:33 -04:00
Calderon, Noah
eea8828f00
Merge branch 'feature/MAVRIC_1985_Add_EOS' into feature/MAVRIC-1957_Create_Work_Instructions
2023-07-03 12:32:04 -04:00
Calderon, Noah
8cb4321f12
Removed submodule Packages/Stratasys-Fortus-450mc-Equipment
2023-07-03 12:31:40 -04:00
Calderon, Noah
18e5727e7d
MAVRIC-1985 added layout groups to UI
2023-07-03 09:51:55 -04:00
Calderon, Noah
a3c1fe4f94
MAVRIC-1985 delete something
2023-07-03 09:21:42 -04:00
