Skip to content

Commit

Permalink
nameplate no longer has its collider reacting to other colliders
Browse files Browse the repository at this point in the history
  • Loading branch information
@dooly123
dooly123 committed Dec 24, 2024
1 parent 3bd763c commit c11d148
Show file tree
Hide file tree
Showing 15 changed files with 28 additions and 26 deletions.
Binary file modified Basis Server Export/BasisNetworkServer/bin/Debug/BasisNetworkServer.2.10.1.nupkg
View file
Binary file not shown.
Binary file modified Basis Server Export/BasisNetworkServer/bin/Debug/net9.0/BasisNetworkServer.dll
View file
Binary file not shown.
Binary file modified Basis Server Export/BasisNetworkServer/bin/Debug/netstandard2.1/BasisNetworkServer.dll
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions Basis Server/.vs/BasisNetworkServer/v17/DocumentLayout.backup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{51F765C5-646F-4F9E-B212-416E93E2E562}|BasisNetworkServer\\BasisNetworkServer.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkserver\\basisnetworkserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51F765C5-646F-4F9E-B212-416E93E2E562}|BasisNetworkServer\\BasisNetworkServer.csproj|solutionrelative:basisnetworkserver\\basisnetworkserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{3BFB9307-E78F-4277-ABE3-6762A2B69E19}|BasisServerConsole\\BasisNetworkConsole.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisserverconsole\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{3BFB9307-E78F-4277-ABE3-6762A2B69E19}|BasisServerConsole\\BasisNetworkConsole.csproj|solutionrelative:basisserverconsole\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{6972BF72-BE14-4C71-ABF3-6EF914FADEC8}|BasisNetworkClient\\BasisNetworkClient.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkclient\\basisnetworkclient.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{6972BF72-BE14-4C71-ABF3-6EF914FADEC8}|BasisNetworkClient\\BasisNetworkClient.csproj|solutionrelative:basisnetworkclient\\basisnetworkclient.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{51F765C5-646F-4F9E-B212-416E93E2E562}|BasisNetworkServer\\BasisNetworkServer.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkserver\\basisnetworkserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51F765C5-646F-4F9E-B212-416E93E2E562}|BasisNetworkServer\\BasisNetworkServer.csproj|solutionrelative:basisnetworkserver\\basisnetworkserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
Expand All @@ -26,7 +26,7 @@
"Children": [
{
"$type": "Document",
"DocumentIndex": 2,
"DocumentIndex": 0,
"Title": "BasisNetworkServer.cs",
"DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkServer\\BasisNetworkServer.cs",
"RelativeDocumentMoniker": "BasisNetworkServer\\BasisNetworkServer.cs",
Expand All @@ -45,7 +45,7 @@
"Children": [
{
"$type": "Document",
"DocumentIndex": 0,
"DocumentIndex": 1,
"Title": "Program.cs",
"DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisServerConsole\\Program.cs",
"RelativeDocumentMoniker": "BasisServerConsole\\Program.cs",
Expand All @@ -58,7 +58,7 @@
},
{
"$type": "Document",
"DocumentIndex": 1,
"DocumentIndex": 2,
"Title": "BasisNetworkClient.cs",
"DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkClient\\BasisNetworkClient.cs",
"RelativeDocumentMoniker": "BasisNetworkClient\\BasisNetworkClient.cs",
Expand Down
7 changes: 3 additions & 4 deletions Basis Server/.vs/BasisNetworkServer/v17/DocumentLayout.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"Title": "BasisNetworkServer.cs",
"DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkServer\\BasisNetworkServer.cs",
"RelativeDocumentMoniker": "BasisNetworkServer\\BasisNetworkServer.cs",
"ToolTip": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkServer\\BasisNetworkServer.cs",
"RelativeToolTip": "BasisNetworkServer\\BasisNetworkServer.cs",
"ToolTip": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkServer\\BasisNetworkServer.cs*",
"RelativeToolTip": "BasisNetworkServer\\BasisNetworkServer.cs*",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAAsAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-12-23T08:51:48.234Z",
Expand Down Expand Up @@ -66,8 +66,7 @@
"RelativeToolTip": "BasisNetworkClient\\BasisNetworkClient.cs",
"ViewState": "AgIAABMAAAAAAAAAAAAIwB8AAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-12-23T09:17:08.777Z",
"EditorCaption": ""
"WhenOpened": "2024-12-23T09:17:08.777Z"
}
]
}
Expand Down
Binary file modified Basis Server/BasisServerConsole/bin/Debug/net9.0/BasisNetworkConsole.dll
View file
Binary file not shown.
Binary file modified Basis Server/BasisServerConsole/bin/Debug/net9.0/BasisNetworkConsole.exe
View file
Binary file not shown.
Binary file modified Basis Server/BasisServerConsole/bin/Debug/net9.0/BasisNetworkServer.dll
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions Basis/Assets/Prefabs/UI/NamePlate.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 6303433917581043709}
- component: {fileID: 2997356888555999241}
- component: {fileID: 1896627236807073300}
m_Layer: 0
m_Layer: 7
m_Name: NamePlate
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -343,7 +343,7 @@ GameObject:
- component: {fileID: 5184453304049788598}
- component: {fileID: 7452980175506431666}
- component: {fileID: 4013479155598010129}
m_Layer: 0
m_Layer: 7
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -480,7 +480,7 @@ GameObject:
- component: {fileID: 7527943652107300493}
- component: {fileID: 3515079843213119928}
- component: {fileID: 5659242795811902284}
m_Layer: 0
m_Layer: 7
m_Name: NamePlate Button
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -602,7 +602,7 @@ GameObject:
- component: {fileID: 1095917590344183364}
- component: {fileID: 3561279427002928092}
- component: {fileID: 2027450512927559089}
m_Layer: 0
m_Layer: 7
m_Name: Loading Bar
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -677,7 +677,7 @@ GameObject:
- component: {fileID: 8797189551791246772}
- component: {fileID: 6296563450686865163}
- component: {fileID: 5913064765185686731}
m_Layer: 0
m_Layer: 7
m_Name: NamePlate Text
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 2 additions & 0 deletions Basis/Assets/Settings/ContentPoliceSelector.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,5 @@ MonoBehaviour:
- BasisTestRoundTrip
- UnityEngine.VFX.Utility.URPCameraBinder
- UnityEngine.Rendering.Universal.DecalProjector
- UnityEngine.VFX.VFXRenderer
- UnityEngine.VFX.VisualEffect
2 changes: 1 addition & 1 deletion Basis/Packages/Basis Framework/Device Management/BasisDeviceManagement.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public void SwitchMode(string newMode)
CurrentMode = newMode;
if (newMode != "Desktop" && newMode != "Exiting")
{
BasisCursorManagement.UnlockCursorBypassChecks();
BasisCursorManagement.UnlockCursorBypassChecks("Forceful Unlock From Device Management");
}
OnBootModeChanged?.Invoke(CurrentMode);

