diff --git a/Level1.fbx b/Level1.fbx new file mode 100644 index 0000000..289cd55 Binary files /dev/null and b/Level1.fbx differ diff --git a/unity_Project/Assets/0bjects/Terrain.meta b/unity_Project/Assets/0bjects/Terrain.meta new file mode 100644 index 0000000..bb7826a --- /dev/null +++ b/unity_Project/Assets/0bjects/Terrain.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 97cd24011c7c785478004912692c5f76 +folderAsset: yes +timeCreated: 1440740094 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/Terrain/shack-level.fbx b/unity_Project/Assets/0bjects/Terrain/shack-level.fbx new file mode 100644 index 0000000..915579a Binary files /dev/null and b/unity_Project/Assets/0bjects/Terrain/shack-level.fbx differ diff --git a/unity_Project/Assets/0bjects/Terrain/shack-level.fbx.meta b/unity_Project/Assets/0bjects/Terrain/shack-level.fbx.meta new file mode 100644 index 0000000..024856f --- /dev/null +++ b/unity_Project/Assets/0bjects/Terrain/shack-level.fbx.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 0a9cf0522e1177844a8be49053b20f4b +timeCreated: 1440740102 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: pPlane1 + 100002: //RootNode + 400000: pPlane1 + 400002: //RootNode + 2300000: pPlane1 + 3300000: pPlane1 + 4300000: pPlane1 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1000 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/Textures/rust.png b/unity_Project/Assets/0bjects/Textures/rust.png new file mode 100644 index 0000000..7e652ec Binary files /dev/null and b/unity_Project/Assets/0bjects/Textures/rust.png differ diff --git a/unity_Project/Assets/0bjects/Textures/rust.png.meta b/unity_Project/Assets/0bjects/Textures/rust.png.meta new file mode 100644 index 0000000..70563dc --- /dev/null +++ b/unity_Project/Assets/0bjects/Textures/rust.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 062f751d246b079479a1d1a6c1fc8a09 +timeCreated: 1440737403 +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: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/bucket.fbx b/unity_Project/Assets/0bjects/bucket.fbx new file mode 100644 index 0000000..6dfe2e0 Binary files /dev/null and b/unity_Project/Assets/0bjects/bucket.fbx differ diff --git a/unity_Project/Assets/0bjects/bucket.fbx.meta b/unity_Project/Assets/0bjects/bucket.fbx.meta new file mode 100644 index 0000000..926b377 --- /dev/null +++ b/unity_Project/Assets/0bjects/bucket.fbx.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 7af8345f65cd39545a94b5554bbc823b +timeCreated: 1440738395 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: dump_container4 + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/Scripts/magnetGun.cs b/unity_Project/Assets/Scripts/magnetGun.cs index ebc4901..36eaa6c 100644 --- a/unity_Project/Assets/Scripts/magnetGun.cs +++ b/unity_Project/Assets/Scripts/magnetGun.cs @@ -138,7 +138,7 @@ public class magnetGun : MonoBehaviour { GravityTarget = null; - playerController.movementSpeed = 1000.0f; + playerController.movementSpeed = 5000.0f; playerController.cameraSpeedX = 250.0f; playerController.cameraSpeedY = 120.0f; diff --git a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonBasicOutline.mat b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonBasicOutline.mat index 9c5b8da..da2f92b 100644 Binary files a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonBasicOutline.mat and b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonBasicOutline.mat differ diff --git a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat index 0e1ce08..ac1687f 100644 Binary files a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat and b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat differ diff --git a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd new file mode 100644 index 0000000..9bf81d5 Binary files /dev/null and b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd differ diff --git a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd.meta b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd.meta new file mode 100644 index 0000000..c00ec68 --- /dev/null +++ b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: f48eebd62538e2e40a8ae74a1be4d018 +timeCreated: 1440738706 +licenseType: Free +TextureImporter: + fileIDToRecycleName: + 8900000: generatedCubemap + 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: 1 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 5 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png new file mode 100644 index 0000000..094a271 Binary files /dev/null and b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png differ diff --git a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png.meta b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png.meta new file mode 100644 index 0000000..e152306 --- /dev/null +++ b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 8fbbf23bb3a45d2469ef7fe5f841e2ad +timeCreated: 1440738635 +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: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png new file mode 100644 index 0000000..d96ace9 Binary files /dev/null and b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png differ diff --git a/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png.meta b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png.meta new file mode 100644 index 0000000..70904f5 --- /dev/null +++ b/unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 76c065827007be54f91a33657df18252 +timeCreated: 1440739507 +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: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/_Scenes/ScafoldingTest.unity b/unity_Project/Assets/_Scenes/ScafoldingTest.unity index b41322a..70195d8 100644 Binary files a/unity_Project/Assets/_Scenes/ScafoldingTest.unity and b/unity_Project/Assets/_Scenes/ScafoldingTest.unity differ diff --git a/unity_Project/ProjectSettings/InputManager.asset b/unity_Project/ProjectSettings/InputManager.asset index b600640..087cadf 100644 Binary files a/unity_Project/ProjectSettings/InputManager.asset and b/unity_Project/ProjectSettings/InputManager.asset differ