Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ready to roll for this week #159

Merged
merged 2 commits into from
Feb 22, 2025
Merged

ready to roll for this week #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c7044
fixed build export
dooly123 Feb 21, 2025
fb4b7bb
swapped require opaque and depth
dooly123 Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Basis/Assets/Basis/Settings/Quality Settiings/Modified - Desktop.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ MonoBehaviour:
m_RendererDataList:
- {fileID: 11400000, guid: c40be3174f62c4acf8c1216858c64956, type: 2}
m_DefaultRendererIndex: 0
m_RequireDepthTexture: 0
m_RequireOpaqueTexture: 0
m_RequireDepthTexture: 1
m_RequireOpaqueTexture: 1
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 0
m_SupportsHDR: 1
Expand Down
6 changes: 0 additions & 6 deletions Basis/Packages/com.basis.framework/UI/BasisUIRaycast.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
using Basis.Scripts.Addressable_Driver;
using Basis.Scripts.Addressable_Driver.Enums;
using Basis.Scripts.Addressable_Driver.Factory;
using Basis.Scripts.Addressable_Driver.Resource;
using Basis.Scripts.BasisSdk.Helpers;
using Basis.Scripts.Device_Management;
using Basis.Scripts.Device_Management.Devices;
using Basis.Scripts.Drivers;
using Mono.Cecil;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.EventSystems;
Expand Down
14 changes: 4 additions & 10 deletions Basis/Packages/com.basis.sdk/Prefabs/Boot/BootManager.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2573,12 +2573,6 @@ MonoBehaviour:
DefaultSaveType:
Platform: 0
SaveType: JSON
OnSettingsSaving:
m_PersistentCalls:
m_Calls: []
OnSettingsSaved:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1625421887690667428
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2776,11 +2770,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
Selector: {fileID: 11400000, guid: 8393424ebf34934449c2d1309a700837, type: 2}
DefaultScene:
UnlockPassword: 5c8d2db15f1e02f48065a251e0c2fe3793c17bb6572738a368266d2441c5075a
UnlockPassword:
BasisRemoteBundleEncrypted:
IsLocal: 0
MetaURL: https://BasisFramework.b-cdn.net/Worlds/Vulkan/e6e2d3bd-6a1c-40f1-bb9f-fe4545e839f7_638755878022685920.BasisEncyptedMeta
BundleURL: https://BasisFramework.b-cdn.net/Worlds/Vulkan/e6e2d3bd-6a1c-40f1-bb9f-fe4545e839f7_638755878022685920.BasisEncyptedBundle
MetaURL:
BundleURL:
BasisLocalEncryptedBundle:
LocalMetaFile:
LocalBundleFile:
Expand Down Expand Up @@ -2814,4 +2808,4 @@ MonoBehaviour:
AssetToLoadName: LoadingAvatar
AssetBundleCRC: 0
UseAddressablesToLoadScene: 0
UseSceneProvidedHere: 1
UseSceneProvidedHere: 0
2 changes: 1 addition & 1 deletion Basis/Packages/com.basis.sdk/Prefabs/UI/HamBurgerMenu.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
m_PresetInfoIsWorld: 0
--- !u!114 &1722851449925555937
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Basis/Packages/com.basis.tests/Interactable/PlayerInteract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private void OnInputRemoved(BasisInput input)
private void PollSystem()
{
#if UNITY_EDITOR//just remove when your profiling this
Profiler.BeginSample("Interactable System");
UnityEngine.Profiling.Profiler.BeginSample("Interactable System");
#endif
if (InteractInputs == null)
{
Expand Down Expand Up @@ -230,7 +230,7 @@ private void PollSystem()
}
}
#if UNITY_EDITOR//just remove when your profiling this
Profiler.EndSample();
UnityEngine.Profiling.Profiler.EndSample();
#endif
}

Expand Down
Loading