Expand Down
10 changes: 6 additions & 4 deletions Basis/Packages/Basis Framework/Device Management/Devices/BasisCursorManagement.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public static void LockCursor(string requestName)
Cursor.lockState = CursorLockMode.Locked;
Cursor.visible = false;
Debug.Log("Cursor Locked");
cursorLockRequests.Add(requestName);
OnCursorStateChange?.Invoke(CursorLockMode.Locked, false);
}

Expand All @@ -47,22 +48,23 @@ public static void UnlockCursor(string requestName)
{
if (ShouldIgnoreCursorRequests()) return;

InternalUnlockCursor();
InternalUnlockCursor(requestName);
}

/// <summary>
/// Unlocks the cursor and makes it visible. Bypasses checks that would have prevented it from being unlocked.
/// </summary>
public static void UnlockCursorBypassChecks()
public static void UnlockCursorBypassChecks(string requestName)
{
InternalUnlockCursor();
InternalUnlockCursor(requestName);
}

private static void InternalUnlockCursor()
private static void InternalUnlockCursor(string requestName)
{
Cursor.lockState = CursorLockMode.None;
Cursor.visible = true;
Debug.Log("Cursor Unlocked");
cursorLockRequests.Remove(requestName);
OnCursorStateChange?.Invoke(CursorLockMode.None, true);
}

Expand Down
2 changes: 1 addition & 1 deletion Basis/Packages/Basis Framework/UI/UI Panels/BasisHamburgerMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ public override void DestroyEvent()
BasisUINeedsVisibleTrackers.Instance.Remove(this);
}
}
}
}
5 changes: 2 additions & 3 deletions Basis/ProjectSettings/DynamicsManager.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--- !u!55 &1
PhysicsManager:
m_ObjectHideFlags: 0
serializedVersion: 17
serializedVersion: 18
m_Gravity: {x: 0, y: -9.81, z: 0}
m_DefaultMaterial: {fileID: 0}
m_BounceThreshold: 2
Expand All @@ -17,7 +17,7 @@ PhysicsManager:
m_EnableAdaptiveForce: 1
m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2
m_LayerCollisionMatrix: dfffffffdfffffffdfffffffdfffffffdfffffffc0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix: 5fffffff5fffffff5fffffff5fffffff5fffffff40ffffff7fffffff00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_SimulationMode: 0
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 1
Expand All @@ -28,7 +28,6 @@ PhysicsManager:
m_BroadphaseType: 0
m_FrictionType: 0
m_EnableEnhancedDeterminism: 1
m_EnableUnifiedHeightmaps: 1
m_ImprovedPatchFriction: 1
m_SolverType: 0
m_DefaultMaxAngularSpeed: 50
Expand Down
2 changes: 1 addition & 1 deletion Basis/ProjectSettings/ProjectSettings.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ PlayerSettings:
QNX:
Server:
Standalone: SETTINGS_MANAGER_UNIVERSAL;STEAMAUDIO_ENABLED;USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS;BASIS_OPENVR_SUPPORTED;AUDIOLINK;AUDIOLINK_V1
WebGL:
WebGL: STEAMAUDIO_ENABLED
Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS
XboxOne:
iPhone: STEAMAUDIO_ENABLED
Expand Down

0 comments on commit c11d148

Please sign in to comment.