Skip to content

Commit 2682853

Browse files
matheusamazonasmatheusamazonas
authored
🔀 Merge develop into main (pull request #3)
Release 1.0.2
2 parents d7439cc + b94cea2 commit 2682853

26 files changed

+191
-155
lines changed

‎Assets/Libraries/MinMaxRangeAttribute/Editor/SneakySquirrelLabs.MinMaxRangeAttribute.Editor.asmdef renamed to ‎Assets/Libraries/MinMaxRangeAttribute/Editor/LazySquirrelLabs.MinMaxRangeAttribute.Editor.asmdef

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "SneakySquirrelLabs.MinMaxRangeAttribute.Editor",
3-
"rootNamespace": "SneakySquirrelLabs.MinMaxRangeAttribute.Editor",
2+
"name": "LazySquirrelLabs.MinMaxRangeAttribute.Editor",
3+
"rootNamespace": "LazySquirrelLabs.MinMaxRangeAttribute.Editor",
44
"references": [
55
"GUID:397edf9bfe7ea4399b706e9ee953b982"
66
],

‎Assets/Libraries/MinMaxRangeAttribute/Editor/SneakySquirrelLabs.MinMaxRangeAttribute.Editor.asmdef.meta renamed to ‎Assets/Libraries/MinMaxRangeAttribute/Editor/LazySquirrelLabs.MinMaxRangeAttribute.Editor.asmdef.meta

File renamed without changes.

‎Assets/Libraries/MinMaxRangeAttribute/Editor/MinMaxRangeDrawer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using UnityEditor;
33
using UnityEngine;
44

5-
namespace SneakySquirrelLabs.MinMaxRangeAttribute.Editor
5+
namespace LazySquirrelLabs.MinMaxRangeAttribute.Editor
66
{
77
[CustomPropertyDrawer(typeof(MinMaxRangeAttribute))]
88
internal class MinMaxRangeDrawer : PropertyDrawer

‎Assets/Libraries/MinMaxRangeAttribute/SneakySquirrelLabs.MinMaxRangeAttribute.asmdef renamed to ‎Assets/Libraries/MinMaxRangeAttribute/LazySquirrelLabs.MinMaxRangeAttribute.asmdef

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "SneakySquirrelLabs.MinMaxRangeAttribute",
3-
"rootNamespace": "SneakySquirrelLabs.MinMaxRangeAttribute",
2+
"name": "LazySquirrelLabs.MinMaxRangeAttribute",
3+
"rootNamespace": "LazySquirrelLabs.MinMaxRangeAttribute",
44
"references": [],
55
"includePlatforms": [],
66
"excludePlatforms": [],

‎Assets/Libraries/MinMaxRangeAttribute/SneakySquirrelLabs.MinMaxRangeAttribute.asmdef.meta renamed to ‎Assets/Libraries/MinMaxRangeAttribute/LazySquirrelLabs.MinMaxRangeAttribute.asmdef.meta

File renamed without changes.

‎Assets/Libraries/MinMaxRangeAttribute/MinMaxRangeAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using UnityEngine;
33

4-
namespace SneakySquirrelLabs.MinMaxRangeAttribute
4+
namespace LazySquirrelLabs.MinMaxRangeAttribute
55
{
66
/// <summary>
77
/// An attribute that simplifies defining bounded ranges (ranges with minimum and maximum limits) on the inspector.

‎Assets/Libraries/MinMaxRangeAttribute/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "com.sneakysquirrellabs.minmaxrangeattribute",
3-
"version": "1.0.1",
2+
"name": "com.lazysquirrellabs.minmaxrangeattribute",
3+
"version": "1.0.2",
44
"displayName": "Min/max range attribute",
55
"description": "A bounded (i.e., with a minimum and maximum) range attribute for Unity's Vector2 and Vector2Int fields.",
66
"unity": "2021.3",

‎Assets/Settings/URP-Balanced-Renderer.asset

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,28 @@ MonoBehaviour:
1313
m_Name: SSAO
1414
m_EditorClassIdentifier:
1515
m_Active: 1
16-
m_Shader: {fileID: 0}
1716
m_Settings:
17+
AOMethod: 1
1818
Downsample: 1
1919
AfterOpaque: 0
2020
Source: 0
2121
NormalSamples: 0
2222
Intensity: 0.5
2323
DirectLightingStrength: 0.25
2424
Radius: 0.25
25-
SampleCount: 4
25+
Samples: 2
26+
BlurQuality: 0
27+
Falloff: 100
28+
SampleCount: -1
29+
m_BlueNoise256Textures:
30+
- {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
31+
- {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
32+
- {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
33+
- {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
34+
- {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
35+
- {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
36+
- {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
37+
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
2638
--- !u!114 &11400000
2739
MonoBehaviour:
2840
m_ObjectHideFlags: 0
@@ -38,23 +50,33 @@ MonoBehaviour:
3850
debugShaders:
3951
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
4052
type: 3}
53+
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
4154
m_RendererFeatures:
4255
- {fileID: -1878332245247344467}
4356
m_RendererFeatureMap: adc0de57c6d2eee5
4457
m_UseNativeRenderPass: 0
4558
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
59+
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
4660
shaders:
4761
blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
4862
copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
4963
screenSpaceShadowPS: {fileID: 0}
5064
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
5165
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
5266
fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
67+
fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
5368
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
54-
coreBlitPS: {fileID: 0}
55-
coreBlitColorAndDepthPS: {fileID: 0}
56-
cameraMotionVector: {fileID: 0}
57-
objectMotionVector: {fileID: 0}
69+
coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
70+
coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b,
71+
type: 3}
72+
blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
73+
cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf,
74+
type: 3}
75+
objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
76+
type: 3}
77+
dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
78+
type: 3}
79+
m_AssetVersion: 2
5880
m_OpaqueLayerMask:
5981
serializedVersion: 2
6082
m_Bits: 4294967295
@@ -71,6 +93,6 @@ MonoBehaviour:
7193
m_ShadowTransparentReceive: 1
7294
m_RenderingMode: 0
7395
m_DepthPrimingMode: 0
96+
m_CopyDepthMode: 0
7497
m_AccurateGbufferNormals: 0
75-
m_ClusteredRendering: 0
76-
m_TileSize: 32
98+
m_IntermediateTextureMode: 1

‎Packages/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
"dependencies": {
3-
"com.unity.ide.rider": "3.0.26",
4-
"com.unity.render-pipelines.universal": "14.0.9",
3+
"com.unity.ide.rider": "3.0.31",
4+
"com.unity.render-pipelines.universal": "14.0.11",
55
"com.unity.test-framework": "1.1.33",
6-
"com.unity.textmeshpro": "3.0.6",
76
"com.unity.ugui": "1.0.0",
87
"com.unity.modules.ai": "1.0.0",
98
"com.unity.modules.androidjni": "1.0.0",
@@ -36,5 +35,6 @@
3635
"com.unity.modules.vr": "1.0.0",
3736
"com.unity.modules.wind": "1.0.0",
3837
"com.unity.modules.xr": "1.0.0"
39-
}
38+
},
39+
"scopedRegistries": []
4040
}

‎Packages/packages-lock.json

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"dependencies": {
33
"com.unity.burst": {
4-
"version": "1.8.9",
4+
"version": "1.8.17",
55
"depth": 1,
66
"source": "registry",
77
"dependencies": {
8-
"com.unity.mathematics": "1.2.1"
8+
"com.unity.mathematics": "1.2.1",
9+
"com.unity.modules.jsonserialize": "1.0.0"
910
},
1011
"url": "https://packages.unity.com"
1112
},
@@ -17,7 +18,7 @@
1718
"url": "https://packages.unity.com"
1819
},
1920
"com.unity.ide.rider": {
20-
"version": "3.0.26",
21+
"version": "3.0.31",
2122
"depth": 0,
2223
"source": "registry",
2324
"dependencies": {
@@ -33,7 +34,7 @@
3334
"url": "https://packages.unity.com"
3435
},
3536
"com.unity.render-pipelines.core": {
36-
"version": "14.0.9",
37+
"version": "14.0.11",
3738
"depth": 1,
3839
"source": "builtin",
3940
"dependencies": {
@@ -44,14 +45,23 @@
4445
}
4546
},
4647
"com.unity.render-pipelines.universal": {
47-
"version": "14.0.9",
48+
"version": "14.0.11",
4849
"depth": 0,
4950
"source": "builtin",
5051
"dependencies": {
5152
"com.unity.mathematics": "1.2.1",
52-
"com.unity.burst": "1.8.4",
53-
"com.unity.render-pipelines.core": "14.0.9",
54-
"com.unity.shadergraph": "14.0.9"
53+
"com.unity.burst": "1.8.9",
54+
"com.unity.render-pipelines.core": "14.0.11",
55+
"com.unity.shadergraph": "14.0.11",
56+
"com.unity.render-pipelines.universal-config": "14.0.9"
57+
}
58+
},
59+
"com.unity.render-pipelines.universal-config": {
60+
"version": "14.0.10",
61+
"depth": 1,
62+
"source": "builtin",
63+
"dependencies": {
64+
"com.unity.render-pipelines.core": "14.0.10"
5565
}
5666
},
5767
"com.unity.searcher": {
@@ -62,11 +72,11 @@
6272
"url": "https://packages.unity.com"
6373
},
6474
"com.unity.shadergraph": {
65-
"version": "14.0.9",
75+
"version": "14.0.11",
6676
"depth": 1,
6777
"source": "builtin",
6878
"dependencies": {
69-
"com.unity.render-pipelines.core": "14.0.9",
79+
"com.unity.render-pipelines.core": "14.0.11",
7080
"com.unity.searcher": "4.9.2"
7181
}
7282
},
@@ -81,15 +91,6 @@
8191
},
8292
"url": "https://packages.unity.com"
8393
},
84-
"com.unity.textmeshpro": {
85-
"version": "3.0.6",
86-
"depth": 0,
87-
"source": "registry",
88-
"dependencies": {
89-
"com.unity.ugui": "1.0.0"
90-
},
91-
"url": "https://packages.unity.com"
92-
},
9394
"com.unity.ugui": {
9495
"version": "1.0.0",
9596
"depth": 0,

‎ProjectSettings/AudioManager.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ AudioManager:
1212
m_DSPBufferSize: 1024
1313
m_VirtualVoiceCount: 512
1414
m_RealVoiceCount: 32
15+
m_EnableOutputSuspension: 1
1516
m_SpatializerPlugin:
1617
m_AmbisonicDecoderPlugin:
1718
m_DisableAudio: 0

‎ProjectSettings/BurstAotSettings_Android.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"MonoBehaviour": {
3+
"Version": 4,
4+
"EnableBurstCompilation": true,
5+
"EnableOptimisations": true,
6+
"EnableSafetyChecks": false,
7+
"EnableDebugInAllBuilds": false,
8+
"DebugDataKind": 1,
9+
"EnableArmv9SecurityFeatures": false,
10+
"CpuMinTargetX32": 0,
11+
"CpuMaxTargetX32": 0,
12+
"CpuMinTargetX64": 0,
13+
"CpuMaxTargetX64": 0,
14+
"CpuTargetsArm64": 512,
15+
"OptimizeFor": 0
16+
}
17+
}

‎ProjectSettings/BurstAotSettings_StandaloneOSX.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"MonoBehaviour": {
3+
"Version": 4,
4+
"EnableBurstCompilation": true,
5+
"EnableOptimisations": true,
6+
"EnableSafetyChecks": false,
7+
"EnableDebugInAllBuilds": false,
8+
"DebugDataKind": 1,
9+
"EnableArmv9SecurityFeatures": false,
10+
"CpuMinTargetX32": 0,
11+
"CpuMaxTargetX32": 0,
12+
"CpuMinTargetX64": 0,
13+
"CpuMaxTargetX64": 0,
14+
"CpuTargetsX64": 72,
15+
"OptimizeFor": 0
16+
}
17+
}

‎ProjectSettings/BurstAotSettings_iOS.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"MonoBehaviour": {
3+
"Version": 4,
4+
"EnableBurstCompilation": true,
5+
"EnableOptimisations": true,
6+
"EnableSafetyChecks": false,
7+
"EnableDebugInAllBuilds": false,
8+
"DebugDataKind": 1,
9+
"EnableArmv9SecurityFeatures": false,
10+
"CpuMinTargetX32": 0,
11+
"CpuMaxTargetX32": 0,
12+
"CpuMinTargetX64": 0,
13+
"CpuMaxTargetX64": 0,
14+
"OptimizeFor": 0
15+
}
16+
}

