Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2019.4 lts switch #174

Open
wants to merge 3 commits into
base: release/2019.4-LTS
Choose a base branch
from
Open

Release/2019.4 lts switch #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff2faa2
Project runs with 2019.4-LTS
pkpatel001 Sep 2, 2020
cfb15c5
for use on Nintendo Switch
ImanCol Mar 26, 2022
f40d525
litle update
ImanCol Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .vsconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
3 changes: 2 additions & 1 deletion Assets/AddressableAssetsData/AddressableAssetSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_DefaultGroup: ae971df5c2b654af9a3670c7d1a6fc27
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
m_DisableCatalogUpdateOnStart: 0
m_UniqueBundleIds: 0
m_UniqueBundleIds: 1
m_RemoteCatalogBuildPath:
m_Id:
m_RemoteCatalogLoadPath:
Expand Down
2 changes: 1 addition & 1 deletion .../scenes/_levels/level_Island/Terrain.meta → Assets/AddressableAssetsData/Switch.meta
View file
Open in desktop

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

Binary file added Assets/AddressableAssetsData/Switch/addressables_content_state.bin
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions Assets/AddressableAssetsData/Switch/addressables_content_state.bin.meta
View file
Open in desktop

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

96 changes: 0 additions & 96 deletions Assets/Data/InputControls.inputactions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
"processors": "AxisDeadzone(min=0.1,max=1)",
"interactions": ""
},
{
"name": "Time",
"type": "Value",
"id": "637a3778-b50e-41a0-8669-f7b1698fc4ca",
"expectedControlType": "",
"processors": "AxisDeadzone(min=0.1,max=1)",
"interactions": ""
},
{
"name": "Steering",
"type": "Value",
Expand Down Expand Up @@ -387,94 +379,6 @@
"action": "Freeze",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b7d3341c-7abe-48e6-a68e-b27eb3927b79",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Time",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "Dpad horizontal",
"id": "3c94f068-2cc6-4d07-a76a-3835151e0b0e",
"path": "1DAxis",
"interactions": "",
"processors": "",
"groups": "",
"action": "Time",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "negative",
"id": "aa687506-3f38-4cdc-8f14-f77ce23789d9",
"path": "<Gamepad>/dpad/left",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Time",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "positive",
"id": "59cadf6b-f60d-4a7e-9b9c-a21ecfdfb51e",
"path": "<Gamepad>/dpad/right",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Time",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Keyboard",
"id": "e8db53d1-5ded-40fe-965b-727f321a403a",
"path": "1DAxis",
"interactions": "",
"processors": "",
"groups": "",
"action": "Time",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "negative",
"id": "d5357c68-6b8a-4c12-996c-801c5a015beb",
"path": "<Keyboard>/1",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Time",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "positive",
"id": "9a495693-8098-4d83-b2d6-711526e83c37",
"path": "<Keyboard>/2",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Time",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "38dc845f-f219-4b56-947c-542a4cf33da6",
"path": "<Touchscreen>/primaryTouch/tapCount",
"interactions": "MultiTap",
"processors": "",
"groups": "TouchScreen",
"action": "Time",
"isComposite": false,
"isPartOfComposite": false
}
]
}
Expand Down
26 changes: 26 additions & 0 deletions Assets/InputSystem.inputsettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
%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: c46f07b5ed07e4e92aa78254188d3d10, type: 3}
m_Name: InputSystem.inputsettings
m_EditorClassIdentifier:
m_SupportedDevices: []
m_UpdateMode: 1
m_CompensateForScreenOrientation: 1
m_FilterNoiseOnCurrent: 0
m_DefaultDeadzoneMin: 0.125
m_DefaultDeadzoneMax: 0.925
m_DefaultButtonPressPoint: 0.5
m_DefaultTapTime: 0.2
m_DefaultSlowTapTime: 0.5
m_DefaultHoldTime: 0.4
m_TapRadius: 5
m_MultiTapDelayTime: 0.75
8 changes: 8 additions & 0 deletions Assets/InputSystem.inputsettings.asset.meta
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions Assets/Materials/BushTest.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ Material:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.11320739, g: 0.11320739, b: 0.11320739, a: 0.5}
m_BuildTextureStacks: []
- _SpecColor: {r: 0.11320736, g: 0.11320736, b: 0.11320736, a: 0.5}
--- !u!114 &7331025373869863914
MonoBehaviour:
m_ObjectHideFlags: 11
Expand Down
Binary file modified Assets/Objects/Levels/Island/Terrain_1_0.asset
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Material:
m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3}
m_ShaderKeywords: _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Material:
m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3}
m_ShaderKeywords: _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Material:
m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3}
m_ShaderKeywords: _GLOSSINESS_FROM_BASE_ALPHA _NORMALMAP _SPECULAR_COLOR
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Material:
m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Material:
m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Objects/environment/Clouds/Clouds.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Material:
type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Objects/environment/Trees/Materials/Bushes.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Material:
m_ShaderKeywords: BOOLEAN_5C6B42CA_ON BOOLEAN_D0D03BFD_ON VERTEX_ANIMATION_ON _CORRECTNORMALS
_NORMALMAP _VERTEXANIMATION
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
Expand Down
3 changes: 2 additions & 1 deletion Assets/Objects/environment/Trees/Materials/Trees.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Material:
m_ShaderKeywords: BOOLEAN_5C6B42CA_ON BOOLEAN_D0D03BFD_ON VERTEX_ANIMATION_ON _CORRECTNORMALS
_NORMALMAP _VERTEXANIMATION
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
Expand Down Expand Up @@ -109,6 +109,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- Color_C30C7CA3: {r: 1, g: 1, b: 1, a: 0}
- WindDirection: {r: 0.4, g: 0.4, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
Expand Down
5 changes: 3 additions & 2 deletions Assets/Objects/environment/Trees/Materials/Trees_billboards.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Material:
m_ShaderKeywords: BOOLEAN_7021FEFA_ON BOOLEAN_D0D03BFD_ON _ALPHATEST_ON _CORRECTNORMALS
_NORMALMAP _OCCLUSIONMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
Expand All @@ -33,4 +33,5 @@ Material:
- BOOLEAN_5C6B42CA: 0
- BOOLEAN_7021FEFA: 1
- Vector1_19FBDA45: 0.5
m_Colors: []
m_Colors:
- Color_C30C7CA3: {r: 1, g: 1, b: 1, a: 0}
2 changes: 1 addition & 1 deletion Assets/Objects/props/houses/Materials/Matr_BuildingsJettys.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Material:
type: 3}
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
Expand Down
Loading