Merge Kerby

Assets/AntoineScene.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 382f3de09c62de4499105347d562a26a
+timeCreated: 1466871072
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FirstPersonView.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e30c07fb6559541af858338a37440da7
+timeCreated: 1466818119
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Materials.meta

@@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 9ae293cd9e24d174a992ca345a75eac3
 folderAsset: yes
 timeCreated: 1466817257
+=======
+guid: a9a564757083e4a4d9316e9e699316ac
+folderAsset: yes
+timeCreated: 1466870448
+>>>>>>> 417cb1bd20dec13350564e0d8da1a93ffdb26561
 licenseType: Free
 DefaultImporter:
   userData: 

Assets/Materials/New Material 1.mat.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 7f3315ade4f14c740a827cbd008ea14e
 timeCreated: 1466817392
+=======
+guid: a1d7ff165c6400643b2057a06b2fb899
+timeCreated: 1466869200
+>>>>>>> 417cb1bd20dec13350564e0d8da1a93ffdb26561
 licenseType: Free
 NativeFormatImporter:
   userData: 

Assets/Materials/New Material.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a724011859964946811843b7f01d49e
+timeCreated: 1466858776
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Materials/TestMaterial.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 852c4d218cedd4ae5b088ddcdedccad4
+timeCreated: 1466818559
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 551ac0380bb17814aa72b98a67a21b79
+folderAsset: yes
+timeCreated: 1466870437
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Character.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cb0a2e0ed14ac8a4fbfa12f9d48e682d
+timeCreated: 1466870406
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Red_Brick_Wall.jpg.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: 11f13d469daed41edb2648f1d1b461b2
+timeCreated: 1466818973
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 1
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 1
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  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
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: 1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 9af33609c2bd71b49b10ef5c4cc64007
+folderAsset: yes
+timeCreated: 1466817280
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/MovementPlayer.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cb1c8348b6f5812488b3702db8152ad3
+timeCreated: 1466822462
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts.meta

@@ -1,7 +1,19 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: cb6d0969f94b8e74cb372cc48d1509c8
 folderAsset: yes
 timeCreated: 1466817267
+=======
+<<<<<<< HEAD
+guid: 40764ebe822b819449a2b0cf923f4c2e
+folderAsset: yes
+timeCreated: 1466858656
+=======
+guid: 585294b74b6b54cae92293ffbd3a2088
+folderAsset: yes
+timeCreated: 1466869142
+>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
+>>>>>>> 417cb1bd20dec13350564e0d8da1a93ffdb26561
 licenseType: Free
 DefaultImporter:
   userData: 

Assets/Scripts/PlayerMovement.cs

@@ -5,19 +5,31 @@ public class PlayerMovement : MonoBehaviour {
 
     public float speed = 0f;
     public float turn = 0f;
+    public GameObject camera;
+    public Rigidbody characterRigidBody;
     //private Rigidbody rb;
 
 
 	
 	// Update is called once per frame
 	void Update () {
-        if (Input.GetKey(KeyCode.UpArrow))
-            transform.Translate(Vector3.forward * speed * Time.deltaTime);
-        if (Input.GetKey(KeyCode.DownArrow))
-            transform.Translate(-Vector3.forward * speed * Time.deltaTime);
-        if (Input.GetKey(KeyCode.LeftArrow))
-            transform.Rotate(Vector3.up, -turn * Time.deltaTime);
-        if (Input.GetKey(KeyCode.RightArrow))
-            transform.Rotate(Vector3.up, turn * Time.deltaTime);
+        Vector3 fowardVector = new Vector3(camera.transform.forward.x, 0, camera.transform.forward.z);
+        if (Input.GetAxis("Vertical")>0)
+        {
+
+            characterRigidBody.velocity = ( fowardVector * speed * Time.deltaTime);
+        }
+        else if (Input.GetAxis("Vertical")<0)
+        {
+            characterRigidBody.velocity = (-fowardVector * speed * Time.deltaTime);
+        }
+        if (Input.GetAxis("Horizontal")<0)
+        {
+            characterRigidBody.velocity = (Vector3.Cross(-transform.up, fowardVector) * speed * Time.deltaTime);
+        }
+        else if (Input.GetAxis("Horizontal") > 0)
+        {
+            characterRigidBody.velocity = (Vector3.Cross(transform.up, fowardVector) * speed * Time.deltaTime);
+        }
     }
 }

