Mathew/Emberwild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/inport-props' into feat/craft-discovery

Browse Source 
# Conflicts:
#	Assets/External/Animated PBR Chest Demo/Materials/WoodChest.mat
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta
This commit is contained in:
Mathew
2026-07-25 19:42:26 +02:00
parent 0052b0d98e f47baf957e
commit 78bfdf2828
954 changed files with 999772 additions and 26193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/External/NV3D/Shatter Stone/Shared/Scripts/DemoClickInteraction.cs
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
using UnityEngine;
#if ENABLE_INPUT_SYSTEM && UNITY_INPUT_SYSTEM_EXISTS
#if ENABLE_INPUT_SYSTEM
using UnityEngine.InputSystem;
#endif
@@ -24,7 +24,7 @@ namespace ShatterStone
bool inputPressed = false;
Vector2 pointerPos = default;
#if ENABLE_INPUT_SYSTEM && UNITY_INPUT_SYSTEM_EXISTS
#if ENABLE_INPUT_SYSTEM
if (Mouse.current != null && Mouse.current.leftButton.wasPressedThisFrame)
{
inputPressed = true;
Assets/External/NV3D/Shatter Stone/Shared/Scripts/DemoClickInteraction.cs.meta
Vendored
+3 -3
View File
@@ -4,6 +4,6 @@ AssetOrigin:
serializedVersion: 1
productId: 291300
packageName: 'Shatter Stone: Stylized Gemstones'
packageVersion: 1.2
assetPath: Assets/NV3D/Shatter Stone/Shared/Scripts/DemoClickInteraction.cs
uploadId: 765288
packageVersion: 3.0.0
assetPath: Assets/External/NV3D/Shatter Stone/Shared/Scripts/DemoClickInteraction.cs
uploadId: 886884
Assets/External/NV3D/Shatter Stone/Shared/Scripts/MiningNodeAudio.cs.meta
Vendored
+3 -3
View File
@@ -4,6 +4,6 @@ AssetOrigin:
serializedVersion: 1
productId: 291300
packageName: 'Shatter Stone: Stylized Gemstones'
packageVersion: 1.2
assetPath: Assets/NV3D/Shatter Stone/Shared/Scripts/MiningNodeAudio.cs
uploadId: 765288
packageVersion: 3.0.0
assetPath: Assets/External/NV3D/Shatter Stone/Shared/Scripts/MiningNodeAudio.cs
uploadId: 886884
Assets/External/NV3D/Shatter Stone/Shared/Scripts/OreNode.cs.meta
Vendored
+3 -3
View File
@@ -4,6 +4,6 @@ AssetOrigin:
serializedVersion: 1
productId: 291300
packageName: 'Shatter Stone: Stylized Gemstones'
packageVersion: 1.2
assetPath: Assets/NV3D/Shatter Stone/Shared/Scripts/OreNode.cs
uploadId: 765288
packageVersion: 3.0.0
assetPath: Assets/External/NV3D/Shatter Stone/Shared/Scripts/OreNode.cs
uploadId: 886884
Assets/External/NV3D/Shatter Stone/Shared/Scripts/PickaxeTrigger.cs.meta
Vendored
+3 -3
View File
@@ -4,6 +4,6 @@ AssetOrigin:
serializedVersion: 1
productId: 291300
packageName: 'Shatter Stone: Stylized Gemstones'
packageVersion: 1.2
assetPath: Assets/NV3D/Shatter Stone/Shared/Scripts/PickaxeTrigger.cs
uploadId: 765288
packageVersion: 3.0.0
assetPath: Assets/External/NV3D/Shatter Stone/Shared/Scripts/PickaxeTrigger.cs
uploadId: 886884
Assets/External/NV3D/Shatter Stone/Shared/Scripts/PickupController.cs.meta
Vendored
+3 -3
View File
@@ -4,6 +4,6 @@ AssetOrigin:
serializedVersion: 1
productId: 291300
packageName: 'Shatter Stone: Stylized Gemstones'
packageVersion: 1.2
assetPath: Assets/NV3D/Shatter Stone/Shared/Scripts/PickupController.cs
uploadId: 765288
packageVersion: 3.0.0
assetPath: Assets/External/NV3D/Shatter Stone/Shared/Scripts/PickupController.cs
uploadId: 886884
Assets/External/NV3D/Shatter Stone/Shared/Scripts/ShatterCleanUp.cs.meta
Vendored
+3 -3
View File
@@ -4,6 +4,6 @@ AssetOrigin:
serializedVersion: 1
productId: 291300
packageName: 'Shatter Stone: Stylized Gemstones'
packageVersion: 1.2
assetPath: Assets/NV3D/Shatter Stone/Shared/Scripts/ShatterCleanUp.cs
uploadId: 765288
packageVersion: 3.0.0
assetPath: Assets/External/NV3D/Shatter Stone/Shared/Scripts/ShatterCleanUp.cs
uploadId: 886884