Skip to content

Commit

Permalink
Version rollback to 2020.3
Browse files Browse the repository at this point in the history
  • Loading branch information
dbrizov committed Jan 31, 2022
1 parent 132cd96 commit 277c0df
Show file tree
Hide file tree
Showing 12 changed files with 590 additions and 557 deletions.
41 changes: 27 additions & 14 deletions Assets/NaughtyCharacter/Defs/Input/InputActions.inputactions
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,26 @@
"id": "3e0030f3-beab-4f5b-a947-75045fb058a6",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": true
},
{
"name": "Look",
"type": "Value",
"id": "ffb35f92-3bb0-485c-90b0-b6390c1a0549",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": true
},
{
"name": "Jump",
"type": "Button",
"id": "2257c83a-cc1e-4498-afff-28c868cea070",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand Down Expand Up @@ -158,7 +161,7 @@
"path": "<Mouse>/delta",
"interactions": "",
"processors": "ScaleVector2(x=0.1,y=0.1)",
"groups": ";Keyboard&Mouse;Touch",
"groups": "Keyboard&Mouse",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
Expand Down Expand Up @@ -197,79 +200,89 @@
"id": "55f37729-b3e9-459b-98a0-bee304dcd525",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": true
},
{
"name": "Submit",
"type": "Button",
"id": "30b9f11e-1961-4084-9eac-8618a09baef7",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "Cancel",
"type": "Button",
"id": "cc55d89e-9281-4ca1-b802-e58fbeb4ae64",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "Point",
"type": "PassThrough",
"id": "cfdd3f0a-82b1-4541-a9e0-7c2c23277036",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "Click",
"type": "PassThrough",
"id": "2e56e3e5-8e87-4ef2-9a0e-5565fe3d8f25",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "ScrollWheel",
"type": "PassThrough",
"id": "5d035657-3ef7-4944-a7e7-43eb5abc6070",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "MiddleClick",
"type": "PassThrough",
"id": "68dc8f22-0892-44a3-a4f0-d5ae6c4081ce",
"expectedControlType": "",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "RightClick",
"type": "PassThrough",
"id": "55b87d5c-825a-4641-9691-4597ff8a0d22",
"expectedControlType": "",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "TrackedDevicePosition",
"type": "PassThrough",
"id": "f3c6a480-e7ab-4407-81d6-d0d8e14907b9",
"expectedControlType": "Vector3",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "TrackedDeviceOrientation",
"type": "PassThrough",
"id": "52b08f2c-7572-40a9-9903-07e3139c448f",
"expectedControlType": "Quaternion",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand Down
78 changes: 78 additions & 0 deletions Assets/NaughtyCharacter/Environment/Materials/White.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: White
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: f17c38f5a524e7247a588c333b34a41b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

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

Loading

0 comments on commit 277c0df

Please sign in to comment.