Various Assets, beach and cave level

Bugfix: added sticky ground behaviour
added upwards force modifier
2018-09-02 16:03:58 +02:00 · 2018-09-01 23:27:57 +02:00 · 2018-09-01 21:37:37 +02:00 · 2018-09-01 20:51:32 +02:00 · 2018-09-01 19:27:39 +02:00
39 changed files with 17907 additions and 45 deletions
--- a/Assets/Blender.meta
+++ b/Assets/Blender.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d79aa763cdd23143a81c190392d42e2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Blender/beach_plateaus.blend
+++ b/Assets/Blender/beach_plateaus.blend
--- a/Assets/Blender/beach_rocks.blend
+++ b/Assets/Blender/beach_rocks.blend
--- a/Assets/Blender/large
+++ b/Assets/Blender/large
--- a/Assets/Blender/longplateau_horizontal.blend
+++ b/Assets/Blender/longplateau_horizontal.blend
--- a/Assets/Blender/rock_wall01.blend
+++ b/Assets/Blender/rock_wall01.blend
--- a/Assets/Blender/rock_wall_edge.blend
+++ b/Assets/Blender/rock_wall_edge.blend
--- a/Assets/Blender/rock_wall_plain.blend
+++ b/Assets/Blender/rock_wall_plain.blend
--- a/Assets/Blender/rock_wall_ridge.blend
+++ b/Assets/Blender/rock_wall_ridge.blend
--- a/Assets/Blender/rock_wall_stepped.blend
+++ b/Assets/Blender/rock_wall_stepped.blend
--- a/Assets/Blender/rocks01.blend
+++ b/Assets/Blender/rocks01.blend
--- a/Assets/Blender/spikertap1.blend
+++ b/Assets/Blender/spikertap1.blend
--- a/Assets/Blender/tree_platform.blend
+++ b/Assets/Blender/tree_platform.blend
--- a/Assets/Blender/tree_tops.blend
+++ b/Assets/Blender/tree_tops.blend
--- a/Assets/Blender/trees_with_trunks.blend
+++ b/Assets/Blender/trees_with_trunks.blend
--- a/Assets/Blender/trunk.blend
+++ b/Assets/Blender/trunk.blend
--- a/Assets/Blender/waves.blend
+++ b/Assets/Blender/waves.blend
--- a/Assets/Images/Cloud.png
+++ b/Assets/Images/Cloud.png
--- a/Assets/Images/Cloud.png.meta
+++ b/Assets/Images/Cloud.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 5c016a4899bbd4a42be1711fc1fba3b6
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Materials/CloudParticle.mat
+++ b/Assets/Materials/CloudParticle.mat
@@ -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_PrefabInternal: {fileID: 0}
+  m_Name: CloudParticle
+  m_Shader: {fileID: 200, 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: 5c016a4899bbd4a42be1711fc1fba3b6, 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
+    - _InvFade: 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}
+    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.11372549}
--- a/Assets/Materials/CloudParticle.mat.meta
+++ b/Assets/Materials/CloudParticle.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 66c9f7c2a4e2874419692a479dbe44a9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Materials/Crystal.mat
+++ b/Assets/Materials/Crystal.mat
@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Crystal
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _METALLICGLOSSMAP
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 2800000, guid: 5c016a4899bbd4a42be1711fc1fba3b6, type: 3}
+        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: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0, g: 0.24416694, b: 0.7830189, a: 0.9372549}
+    - _EmissionColor: {r: 0, g: 0.6554735, b: 12.235505, a: 1}
--- a/Assets/Materials/Crystal.mat.meta
+++ b/Assets/Materials/Crystal.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1ef24233e689f0242b2a2ee37f4d128f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Materials/Sand.mat
+++ b/Assets/Materials/Sand.mat
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Sand
+  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: 0}
+        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
+    - _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: 0.8301887, g: 0.66682404, b: 0.41117835, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/Materials/Sand.mat.meta
+++ b/Assets/Materials/Sand.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1cbb0962fcb59c04db568db4a15c6598
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Materials/Stone.mat
+++ b/Assets/Materials/Stone.mat
@@ -72,5 +72,5 @@ Material:
    - _UVSec: 0
    - _ZWrite: 1
    m_Colors:
