Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016

Conflicts:
	Assets/scripts/SelectorWithBolts.cs

Assets/art/ground_tile1.png.meta

@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 7a047ec9930b8af4e9cf30d00aca8cc0
+timeCreated: 1454225719
+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: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  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: 

Assets/art/ground_tile2.png.meta

@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: b8434d66bc4374e459ad04147d95a118
+timeCreated: 1454225719
+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: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  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: 

Assets/prefabs/DashParticleSystem.prefab.meta

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

Assets/prefabs/HexSprite.prefab

@@ -136,7 +136,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: f09d267dab1f3be43a8ded6b3f64d780, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b8434d66bc4374e459ad04147d95a118, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
 --- !u!1001 &100100000
 Prefab:

Assets/scenes/GameplayScene.unity

@@ -638,9 +638,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0659941834f628445b182d075f37a958, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  xScale: 3
+  xScale: 2.79999995
-  yScale: 3
+  yScale: 2.79999995
-  dimension: .680000007
+  dimension: .720000029
   hexagon: {fileID: 118646, guid: 950731e814d3ade4c91c128681c35ce2, type: 2}
 --- !u!4 &1173224168
 Transform:

Assets/scenes/GameplayScene2.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2916ec590b2a27846b1e17dd3be759be
+timeCreated: 1454232354
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/scripts/Character.cs

@@ -14,7 +14,7 @@ public class Character : MonoBehaviour
     public Color TrailColor;
 
     private Rigidbody rb;
-    private Quaternion targetRot;
+    private Quaternion targetRot = Quaternion.identity;
 
     private float dashRemainingTime = 6f;
     private bool isDashing = false;
@@ -24,6 +24,8 @@ public class Character : MonoBehaviour
 
     private Vector3 dashForward;
 
+    private ParticleSystem particleSys;
+
     public int PlayerID
     {
         get { return playerId; }
@@ -33,6 +35,7 @@ public class Character : MonoBehaviour
     void Awake()
     {
         rb = GetComponent<Rigidbody>();
+        particleSys = GetComponent<ParticleSystem>();
     }
 
     void Start()
@@ -52,8 +55,8 @@ public class Character : MonoBehaviour
             rb.AddForce(dashForward * DashForce, ForceMode.VelocityChange);
         }
         else
-        {
+        {
-            rb.rotation = Quaternion.RotateTowards(rb.rotation, targetRot, TurnSpeed * Time.deltaTime);
+			rb.rotation = Quaternion.RotateTowards(rb.rotation, targetRot, TurnSpeed * Time.deltaTime);
         }
     }
 
@@ -92,6 +95,8 @@ public class Character : MonoBehaviour
 
         dashRemainingTime = DashCooldown;
 
+        //particleSys.Play();
+
         StartCoroutine(DashCoroutine());
         
         return true;

Assets/scripts/Player.cs

@@ -19,11 +19,11 @@ public class Player {
 		{
 			letters[i] = (int)(str[i] - 'A');
 		}
-		Debug.Log("Player " + num + " has:");
+		/*Debug.Log("Player " + num + " has:");
 		foreach (int i in letters)
 		{
 			Debug.Log(i);
-		}
+		}*/
 	}
 
 	public void SetWord(int[] letters)

Assets/scripts/RuneBehaviour.cs

@@ -31,6 +31,12 @@ public class RuneBehaviour : MonoBehaviour {
 	    }
 	}
 
+	void Start()
+	{
+		float col = 80f/255f; // Random.value;
+		GetComponent<Renderer>().material.color = new Color(col, col, col);
+	}
+
     void OnTriggerEnter(Collider col)
     {
         if (col.gameObject.tag == "Player" && currentCharacter == null)