Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream

Assets/Prefabs/Player.prefab.meta

 fileFormatVersion: 2
-guid: 561019a7f49ce2d40b44edc6a0980c4a
-timeCreated: 1433442216
+guid: 75ab554038a08ae479d95e7be9fcd332
+timeCreated: 1433442334
 licenseType: Free
 NativeFormatImporter:
   userData: 

Assets/Prefabs/ground.prefab.meta

 fileFormatVersion: 2
 guid: fabe126e7eaf2e14fb0f3cd99ea811f1
-timeCreated: 1433438084
+timeCreated: 1433442353
 licenseType: Free
 NativeFormatImporter:
   userData: 

Assets/Scripts/PlayerControl.cs

@@ -24,11 +24,33 @@ public class PlayerControl : MonoBehaviour
     [HideInInspector]
     public Vector3 velocity;
 
+    public int playerNumber = 1; //gibt an, ob es sich um player one, player two, etc. handelt. sollte nicht 0 sein;
+    KeyCode goRightKeyCode, goLeftKeyCode, jumpKeyCode;
 
-    void Awake()
+    void Start()
     {
         _controller = GetComponent<CharacterController2D>();
         _controller.onControllerCollidedEvent += onControllerCollider;
+
+        switch (playerNumber)
+        {
+            case 1:
+               setKeyCodes(KeyCode.D,KeyCode.A,KeyCode.W);
+                break;
+            case 2:
+                setKeyCodes(KeyCode.RightArrow, KeyCode.LeftArrow, KeyCode.UpArrow);
+                break;
+                //TODO player 3 and 4
+            default:
+                break;
+        }
+    }
+
+    private void setKeyCodes(KeyCode right, KeyCode left, KeyCode up)
+    {
+        goRightKeyCode = right;
+        goLeftKeyCode = left;
+        jumpKeyCode = up;
     }
 
 
@@ -51,7 +73,8 @@ public class PlayerControl : MonoBehaviour
         if (_controller.isGrounded)
             velocity.y = 0;
 
-        if (Input.GetKey(KeyCode.RightArrow))
+        
+        if (Input.GetKey(goRightKeyCode))
         {
             normalizedHorizontalSpeed = 1;
             if (transform.localScale.x < 0f)
@@ -59,7 +82,7 @@ public class PlayerControl : MonoBehaviour
 
             //if (_controller.isGrounded)
         }
-        else if (Input.GetKey(KeyCode.LeftArrow))
+        else if (Input.GetKey(goLeftKeyCode))
         {
             normalizedHorizontalSpeed = -1;
             if (transform.localScale.x > 0f)
@@ -75,7 +98,7 @@ public class PlayerControl : MonoBehaviour
         }
 
 
-        if (Input.GetKeyDown(KeyCode.UpArrow))
+        if (Input.GetKeyDown(jumpKeyCode))
         {
             //to avoid DOUBLE JUMP
             if (_controller.isGrounded)

Assets/Sprites/spikes.png.meta

@@ -30,7 +30,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
     wrapMode: 1
   nPOTScale: 0
@@ -43,7 +43,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 400
   alphaIsTransparency: 1
   textureType: 8
   buildTargetSettings: []

Assets/Sprites/square.png.meta

@@ -30,7 +30,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
     wrapMode: 1
   nPOTScale: 0
@@ -43,7 +43,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 400
   alphaIsTransparency: 1
   textureType: 8
   buildTargetSettings: []