-    - _Color: {r: 0.5566038, g: 0.5566038, b: 0.5566038, a: 1}
+    - _Color: {r: 0.1981132, g: 0.1981132, b: 0.1981132, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/Materials/Waves.mat
+++ b/Assets/Materials/Waves.mat
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Waves
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: 0}
+        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: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0.946
+    - _GlossyReflections: 1
+    - _InvFade: 3
+    - _Metallic: 1
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.45678353, g: 0.41037738, b: 1, a: 0.6156863}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _TintColor: {r: 0, g: 0.016771497, b: 0.0754717, a: 1}
--- a/Assets/Materials/Waves.mat.meta
+++ b/Assets/Materials/Waves.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5dbffae7097f6d644ae0227ef9755a08
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Materials/brown_stone.mat
+++ b/Assets/Materials/brown_stone.mat
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: brown_stone
+  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: 0}
+        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
+    - _GlossyReflections: 1
+    - _Metallic: 0.261
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.49056602, g: 0.28953806, b: 0.1689213, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/Materials/brown_stone.mat.meta
+++ b/Assets/Materials/brown_stone.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 91ece0747b123e04e9330516c1d8d578
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Lurch.prefab
+++ b/Assets/Prefabs/Lurch.prefab
@@ -37,7 +37,6 @@ GameObject:
  - component: {fileID: 114123996009525022}
  - component: {fileID: 114729016115082176}
  - component: {fileID: 114557432824313468}
-  - component: {fileID: 114003328164428386}
  m_Layer: 0
  m_Name: CameraHolder
  m_TagString: Untagged
@@ -75,6 +74,7 @@ GameObject:
  - component: {fileID: 65346116814365424}
  - component: {fileID: 54155385480013682}
  - component: {fileID: 108062020484346290}
+  - component: {fileID: 114778702397545226}
  m_Layer: 0
  m_Name: LurchTest
  m_TagString: Untagged
@@ -89,7 +89,7 @@ Transform:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1376713935733488}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.23070383, y: 3.253488, z: -7.428097}
+  m_LocalPosition: {x: -0.23070383, y: 3.253488, z: -3.7380967}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4349673492578080}
@@ -259,7 +259,7 @@ Light:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1462012476334488}
-  m_Enabled: 1
+  m_Enabled: 0
  serializedVersion: 8
  m_Type: 2
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -290,26 +290,6 @@ Light:
  m_UseColorTemperature: 0
  m_ShadowRadius: 0
  m_ShadowAngle: 0
--- !u!114 &114003328164428386
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1444832767951054}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 167337a6a977deb408440dbf31acb6c9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  respawnPoints:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  lowerBounds: {fileID: 0}
-  lurch: {fileID: 1462012476334488}
-  UpdateFrequenzy: 15
-  maxFallDist: 25
-  respawnKey: 114
 --- !u!114 &114123996009525022
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -326,14 +306,17 @@ MonoBehaviour:
  lockMouse: 1
  speed: 0.5
  theLurch: {fileID: 4675101163920296}
-  maxJumpForce: 10
-  forceIncreaseSpeed: 0.5
+  maxJumpForce: 6
+  upForceModifier: 1.45
+  forceIncreaseSpeed: 0.3
  normalColor: {r: 0.14509805, g: 0.4784314, b: 1, a: 0}
  fullyChargedColor: {r: 0.95649004, g: 0, b: 1, a: 0}
  normalSize: {x: 0, y: 0, z: 0}
  chargedSizeModifier: 0.5
  canStick: 0