‎ProjectSettings/CommonBurstAotSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"MonoBehaviour": {
3-
"Version": 3,
3+
"Version": 4,
44
"DisabledWarnings": ""
55
}
66
}

‎ProjectSettings/DynamicsManager.asset

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
--- !u!55 &1
44
PhysicsManager:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 13
6+
serializedVersion: 14
77
m_Gravity: {x: 0, y: -9.81, z: 0}
88
m_DefaultMaterial: {fileID: 0}
99
m_BounceThreshold: 2
10+
m_DefaultMaxDepenetrationVelocity: 10
1011
m_SleepThreshold: 0.005
1112
m_DefaultContactOffset: 0.01
1213
m_DefaultSolverIterations: 6
@@ -18,9 +19,10 @@ PhysicsManager:
1819
m_ClothInterCollisionStiffness: 0.2
1920
m_ContactsGeneration: 1
2021
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
21-
m_AutoSimulation: 1
22+
m_SimulationMode: 0
2223
m_AutoSyncTransforms: 0
2324
m_ReuseCollisionCallbacks: 0
25+
m_InvokeCollisionCallbacks: 1
2426
m_ClothInterCollisionSettingsToggle: 0
2527
m_ClothGravity: {x: 0, y: -9.81, z: 0}
2628
m_ContactPairsMode: 0
@@ -32,5 +34,7 @@ PhysicsManager:
3234
m_FrictionType: 0
3335
m_EnableEnhancedDeterminism: 0
3436
m_EnableUnifiedHeightmaps: 1
37+
m_ImprovedPatchFriction: 0
3538
m_SolverType: 0
3639
m_DefaultMaxAngularSpeed: 50
40+
m_FastMotionThreshold: 3.4028235e+38

‎ProjectSettings/EditorSettings.asset

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,45 @@
33
--- !u!159 &1
44
EditorSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 9
7-
m_ExternalVersionControlSupport: Visible Meta Files
6+
serializedVersion: 12
87
m_SerializationMode: 2
98
m_LineEndingsForNewScripts: 2
109
m_DefaultBehaviorMode: 0
1110
m_PrefabRegularEnvironment: {fileID: 0}
1211
m_PrefabUIEnvironment: {fileID: 0}
1312
m_SpritePackerMode: 0
13+
m_SpritePackerCacheSize: 10
1414
m_SpritePackerPaddingPower: 1
15+
m_Bc7TextureCompressor: 0
1516
m_EtcTextureCompressorBehavior: 1
1617
m_EtcTextureFastCompressor: 1
1718
m_EtcTextureNormalCompressor: 2
1819
m_EtcTextureBestCompressor: 4
1920
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp
2021
m_ProjectGenerationRootNamespace:
21-
m_CollabEditorSettings:
22-
inProgressEnabled: 1
2322
m_EnableTextureStreamingInEditMode: 1
2423
m_EnableTextureStreamingInPlayMode: 1
24+
m_EnableEditorAsyncCPUTextureLoading: 0
2525
m_AsyncShaderCompilation: 1
26+
m_PrefabModeAllowAutoSave: 1
2627
m_EnterPlayModeOptionsEnabled: 0
2728
m_EnterPlayModeOptions: 3
28-
m_ShowLightmapResolutionOverlay: 1
29+
m_GameObjectNamingDigits: 1
30+
m_GameObjectNamingScheme: 0
31+
m_AssetNamingUsesSpace: 1
32+
m_InspectorUseIMGUIDefaultInspector: 0
2933
m_UseLegacyProbeSampleCount: 0
34+
m_SerializeInlineMappingsOnOneLine: 0
35+
m_DisableCookiesInLightmapper: 1
3036
m_AssetPipelineMode: 1
37+
m_RefreshImportMode: 0
3138
m_CacheServerMode: 0
3239
m_CacheServerEndpoint:
3340
m_CacheServerNamespacePrefix: default
3441
m_CacheServerEnableDownload: 1
3542
m_CacheServerEnableUpload: 1
43+
m_CacheServerEnableAuth: 0
44+
m_CacheServerEnableTls: 0
45+
m_CacheServerValidationMode: 2
46+
m_CacheServerDownloadBatchSize: 128
47+
m_EnableEnlightenBakedGI: 0

0 commit comments

Comments
 (0)