Assets/Scripts/PlayerMovement.cs.meta

@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+<<<<<<< HEAD
+guid: e02d4438d816e344abb40991894780c3
+timeCreated: 1466858657
+=======
+guid: 55ee7f3d2d53247daa31f81beccb99d8
+timeCreated: 1466869142
+>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/PostEffectScript.cs

@@ -0,0 +1,36 @@
+using UnityEngine;
+using System.Collections;
+[ExecuteInEditMode]
+public class PostEffectScript : MonoBehaviour {
+    public Material mat;
+    public float blindness = 0.5f;
+    public Rigidbody character;
+    public float blindnessRatio = 0.1f;
+    public float velocity;
+	// Use this for initialization
+	void Start () {
+	
+	}
+	
+	// Update is called once per frame
+	void Update () {
+	
+	}
+    void OnRenderImage(RenderTexture src, RenderTexture dest)
+    {
+        if (character.velocity.magnitude > 0)
+        {
+            blindness = character.velocity.normalized.magnitude * blindnessRatio;
+            blindnessRatio += 0.01f;
+        }
+        else if (blindnessRatio >= 0.1f)
+        {
+            blindness = character.velocity.normalized.magnitude * blindnessRatio;
+            blindnessRatio = 0.1f;
+        }
+       
+
+        mat.SetFloat("_Blindness", blindness);
+        Graphics.Blit(src, dest,mat);
+    }
+}

Assets/Scripts/PostEffectScript.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: ec76a4a1cda1e3a4bb07acf36d2d1e01
+timeCreated: 1466858765
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/PostEffectShader.shader

@@ -0,0 +1,59 @@
+	Shader "Custom/PostEffectShader"
+{
+	Properties
+	{
+		_Blindness("Blindness", Float) = 0.6 
+		_MainTex("Texture", 2D) = "white" {}
+	
+	}
+	SubShader
+	{
+		// No culling or depth
+		Cull Off ZWrite Off ZTest Always
+
+		Pass
+		{
+			CGPROGRAM
+			#pragma vertex vert
+			#pragma fragment frag
+			
+			#include "UnityCG.cginc"
+
+			struct appdata
+			{
+				float4 vertex : POSITION;
+				float2 uv : TEXCOORD0;
+			};
+
+			struct v2f
+			{
+				float2 uv : TEXCOORD0;
+				float4 vertex : SV_POSITION;
+			};
+
+			v2f vert (appdata v)
+			{
+				v2f o;
+				o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.uv = v.uv;
+				return o;
+			}
+			
+			sampler2D _MainTex;
+			float _Blindness;
+
+			fixed4 frag (v2f i) : SV_Target
+			{
+				fixed4 col = tex2D(_MainTex, i.uv);
+				col.r = col.r+ _Blindness;
+				col.g = col.g+_Blindness;
+				col.b = col.b+_Blindness;
+				//col.a = (c.r + c.b + c.g) / 3;
+				// just invert the colors
+				//col = 1 - col;
+				return col;
+			}
+			ENDCG
+		}
+	}
+}

Assets/Scripts/PostEffectShader.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8af73b3d4929e6c4bbf312b61e959c45
+timeCreated: 1466858754
+licenseType: Free
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/ViewControl.cs