-  cooldown: 0
+  cooldown: 0.4
+  stickPoint: {fileID: 0}
+  stickyOffset: 0.29
  canGlide: 0
  glideForce: 3
 --- !u!114 &114557432824313468
@@ -342,7 +325,7 @@ MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1444832767951054}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: b614d5a678d653549b924deec5548458, type: 3}
  m_Name: 
@@ -379,8 +362,23 @@ MonoBehaviour:
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
  lowerBounds: {fileID: 0}
  lurch: {fileID: 1462012476334488}
  UpdateFrequenzy: 15
-  maxFallDist: 25
+  maxFallDist: 30
+  maxDistanceToPoint: 2.5
  respawnKey: 114
+--- !u!114 &114778702397545226
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1462012476334488}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7c1dd69d76390844a9d00d3887a0fe61, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/Scenes/Level_Cave.meta
+++ b/Assets/Scenes/Level_Cave.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8474bc0970add074896554ade8eb7108
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Level_Cave.unity
+++ b/Assets/Scenes/Level_Cave.unity
--- a/Assets/Scenes/Level_Cave.unity.meta
+++ b/Assets/Scenes/Level_Cave.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1bb52d7bde12fb649a9d13abdad46f6c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -35,10 +35,10 @@ RenderSettings:
  m_DefaultReflectionMode: 0
  m_DefaultReflectionResolution: 128
  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
+  m_ReflectionIntensity: 0.49
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.3176099, g: 0.35463044, b: 0.41287512, a: 0.49}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -139,7 +139,7 @@ Light:
  serializedVersion: 8
  m_Type: 1
  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
+  m_Intensity: 0.06
  m_Range: 10
  m_SpotAngle: 30
  m_CookieSize: 10
@@ -558,6 +558,16 @@ Prefab:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 114003328164428386, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: respawnPoints.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114729016115082176, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: respawnPoints.Array.size
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 4211561106277860, guid: 8bcf2afca6664234f83b5ee8381b1975, type: 2}
      propertyPath: m_LocalPosition.x
      value: -0.23070383
@@ -590,7 +600,38 @@ Prefab:
      propertyPath: m_RootOrder
      value: 5
      objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    - target: {fileID: 114729016115082176, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: lowerBounds
+      value: 
+      objectReference: {fileID: 793616629}
+    - target: {fileID: 114003328164428386, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: respawnPoints.Array.data[0]
+      value: 
+      objectReference: {fileID: 1748020841}
+    - target: {fileID: 114729016115082176, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: respawnPoints.Array.data[0]
+      value: 
+      objectReference: {fileID: 1748020841}
+    - target: {fileID: 114557432824313468, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 108062020484346290, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114729016115082176, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: maxFallDist
+      value: 30
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 114003328164428386, guid: 8bcf2afca6664234f83b5ee8381b1975, type: 2}
  m_SourcePrefab: {fileID: 100100000, guid: 8bcf2afca6664234f83b5ee8381b1975, type: 2}
  m_IsPrefabAsset: 0
 --- !u!1 &1236060854
@@ -706,6 +747,11 @@ Prefab:
      propertyPath: cutscene
      value: 
      objectReference: {fileID: 683171416}
+    - target: {fileID: 114998550230745890, guid: ee4009de840ac2b42901d59cebc5114a,
+        type: 2}
+      propertyPath: mateGlow
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: ee4009de840ac2b42901d59cebc5114a, type: 2}
  m_IsPrefabAsset: 0
@@ -771,6 +817,34 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1748020841
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1748020842}
+  m_Layer: 0
+  m_Name: SpawnPoint1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1748020842
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1748020841}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.69, y: 4.53, z: 2.44}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2030340302
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/LightLurch.cs
+++ b/Assets/Scripts/LightLurch.cs
@@ -54,6 +54,7 @@ public class LightLurch : MonoBehaviour {
        lurchRenderer.material.SetColor("_EmissionColor", lightSource.color * (emissionMultiplier * emissionValue));
        emissionValue = baseEmission;
        lurchRenderer.material.EnableKeyword("_EMISSION");
+        lightSource.enabled = true;
    }
 	
 	// Update is called once per frame
