Cody Wright 97bc98470b Merge branch 'development' into feature/2177-Update-Lighting ... # Conflicts: # Assets/Prefabs/LabSpace.prefab # Assets/Scenes/BasicScene.unity # Assets/Scenes/BasicScene/LightingData.asset # Assets/Scenes/BasicScene/Lightmap-0_comp_dir.png # Assets/Scenes/BasicScene/Lightmap-0_comp_light.exr # Assets/Scenes/BasicScene/Lightmap-1_comp_dir.png # Assets/Scenes/BasicScene/Lightmap-1_comp_light.exr # Assets/Scenes/BasicScene/Lightmap-2_comp_dir.png # Assets/Scenes/BasicScene/Lightmap-2_comp_light.exr # Assets/Scenes/BasicScene/ReflectionProbe-0.exr		2024-01-24 11:52:18 -05:00
..
Packages	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
AudioManager.asset	Meta quest hands free	2023-12-13 11:47:31 -05:00
BurstAotSettings_Android.json	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
BurstAotSettings_StandaloneWindows.json	Fixed teleportation. Hands are offset from the head now though.	2023-11-06 23:32:54 -05:00
BurstAotSettings_WSAPlayer.json	Fixed direction and interaction of Ray interactors on hands. Continuing to work on teleportation	2023-11-10 16:50:09 -05:00
ClusterInputManager.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
CommonBurstAotSettings.json	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
DynamicsManager.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
EditorBuildSettings.asset	Fixed Scenes	2023-12-14 15:16:14 -05:00
EditorSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
GraphicsSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
InputManager.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
MemorySettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
NavMeshAreas.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
PackageManagerSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Physics2DSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
PresetManager.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
ProjectSettings.asset	Checking	2024-01-05 16:00:12 -05:00
ProjectVersion.txt	Update to 3.17 Unity version	2024-01-18 14:33:32 -05:00
QualitySettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
SceneTemplateSettings.json	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
ShaderGraphSettings.asset	WIP: Adding dynamic lights	2024-01-16 15:18:22 -05:00
TagManager.asset	Fixed teleportation. Hands are offset from the head now though.	2023-11-06 23:32:54 -05:00
TimelineSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
TimeManager.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
UnityConnectSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
URPProjectSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
VersionControlSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
VFXManager.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
XRPackageSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
XRSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00