Skip to content

Commit

Permalink
Merge pull request #38 from shnok/unity6_upgrade
Browse files Browse the repository at this point in the history 
Unity6 upgrade
  • Loading branch information
@shnok
shnok authored Aug 31, 2024
2 parents cd90bb4 + 554d88e commit 9a19344
Show file tree
Hide file tree
Showing 2,351 changed files with 68,975 additions and 22,116 deletions.
21 changes: 21 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,27 @@ l2-unity/[Ll]ibrary/PlayerDataCache/
l2-unity/[Ll]ibrary/ScriptMapper/
l2-unity/[Ll]ogs/

# Lighting data
/[Aa]ssets/Scenes/**/LightingData.asset
/[Aa]ssets/Scenes/**/*.giparams
/[Aa]ssets/Scenes/**/LightingData/
/[Aa]ssets/ProbeVolumes/

# Adaptive Probe Volumes specific

# EXR files

*.bytes
*.bytes.meta
Lightmap-*.exr
*ReflectionProbe*.exr
*ReflectionProbe*.exr.meta
ProbeVolumes*.exr
ProbeVolumes*.exr.meta

# Optionally include global lighting settings
!/[Aa]ssets/Settings/LightingSettings.asset

# Autogenerated VS/MD solution and project files
ExportedObj/
.vscode/
Expand Down
12 changes: 6 additions & 6 deletions l2-unity/Assets/Plugins/FMOD/src/RuntimeUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ public static FMOD.ATTRIBUTES_3D To3DAttributes(Transform transform, Rigidbody r

if (rigidbody)
{
attributes.velocity = rigidbody.velocity.ToFMODVector();
attributes.velocity = rigidbody.linearVelocity.ToFMODVector();
}

return attributes;
Expand All @@ -408,7 +408,7 @@ public static FMOD.ATTRIBUTES_3D To3DAttributes(GameObject go, Rigidbody rigidbo

if (rigidbody)
{
attributes.velocity = rigidbody.velocity.ToFMODVector();
attributes.velocity = rigidbody.linearVelocity.ToFMODVector();
}

return attributes;
Expand All @@ -423,8 +423,8 @@ public static FMOD.ATTRIBUTES_3D To3DAttributes(Transform transform, Rigidbody2D
if (rigidbody)
{
FMOD.VECTOR vel;
vel.x = rigidbody.velocity.x;
vel.y = rigidbody.velocity.y;
vel.x = rigidbody.linearVelocity.x;
vel.y = rigidbody.linearVelocity.y;
vel.z = 0;
attributes.velocity = vel;
}
Expand All @@ -440,8 +440,8 @@ public static FMOD.ATTRIBUTES_3D To3DAttributes(GameObject go, Rigidbody2D rigid
if (rigidbody)
{
FMOD.VECTOR vel;
vel.x = rigidbody.velocity.x;
vel.y = rigidbody.velocity.y;
vel.x = rigidbody.linearVelocity.x;
vel.y = rigidbody.linearVelocity.y;
vel.z = 0;
attributes.velocity = vel;
}
Expand Down
6 changes: 4 additions & 2 deletions l2-unity/Assets/Plugins/URP-WaterShaders/Materials/Shore.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -108,6 +109,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &2300210307794994053
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -120,4 +122,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
6 changes: 4 additions & 2 deletions l2-unity/Assets/Plugins/URP-WaterShaders/Materials/Submerged.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -108,6 +109,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &2300210307794994053
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -120,4 +122,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
12 changes: 7 additions & 5 deletions l2-unity/Assets/Plugins/URP-WaterShaders/Materials/Surface.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -82,10 +83,10 @@ Material:
m_Ints: []
m_Floats:
- Vector1_1E64D73: -0.1
- Vector1_1F362672: 4.42
- Vector1_3EB94769: 0.075
- Vector1_1F362672: 1.22
- Vector1_3EB94769: 0.131
- Vector1_7412AF8D: 1
- Vector1_7AC8BAD: 0.773
- Vector1_7AC8BAD: 0.897
- Vector1_8D88546F: 8.04
- Vector1_921AC543: 0
- Vector1_9C9A14CF: 3.74
Expand Down Expand Up @@ -125,6 +126,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &3383497384417615173
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -137,4 +139,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
9 changes: 5 additions & 4 deletions l2-unity/Assets/Plugins/URP-WaterShaders/Materials/Suzanne.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Suzanne
m_Shader: {fileID: -6465566751694194690, guid: 2363321b77a7b8b4b863e2a51def12b0,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 2363321b77a7b8b4b863e2a51def12b0, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
Expand All @@ -19,7 +18,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -109,6 +109,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &2300210307794994053
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -121,4 +122,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
6 changes: 4 additions & 2 deletions l2-unity/Assets/Plugins/URP-WaterShaders/Materials/Tank.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ Material:
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -120,6 +121,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &2375298481193936963
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -132,4 +134,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
Loading

0 comments on commit 9a19344

Please sign in to comment.