--- a/Assets/Scripts/LurchMovement.cs
+++ b/Assets/Scripts/LurchMovement.cs
@@ -24,7 +24,9 @@ public class LurchMovement : MonoBehaviour {

    [Header("Jump Charge")]
    public float maxJumpForce;
+    public float upForceModifier = 2.0f;
    private float currentJumpForce;
+    private float currentJumpForwardForce;
    public float forceIncreaseSpeed;

    public Color normalColor;
@@ -43,6 +45,12 @@ public class LurchMovement : MonoBehaviour {
    public bool canStick;
    [SerializeField]
    private float cooldown;
+    [SerializeField]
+    private Transform stickPoint;
+    private bool stickToGround = false;
+    [SerializeField]
+    private float stickyOffset = 1;
+

    [Header("Gliding")]
    public bool canGlide;
@@ -56,6 +64,7 @@ public class LurchMovement : MonoBehaviour {
        normalSize = theLurch.transform.localScale;
        chargedSize = theLurch.transform.localScale * chargedSizeModifier;
        glideSize = new Vector3(normalSize.x, normalSize.y * 0.5f, normalSize.z);
+        stickPoint = new GameObject().transform;

    }

@@ -70,6 +79,7 @@ public class LurchMovement : MonoBehaviour {
        JumpControl();
        SmoothFollow();
        Gliding();
+        StickToPoint();
    }

    void MouseControl()
@@ -140,12 +150,14 @@ public class LurchMovement : MonoBehaviour {
        if (Input.GetButtonUp("Fire1")) {
            cooldown = 0.5f;
            lurchBody.isKinematic = false;
+            stickToGround = false;

            lurchBody.AddForce(theLurch.forward * currentJumpForce, ForceMode.Impulse);
-            lurchBody.AddForce(theLurch.up * currentJumpForce, ForceMode.Impulse);
+            lurchBody.AddForce(theLurch.up * currentJumpForce * upForceModifier, ForceMode.Impulse);
        }
        else if (LurchOnGround() && Time.time > cooldown)
        {
+            //stickToGround = true;
            lurchBody.isKinematic = true;
        }
        else if (!LurchOnGround() && Time.time > cooldown && !AmSticking())
@@ -153,6 +165,15 @@ public class LurchMovement : MonoBehaviour {
            currentJumpForce = 0.0f;
        }

+        if (AmSticking())
+        {
+            lurchBody.isKinematic = true;
+        }
+        else
+        {
+            lurchBody.isKinematic = false;
+        }
+
    }

    void Gliding()
@@ -177,13 +198,15 @@ public class LurchMovement : MonoBehaviour {
    public bool LurchOnGround()
    {
        RaycastHit hit;
-        if (Physics.Raycast(theLurch.position, Vector3.down, out hit, 0.36f) && cooldown <= 0.0f)
+        if (Physics.Raycast(theLurch.position, Vector3.down, out hit, 0.34f) && cooldown <= 0.0f)
        {
-            return true;
+            if (!stickToGround)
+            {
+                lurchBody.isKinematic = true;
+                stickPoint.parent = hit.transform;
+                stickPoint.position = hit.point;
+                stickToGround = true;
            }
-
-        if (AmSticking())
-        {
            return true;
        }

@@ -206,4 +229,12 @@ public class LurchMovement : MonoBehaviour {

        return false;
    }
+
+    public void StickToPoint()
+    {
+        if (stickToGround)
+        {
+            theLurch.position = stickPoint.position + new Vector3(0, stickyOffset, 0);
+        }
+    }
 }
--- a/Assets/Scripts/MateMate.cs
+++ b/Assets/Scripts/MateMate.cs
@@ -31,7 +31,7 @@ public class MateMate : MonoBehaviour {
            other.transform.root.GetComponentInChildren<LurchMovement>().canGlide = true;

            if(mateGlow)
-            //other.transform.root.GetComponentInChildren<LurchMovement>().canGlide = true;
+            other.transform.root.GetComponentInChildren<LightLurch>().enabled = true;

            cutscene.SetActive(true);
        }
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -4,7 +4,7 @@
 QualitySettings:
  m_ObjectHideFlags: 0
  serializedVersion: 5
-  m_CurrentQuality: 4
+  m_CurrentQuality: 2
  m_QualitySettings:
  - serializedVersion: 2
    name: Very Low
@@ -29,6 +29,12 @@ QualitySettings:
    vSyncCount: 0
    lodBias: 0.3
    maximumLODLevel: 0
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
    particleRaycastBudget: 4
    asyncUploadTimeSlice: 2
    asyncUploadBufferSize: 4
@@ -57,6 +63,12 @@ QualitySettings:
    vSyncCount: 0
    lodBias: 0.4
    maximumLODLevel: 0
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
    particleRaycastBudget: 16
    asyncUploadTimeSlice: 2
    asyncUploadBufferSize: 4
@@ -85,6 +97,12 @@ QualitySettings:
    vSyncCount: 1
    lodBias: 0.7
    maximumLODLevel: 0
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
    particleRaycastBudget: 64
    asyncUploadTimeSlice: 2
    asyncUploadBufferSize: 4
@@ -97,7 +115,7 @@ QualitySettings:
    shadowResolution: 1
    shadowProjection: 1
    shadowCascades: 2
-    shadowDistance: 40
+    shadowDistance: 250
    shadowNearPlaneOffset: 3
    shadowCascade2Split: 0.33333334
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
@@ -113,6 +131,12 @@ QualitySettings:
    vSyncCount: 1
    lodBias: 1
    maximumLODLevel: 0
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
    particleRaycastBudget: 256
    asyncUploadTimeSlice: 2
    asyncUploadBufferSize: 4
@@ -125,7 +149,7 @@ QualitySettings:
    shadowResolution: 2
    shadowProjection: 1
    shadowCascades: 2
-    shadowDistance: 40
+    shadowDistance: 250
    shadowNearPlaneOffset: 3
    shadowCascade2Split: 0.33333334
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
@@ -141,6 +165,12 @@ QualitySettings:
    vSyncCount: 1
    lodBias: 1.5
    maximumLODLevel: 0
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
    particleRaycastBudget: 1024
    asyncUploadTimeSlice: 2
    asyncUploadBufferSize: 4
@@ -153,7 +183,7 @@ QualitySettings:
    shadowResolution: 2
    shadowProjection: 1
    shadowCascades: 4
-    shadowDistance: 150
+    shadowDistance: 250
    shadowNearPlaneOffset: 3
    shadowCascade2Split: 0.33333334
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
@@ -169,6 +199,12 @@ QualitySettings:
    vSyncCount: 1
    lodBias: 2
    maximumLODLevel: 0
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
    particleRaycastBudget: 4096
    asyncUploadTimeSlice: 2
    asyncUploadBufferSize: 4
Author	SHA1	Message	Date
Jan Groß	c7602b4988	Various Assets, beach and cave level	2018-09-02 16:03:58 +02:00
Richard Ott	e8ab61fcfa	Bugfix: added sticky ground behaviour	2018-09-01 23:27:57 +02:00
Richard Ott	12ae67be67	added upwards force modifier	2018-09-01 21:37:37 +02:00
Jan Groß	66074815c3	Merge pull request #5 from JanGross/movement_and_zones Merge Platform movement and elimination zones into master	2018-09-01 20:51:32 +02:00
Richard Ott	00fa478ca7	Smal fixes + cloud/smoke texture	2018-09-01 19:27:39 +02:00