@@ -0,0 +1,42 @@
+using UnityEngine;
+using System.Collections;
+
+public class ViewControl : MonoBehaviour
+{
+
+    // Speed at which the camera will catch up to the mouse pointer location
+    public float smoothing = 1.5f;
+    public float mouseSensitivity = 100.0f;
+    public float clampAngle = 80.0f;
+ 
+    private float rotY = 0.0f;
+    // rotation around the up/y axis
+    private float rotX = 0.0f;
+    // rotation around the right/x axis
+
+    // Use this for initialization
+    void Start()
+    {
+        Cursor.lockState = CursorLockMode.Locked;
+        Cursor.visible = false;
+
+        Vector3 rot = transform.localRotation.eulerAngles;
+        rotY = rot.y;
+        rotX = rot.x;
+    }
+
+    // Called once every physics update
+    void FixedUpdate()
+    {
+        float mouseX = Input.GetAxis("Mouse X");
+        float mouseY = -Input.GetAxis("Mouse Y");
+ 
+        rotY += mouseX * mouseSensitivity * Time.deltaTime;
+        rotX += mouseY * mouseSensitivity * Time.deltaTime;
+ 
+        rotX = Mathf.Clamp(rotX, -clampAngle, clampAngle);
+ 
+        Quaternion localRotation = Quaternion.Euler(rotX, rotY, 0.0f);
+        transform.rotation = localRotation;
+    }
+}

Assets/Scripts/ViewControl.cs.meta

@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+<<<<<<< HEAD
+guid: e0d46d2696637bd4994804f7b9e4d3fe
+timeCreated: 1466858657
+=======
+guid: 2c2ae6eb7fab0437791fe2f4ad415052
+timeCreated: 1466818849
+>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/TestMaterial.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 852c4d218cedd4ae5b088ddcdedccad4
+timeCreated: 1466818559
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Textures.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 7b5c5332c3229324ca9dbfaaa10ec118
+folderAsset: yes
+timeCreated: 1466870458
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Textures/Red_Brick_Wall.jpg.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: 11f13d469daed41edb2648f1d1b461b2
+timeCreated: 1466818973
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 1
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 1
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  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
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: 1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Textures/images.png.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: d291956c75df3674396ed3b0bff90c13
+timeCreated: 1466869186
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  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
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Textures/sky-1141928_960_720.jpg.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: cd66694a22ab80445882e746f99c2568
+timeCreated: 1466867515
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  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
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ViewControl.cs

@@ -0,0 +1,42 @@
+using UnityEngine;
+using System.Collections;
+
+public class ViewControl : MonoBehaviour
+{
+
+    // Speed at which the camera will catch up to the mouse pointer location
+    public float smoothing = 1.5f;
+    public float mouseSensitivity = 100.0f;
+    public float clampAngle = 80.0f;
+ 
+    private float rotY = 0.0f;
+    // rotation around the up/y axis
+    private float rotX = 0.0f;
+    // rotation around the right/x axis
+
+    // Use this for initialization
+    void Start()
+    {
+        Cursor.lockState = CursorLockMode.Locked;
+        Cursor.visible = false;
+
+        Vector3 rot = transform.localRotation.eulerAngles;
+        rotY = rot.y;
+        rotX = rot.x;
+    }
+
+    // Called once every physics update
+    void FixedUpdate()
+    {
+        float mouseX = Input.GetAxis("Mouse X");
+        float mouseY = -Input.GetAxis("Mouse Y");
+ 
+        rotY += mouseX * mouseSensitivity * Time.deltaTime;
+        rotX += mouseY * mouseSensitivity * Time.deltaTime;
+ 
+        rotX = Mathf.Clamp(rotX, -clampAngle, clampAngle);
+ 
+        Quaternion localRotation = Quaternion.Euler(rotX, rotY, 0.0f);
+        transform.rotation = localRotation;
+    }
+}

README.md

@@ -16,13 +16,18 @@ Core gameplay principles
 
 * Playable character implementation
   * First person view (w/ controls of view and headbobbing) *Assigned to Alex*
-  * Movement (jumping, etc) *Assigned to Kerby*
+   * View controls ✓
+   * Headbobbing 
+  * Movement (jumping, etc) *Assigned to Kerby* ✓
+   * Controls ✓
+   * Jumping ✓
 * Gameplay mechanics
   * Fog of war
-  * Falling tiles *Assigned to Hugo*
-  * Stay a while mechanic *Assigned to Antoine*
+  * Falling tiles *Assigned to Hugo* ✓
+  * Stay a while mechanic *Assigned to Antoine* ✓
 
 ###Possible traps/pick ups
 * Slow down time
-* Transparent structures
+* Super jump / speed
+* XRay