Skip to content

Commit

Permalink
Update Project to 2020.2 / 10.3 (#10)
Browse files Browse the repository at this point in the history
* Updated to 2020.2.0f1 / 10.2.2

* Fixed Missing Animation manager

* Ignored more files

* Fixed DropFire missing motion vector map

* Fixed old broken CRTs (1/2 remove old assets)

* Fixed old broken CRTs (2/2 new assets + rebuilt lighting)

* Removed Local Packages

* Removed (Again) SceneIDMap Game objects

* Added Profiles for PC-Linux & Windows (Run as Vulkan)

* De-Verbosed Subtitle Manager (now relies on setting)

* Updated Project Version

* Fixed Potential Divide by 0 by using safe normalize

* Fixed "BestFit" warning

* Fixed null toggle object

* Fixed shader error for loading indicator

* Fixed null entry in ToggleGameObjectAction

* Fixed Ring Divid by Zero

* Updated Gameplay Ingredients to 2020.2.1

* Fixed CoreRoom Lookout Cookie

* Silenced SubtitleManager disable logging when not verbose

* Adjusted HIT_FINAL Time Scale because of new timing management.

* Updated Project to 2020.2.3f1 / HDRP 10.3

* Updated to 2020.2.4f1 / HDRP 10.3.1 / Gameplay Ingredients 2020.2.0 / Console 1.3.0

* Updated Changelog

* Renamed Build items and Categories

* Updated Readme

* Updated to latest 2020.2.4f1/10.3.1

* Fixed Play mode that was incorrectly running after a benchmark run.

* Updated Release Date

Co-authored-by: Thomas ICHÉ <[email protected]>
Co-authored-by: Ludovic Theobald <[email protected]>
  • Loading branch information
3 people authored and GitHub Enterprise committed Feb 17, 2021
1 parent 45ab436 commit c0d4ff3
Show file tree
Hide file tree
Showing 1,231 changed files with 51,004 additions and 236,201 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,7 @@ Assets/_DoNotShip*
*.sav
.p4ignore
UNITY_EDITOR_VERSION.txt
UserSettings
.vsconfig
ProjectSettings/SceneTemplateSettings.json
Packages/packages-lock.json
10 changes: 8 additions & 2 deletions Assets/Audio/Script/Cues/SubtitleManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ public void PlaySubtitles(Subtitle[] subs)
private IEnumerator SubtitleHideCouroutine(float time)
{
yield return new WaitForSeconds(time);
Debug.Log("[SubtitleManager] Disabled Subtitle");

if (GameplayIngredientsSettings.currentSettings.verboseCalls)
Debug.Log("[SubtitleManager] Disabled Subtitle");

SubtitleContainer.SetActive(false);
SubtitleText.text = "";
LayoutRebuilder.MarkLayoutForRebuild(SubtitleContainer.GetComponent<RectTransform>());
Expand All @@ -92,7 +95,10 @@ private IEnumerator SubtitleHideCouroutine(float time)
private IEnumerator SubtitleShowCouroutine(string text, float time)
{
yield return new WaitForSeconds(time);
Debug.Log(string.Format("[SubtitleManager] Set Subtitle : '{0}' at time {1}",text,time));

if(GameplayIngredientsSettings.currentSettings.verboseCalls)
Debug.Log(string.Format("[SubtitleManager] Set Subtitle : '{0}' at time {1}",text,time));

SubtitleContainer.SetActive(true);
SubtitleText.text = text;
LayoutRebuilder.MarkLayoutForRebuild(SubtitleContainer.GetComponent<RectTransform>());
Expand Down
22 changes: 22 additions & 0 deletions Assets/BuildSettings/SpaceshipDemo/PC-Linux64-Debug.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c7d5bb3f971603247917785e7ea66453, type: 3}
m_Name: PC-Linux64-Debug
m_EditorClassIdentifier:
Name: Linux64 (Debug)
Category: Linux
BuildPath: Build/Linux64/Debug/
ExecutableName: Spaceship.run
CleanupBeforeBuild: 1
RunWithArguments:
Profile: {fileID: 11400000, guid: fc49fef63f852b04f80a8aa8a2c4d1da, type: 2}
SceneList: {fileID: 11400000, guid: dd790fd6ec20f15478b7a5c9a4052538, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions Assets/BuildSettings/SpaceshipDemo/PC-Linux64-Release.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c7d5bb3f971603247917785e7ea66453, type: 3}
m_Name: PC-Linux64-Release
m_EditorClassIdentifier:
Name: Linux64 (Release)
Category: Linux
BuildPath: Build/Linux64/Release/
ExecutableName: Spaceship.run
CleanupBeforeBuild: 1
RunWithArguments:
Profile: {fileID: 11400000, guid: a97c95b303f81b840bec700f2c58b748, type: 2}
SceneList: {fileID: 11400000, guid: dd790fd6ec20f15478b7a5c9a4052538, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/BuildSettings/SpaceshipDemo/PC-Win64-Benchmark.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c7d5bb3f971603247917785e7ea66453, type: 3}
m_Name: PC-Win64-Benchmark
m_EditorClassIdentifier:
Name: Automated Benchmark (Release)
Category: PC
Name: Win64 - Automated Benchmark (Release)
Category: Windows
BuildPath: Build/Win64/Benchmark/
ExecutableName: Spaceship.exe
CleanupBeforeBuild: 1
Expand Down
3 changes: 2 additions & 1 deletion Assets/BuildSettings/SpaceshipDemo/PC-Win64-Debug.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ MonoBehaviour:
m_Name: PC-Win64-Debug
m_EditorClassIdentifier:
Name: Win64 (Debug)
Category: PC
Category: Windows
BuildPath: Build/Win64/Debug/
ExecutableName: SpaceshipVFXDemo-DEBUG.exe
CleanupBeforeBuild: 1
RunWithArguments:
Profile: {fileID: 11400000, guid: 9aceaa5f2b385a649bb95fc57851fa35, type: 2}
SceneList: {fileID: 11400000, guid: dd790fd6ec20f15478b7a5c9a4052538, type: 2}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c7d5bb3f971603247917785e7ea66453, type: 3}
m_Name: PC-Win64-Release-RunAsVulkan
m_EditorClassIdentifier:
Name: Win64 (Release, run as Vulkan)
Category: Windows
BuildPath: Build/Win64/Release/
ExecutableName: Spaceship.exe
CleanupBeforeBuild: 1
RunWithArguments: --force-vulkan
Profile: {fileID: 11400000, guid: e4477d07ca6209547874cb1be39ae63d, type: 2}
SceneList: {fileID: 11400000, guid: dd790fd6ec20f15478b7a5c9a4052538, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Assets/BuildSettings/SpaceshipDemo/PC-Win64-Release.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ MonoBehaviour:
m_Name: PC-Win64-Release
m_EditorClassIdentifier:
Name: Win64 (Release)
Category: PC
Category: Windows
BuildPath: Build/Win64/Release/
ExecutableName: Spaceship.exe
CleanupBeforeBuild: 1
RunWithArguments:
Profile: {fileID: 11400000, guid: e4477d07ca6209547874cb1be39ae63d, type: 2}
SceneList: {fileID: 11400000, guid: dd790fd6ec20f15478b7a5c9a4052538, type: 2}
18 changes: 18 additions & 0 deletions Assets/BuildSettings/SpaceshipDemo/Profiles/PC-Linux64-Debug.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62b860e5f224c0d49b730dc9c1365211, type: 3}
m_Name: PC-Linux64-Debug
m_EditorClassIdentifier:
Name:
Category: Linux
DevPlayer: 1
Target: 24

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions Assets/BuildSettings/SpaceshipDemo/Profiles/PC-Linux64.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62b860e5f224c0d49b730dc9c1365211, type: 3}
m_Name: PC-Linux64
m_EditorClassIdentifier:
Name:
Category: Linux
DevPlayer: 0
Target: 24

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/BuildSettings/SpaceshipDemo/macOS-Release.asset
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ MonoBehaviour:
BuildPath: Build/macOS/Release/
ExecutableName: SpaceshipVFXDemo.app
CleanupBeforeBuild: 1
RunWithArguments:
Profile: {fileID: 11400000, guid: da7dc22888395f849acd99edb8e09cf7, type: 2}
SceneList: {fileID: 11400000, guid: dd790fd6ec20f15478b7a5c9a4052538, type: 2}
35 changes: 19 additions & 16 deletions Assets/Environment/Decals/LeakingDecal_01.mat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 2
version: 11
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand All @@ -22,7 +22,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: LeakingDecal_01
m_Shader: {fileID: 4800000, guid: 1d64af84bdc970c4fae0c1e06dd95b73, type: 3}
m_ShaderKeywords: _ALBEDOCONTRIBUTION _COLORMAP _MASKMAP
m_ShaderKeywords: _COLORMAP _MASKMAP _MATERIAL_AFFECTS_ALBEDO _MATERIAL_AFFECTS_MASKMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
Expand All @@ -34,13 +34,8 @@ Material:
- TransparentDepthPostpass
- TransparentBackface
- MOTIONVECTORS
- DBufferMesh_M
- DBufferMesh_AO
- DBufferMesh_MAO
- DBufferMesh_MAOS
- DBufferMesh_MS
- DBufferMesh_AOS
- Mesh_Emissive
- DecalProjectorForwardEmissive
- DecalMeshForwardEmissive
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -129,11 +124,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AO: 1
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
- _AffectAO: 0
- _AffectAlbedo: 1
- _AffectEmission: 0
- _AffectMetal: 0
- _AffectNormal: 0
- _AffectSmoothness: 1
- _AlbedoAffectEmissive: 0
- _AlbedoMode: 1
- _AlphaCutoff: 0.5
- _AlphaCutoffEnable: 0
- _AlphaCutoffPostpass: 0.5
Expand All @@ -145,6 +146,10 @@ Material:
- _CullModeForward: 2
- _Cutoff: 0.5
- _DecalBlend: 0.346
- _DecalColorMask0: 15
- _DecalColorMask1: 0
- _DecalColorMask2: 3
- _DecalColorMask3: 0
- _DecalMaskMapBlueScale: 1
- _DecalMeshDepthBias: 0
- _DecalStencilRef: 16
Expand Down Expand Up @@ -177,7 +182,6 @@ Material:
- _DrawOrder: 0
- _DstBlend: 0
- _EditorExpendedAreas: 2.28e-43
- _Emissive: 0
- _EmissiveColorMode: 1
- _EmissiveExposureWeight: 1
- _EmissiveIntensity: 1
Expand Down Expand Up @@ -205,14 +209,11 @@ Material:
- _IridescenceMask: 1
- _IridescenceThickness: 1
- _LinkDetailsWithBase: 1
- _MaskBlendMode: 4
- _MaskBlendSrc: 1
- _MaskmapAO: 0
- _MaskmapMetal: 0
- _MaskmapSmoothness: 1
- _MaterialID: 1
- _Metallic: 0
- _MetallicScale: 1
- _MetallicRemapMax: 1
- _MetallicRemapMin: 0
- _NormalBlendSrc: 0
- _NormalMapSpace: 0
- _NormalScale: 1
Expand Down Expand Up @@ -252,6 +253,7 @@ Material:
- _UVBase: 0
- _UVDetail: 0
- _UVEmissive: 0
- _Unity_Identify_HDRP_Decal: 1
- _UseEmissiveIntensity: 0
- _ZTestDepthEqualForOpaque: 3
- _ZTestGBuffer: 4
Expand All @@ -273,3 +275,4 @@ Material:
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
Loading

0 comments on commit c0d4ff3

Please sign in to comment.