Merge branch 'main' of https://github.com/firez2469/station_obscurum_temp

2023-05-31 12:51:46 -04:00 · 2023-05-31 12:51:46 -04:00 · d804182020
commit d804182020
parent 8dd1b574a7 660805d5c0
9 changed files with 32 additions and 30 deletions
--- a/Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta
+++ b/Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 246f31a0e00fea74a93125fec6d80da8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta
+++ b/Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2ad85b0f43f25f1499c27a4dca23ddd8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Materials/FlashlightLit.mat
+++ b/Assets/Materials/FlashlightLit.mat
@ -206,7 +206,7 @@ Material:
    - _StencilWriteMask: 6
    - _StencilWriteMaskDepth: 8
    - _StencilWriteMaskGBuffer: 14
-    - _StencilWriteMaskMV: 42
+    - _StencilWriteMaskMV: 40
    - _SubsurfaceMask: 1
    - _SupportDecals: 1
    - _SurfaceType: 0
--- a/Assets/Materials/Levels/Level0/CeilLightMaterial.mat
+++ b/Assets/Materials/Levels/Level0/CeilLightMaterial.mat
@ -206,7 +206,7 @@ Material:
    - _StencilWriteMask: 6
    - _StencilWriteMaskDepth: 8
    - _StencilWriteMaskGBuffer: 14
-    - _StencilWriteMaskMV: 42
+    - _StencilWriteMaskMV: 40
    - _SubsurfaceMask: 1
    - _SupportDecals: 1
    - _SurfaceType: 0
--- a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta
+++ b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 96a44475794fb6445a6f3c4b9ee13966
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta
+++ b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0957b521a08374f4aa508231735153bc
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -10,6 +10,7 @@
    "com.unity.test-framework": "1.1.31",
    "com.unity.textmeshpro": "3.0.6",
    "com.unity.timeline": "1.6.4",
+    "com.unity.toolchain.linux-x86_64": "2.0.5",
    "com.unity.ugui": "1.0.0",
    "com.unity.visualscripting": "1.8.0",
    "com.unity.modules.ai": "1.0.0",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@ -150,6 +150,22 @@
        "com.unity.searcher": "4.9.1"
      }
    },
+    "com.unity.sysroot": {
+      "version": "2.0.6",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.sysroot.linux-x86_64": {
+      "version": "2.0.5",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "2.0.6"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.test-framework": {
      "version": "1.1.31",
      "depth": 0,
@ -192,6 +208,16 @@
      },
      "url": "https://packages.unity.com"
    },
+    "com.unity.toolchain.linux-x86_64": {
+      "version": "2.0.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "2.0.6",
+        "com.unity.sysroot.linux-x86_64": "2.0.5"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.ugui": {
      "version": "1.0.0",
      "depth": 0,
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -342,6 +342,9 @@ PlayerSettings:
  - m_BuildTarget: WebGLSupport
    m_APIs: 0b000000
    m_Automatic: 1
+  - m_BuildTarget: LinuxStandaloneSupport
+    m_APIs: 1500000011000000
+    m_Automatic: 0
  m_BuildTargetVRSettings:
  - m_BuildTarget: Standalone
    m_Enabled: 0