Skip to content

Commit

Permalink
#2 New spawnable arrow model and limiting to one arrow per SpawnPoint
Browse files Browse the repository at this point in the history
Making invisible Overseer movement arrow to Ground Player
#1 Removing "Ground Environment Hidden" from the rendering of the Dog controller
  • Loading branch information
vladimirdlc committed Mar 18, 2017
1 parent 19709e6 commit ed6602a
Show file tree
Hide file tree
Showing 19 changed files with 571 additions and 1,037 deletions.
16 changes: 8 additions & 8 deletions Assets/Animations/Test/Arrow.anim
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: {x: -0.3420651, y: 4.8, z: 9.078042}
value: {x: 0, y: 6.51, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
- serializedVersion: 2
time: 1
value: {x: -0.3420651, y: 1.13, z: 9.078042}
value: {x: 0, y: 1.07, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand Down Expand Up @@ -76,13 +76,13 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: -0.3420651
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: -0.3420651
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -98,13 +98,13 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: 4.8
value: 6.51
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 1.13
value: 1.07
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -120,13 +120,13 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: 9.078042
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 9.078042
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand Down
4 changes: 2 additions & 2 deletions Assets/Materials/Material_001.mat
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: Material_001
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
Expand Down
127 changes: 127 additions & 0 deletions Assets/Models/Dog/V4/Materials/Material.001.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Material.001
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _BumpMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _BumpScale
second: 1
- first:
name: _Cutoff
second: 0.5
- first:
name: _DetailNormalMapScale
second: 1
- first:
name: _DstBlend
second: 0
- first:
name: _GlossMapScale
second: 1
- first:
name: _Glossiness
second: 0.5
- first:
name: _GlossyReflections
second: 1
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 0
- first:
name: _OcclusionStrength
second: 1
- first:
name: _Parallax
second: 0.02
- first:
name: _SmoothnessTextureChannel
second: 0
- first:
name: _SpecularHighlights
second: 1
- first:
name: _SrcBlend
second: 1
- first:
name: _UVSec
second: 0
- first:
name: _ZWrite
second: 1
m_Colors:
- first:
name: _Color
second: {r: 0.8, g: 0.8, b: 0.8, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
8 changes: 8 additions & 0 deletions Assets/Models/Dog/V4/Materials/Material.001.mat.meta

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

3 changes: 2 additions & 1 deletion Assets/Prefabs/Ground Characters/Test Dog.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1765,7 +1765,7 @@ Camera:
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294949887
m_Bits: 4294687743
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 1
Expand Down Expand Up @@ -2006,6 +2006,7 @@ MonoBehaviour:
tiltRightAnimSpeed: 1
speed: 10
enableTilt: 1
disableStrafe: 0
gravity: 10
maxVelocityChange: 10
canJump: 1
Expand Down
4 changes: 2 additions & 2 deletions Assets/Prefabs/Models/Materials/Material_001.mat
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: Material_001
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
Expand Down
Loading

0 comments on commit ed6602a

Please sign in to comment.