diff --git a/unity_Project/Assets/GUI Assets.meta b/unity_Project/Assets/GUI Assets.meta new file mode 100644 index 0000000..e301078 --- /dev/null +++ b/unity_Project/Assets/GUI Assets.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 045ec7e042ea39a4492edbf6567ff054 +folderAsset: yes +timeCreated: 1443335901 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/Icon - PULL.controller b/unity_Project/Assets/GUI Assets/Icon - PULL.controller new file mode 100644 index 0000000..5a38d3c Binary files /dev/null and b/unity_Project/Assets/GUI Assets/Icon - PULL.controller differ diff --git a/unity_Project/Assets/prefabs/Pully Platform 1.prefab.meta b/unity_Project/Assets/GUI Assets/Icon - PULL.controller.meta similarity index 65% rename from unity_Project/Assets/prefabs/Pully Platform 1.prefab.meta rename to unity_Project/Assets/GUI Assets/Icon - PULL.controller.meta index 5c0e25f..7c13124 100644 --- a/unity_Project/Assets/prefabs/Pully Platform 1.prefab.meta +++ b/unity_Project/Assets/GUI Assets/Icon - PULL.controller.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 0ad6a4a7e48cf6f4d951c3000c5295cb -timeCreated: 1443267892 +guid: b3e3477f881b35749beec0abf5e80f85 +timeCreated: 1443349774 licenseType: Free NativeFormatImporter: userData: diff --git a/unity_Project/Assets/GUI Assets/Icon - PUSH.controller b/unity_Project/Assets/GUI Assets/Icon - PUSH.controller new file mode 100644 index 0000000..4dd212e Binary files /dev/null and b/unity_Project/Assets/GUI Assets/Icon - PUSH.controller differ diff --git a/unity_Project/Assets/GUI Assets/Icon - PUSH.controller.meta b/unity_Project/Assets/GUI Assets/Icon - PUSH.controller.meta new file mode 100644 index 0000000..3dd83f2 --- /dev/null +++ b/unity_Project/Assets/GUI Assets/Icon - PUSH.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 81deb2546040cc64585c143f900469e3 +timeCreated: 1443350267 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/UI_icon_PULL.png b/unity_Project/Assets/GUI Assets/UI_icon_PULL.png new file mode 100644 index 0000000..4820c53 Binary files /dev/null and b/unity_Project/Assets/GUI Assets/UI_icon_PULL.png differ diff --git a/unity_Project/Assets/GUI Assets/UI_icon_PULL.png.meta b/unity_Project/Assets/GUI Assets/UI_icon_PULL.png.meta new file mode 100644 index 0000000..f512b4c --- /dev/null +++ b/unity_Project/Assets/GUI Assets/UI_icon_PULL.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 8cf5b116cdbc9d54eba446f8731e6607 +timeCreated: 1443335902 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 200 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/UI_icon_PUSH.png b/unity_Project/Assets/GUI Assets/UI_icon_PUSH.png new file mode 100644 index 0000000..586fd4c Binary files /dev/null and b/unity_Project/Assets/GUI Assets/UI_icon_PUSH.png differ diff --git a/unity_Project/Assets/GUI Assets/UI_icon_PUSH.png.meta b/unity_Project/Assets/GUI Assets/UI_icon_PUSH.png.meta new file mode 100644 index 0000000..d77d48d --- /dev/null +++ b/unity_Project/Assets/GUI Assets/UI_icon_PUSH.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 94bc7637ebd5ff8418bde11a0ec30bcc +timeCreated: 1443335902 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/icon_PULL.anim b/unity_Project/Assets/GUI Assets/icon_PULL.anim new file mode 100644 index 0000000..f887a66 Binary files /dev/null and b/unity_Project/Assets/GUI Assets/icon_PULL.anim differ diff --git a/unity_Project/Assets/GUI Assets/icon_PULL.anim.meta b/unity_Project/Assets/GUI Assets/icon_PULL.anim.meta new file mode 100644 index 0000000..864ea52 --- /dev/null +++ b/unity_Project/Assets/GUI Assets/icon_PULL.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae489dea63d3f2e46ab3f95a60170e79 +timeCreated: 1443349773 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/icon_PULL_invisible.anim b/unity_Project/Assets/GUI Assets/icon_PULL_invisible.anim new file mode 100644 index 0000000..0a00fe0 Binary files /dev/null and b/unity_Project/Assets/GUI Assets/icon_PULL_invisible.anim differ diff --git a/unity_Project/Assets/GUI Assets/icon_PULL_invisible.anim.meta b/unity_Project/Assets/GUI Assets/icon_PULL_invisible.anim.meta new file mode 100644 index 0000000..6f24c4c --- /dev/null +++ b/unity_Project/Assets/GUI Assets/icon_PULL_invisible.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54bd2d2b569a88144a9d117f23ae4142 +timeCreated: 1443349923 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/icon_PUSH.anim b/unity_Project/Assets/GUI Assets/icon_PUSH.anim new file mode 100644 index 0000000..bef3685 Binary files /dev/null and b/unity_Project/Assets/GUI Assets/icon_PUSH.anim differ diff --git a/unity_Project/Assets/GUI Assets/icon_PUSH.anim.meta b/unity_Project/Assets/GUI Assets/icon_PUSH.anim.meta new file mode 100644 index 0000000..ad6f96e --- /dev/null +++ b/unity_Project/Assets/GUI Assets/icon_PUSH.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5dd300ea5974274fa80d12aa330d783 +timeCreated: 1443350267 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/GUI Assets/icon_PUSH_invisible.anim b/unity_Project/Assets/GUI Assets/icon_PUSH_invisible.anim new file mode 100644 index 0000000..13e10ef Binary files /dev/null and b/unity_Project/Assets/GUI Assets/icon_PUSH_invisible.anim differ diff --git a/unity_Project/Assets/GUI Assets/icon_PUSH_invisible.anim.meta b/unity_Project/Assets/GUI Assets/icon_PUSH_invisible.anim.meta new file mode 100644 index 0000000..052e415 --- /dev/null +++ b/unity_Project/Assets/GUI Assets/icon_PUSH_invisible.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68a058e1bf867e2438562971865de0e8 +timeCreated: 1443350413 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/New Terrain.asset b/unity_Project/Assets/New Terrain.asset new file mode 100644 index 0000000..d43bc75 Binary files /dev/null and b/unity_Project/Assets/New Terrain.asset differ diff --git a/unity_Project/Assets/New Terrain.asset.meta b/unity_Project/Assets/New Terrain.asset.meta new file mode 100644 index 0000000..32d4b8f --- /dev/null +++ b/unity_Project/Assets/New Terrain.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11e0678f835d9da4dac2e2f66efd2c68 +timeCreated: 1443328459 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/TLO - Metal B.mat b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/TLO - Metal B.mat index 2b1bc89..bcdbc7c 100644 Binary files a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/TLO - Metal B.mat and b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/TLO - Metal B.mat differ diff --git a/unity_Project/Assets/Terrain/New Terrain.asset b/unity_Project/Assets/Terrain/New Terrain.asset index 86413fd..9c7e86c 100644 Binary files a/unity_Project/Assets/Terrain/New Terrain.asset and b/unity_Project/Assets/Terrain/New Terrain.asset differ diff --git a/unity_Project/Assets/_Scenes/MainLevel.unity b/unity_Project/Assets/_Scenes/MainLevel.unity index 13468a7..30876e2 100644 Binary files a/unity_Project/Assets/_Scenes/MainLevel.unity and b/unity_Project/Assets/_Scenes/MainLevel.unity differ diff --git a/unity_Project/Assets/prefabs/Pully Extension.prefab b/unity_Project/Assets/prefabs/Pully Extension.prefab index a69f77b..489a63c 100644 Binary files a/unity_Project/Assets/prefabs/Pully Extension.prefab and b/unity_Project/Assets/prefabs/Pully Extension.prefab differ diff --git a/unity_Project/Assets/prefabs/Pully Platform 1.prefab b/unity_Project/Assets/prefabs/Pully Platform 1.prefab deleted file mode 100644 index fd648f6..0000000 Binary files a/unity_Project/Assets/prefabs/Pully Platform 1.prefab and /dev/null differ diff --git a/unity_Project/Assets/prefabs/Pully Platform.prefab b/unity_Project/Assets/prefabs/Pully Platform.prefab index c0af40b..dbdd5ed 100644 Binary files a/unity_Project/Assets/prefabs/Pully Platform.prefab and b/unity_Project/Assets/prefabs/Pully Platform.prefab differ diff --git a/unity_Project/Assets/prefabs/Pully Platform.prefab.meta b/unity_Project/Assets/prefabs/Pully Platform.prefab.meta index b230153..6dcc58c 100644 --- a/unity_Project/Assets/prefabs/Pully Platform.prefab.meta +++ b/unity_Project/Assets/prefabs/Pully Platform.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: bf6b2ed6a0fd9924b94651e887eed9a1 -timeCreated: 1443096131 +guid: 75abd4b527682a042b20e75a3483345e +timeCreated: 1443326792 licenseType: Free NativeFormatImporter: userData: