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

Conflicts: Assets/scripts/RuneBehaviour.cs
2026-03-24 02:01:06 +00:00 · 2016-01-31 01:32:38 -05:00 · 2016-01-31 01:32:38 -05:00 · 12925f9e29
commit 12925f9e29
parent 13179d0be0 802f7a3eb2
49 changed files with 32 additions and 35 deletions
--- a/Assets/art/Resources/runic_c.png
+++ b/Assets/art/Resources/runic_c.png
--- a/Assets/art/Resources/runic_c.png.meta
+++ b/Assets/art/Resources/runic_c.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 7ad1669ebee00d744b1302b566208c5d
-timeCreated: 1454150346
+timeCreated: 1454211288
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_d.png
+++ b/Assets/art/Resources/runic_d.png
--- a/Assets/art/Resources/runic_d.png.meta
+++ b/Assets/art/Resources/runic_d.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 919a6f75650ee17488045972bd44774c
-timeCreated: 1454150347
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_e.png
+++ b/Assets/art/Resources/runic_e.png
--- a/Assets/art/Resources/runic_e.png.meta
+++ b/Assets/art/Resources/runic_e.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a2720f1ecf436ad4081ce96b4ac81a7c
-timeCreated: 1454150347
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_f.png
+++ b/Assets/art/Resources/runic_f.png
--- a/Assets/art/Resources/runic_f.png.meta
+++ b/Assets/art/Resources/runic_f.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 2b6503893219c874f9c8028455fd064e
-timeCreated: 1454150345
+timeCreated: 1454211288
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_g.png
+++ b/Assets/art/Resources/runic_g.png
--- a/Assets/art/Resources/runic_g.png.meta
+++ b/Assets/art/Resources/runic_g.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 6dc0f016a798ffc4586a8105474737f2
-timeCreated: 1454150346
+timeCreated: 1454211288
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_h.png
+++ b/Assets/art/Resources/runic_h.png
--- a/Assets/art/Resources/runic_h.png.meta
+++ b/Assets/art/Resources/runic_h.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8b9c9ed309b764c49bc89c8f950d1ce3
-timeCreated: 1454150347
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_i.png
+++ b/Assets/art/Resources/runic_i.png
--- a/Assets/art/Resources/runic_i.png.meta
+++ b/Assets/art/Resources/runic_i.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e0801334152b699499889b044a09f6d9
-timeCreated: 1454150524
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_j.png
+++ b/Assets/art/Resources/runic_j.png
--- a/Assets/art/Resources/runic_j.png.meta
+++ b/Assets/art/Resources/runic_j.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e10016986243b3240a461e7e1e00cd82
-timeCreated: 1454150348
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_k.png
+++ b/Assets/art/Resources/runic_k.png
--- a/Assets/art/Resources/runic_k.png.meta
+++ b/Assets/art/Resources/runic_k.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 04a91da37e2c51d4b83dcf540737953b
-timeCreated: 1454150344
+timeCreated: 1454211288
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_l.png
+++ b/Assets/art/Resources/runic_l.png
--- a/Assets/art/Resources/runic_l.png.meta
+++ b/Assets/art/Resources/runic_l.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5aa85fc290b86c14b9026f258ba2b401
-timeCreated: 1454150346
+timeCreated: 1454211288
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_m.png
+++ b/Assets/art/Resources/runic_m.png
--- a/Assets/art/Resources/runic_m.png.meta
+++ b/Assets/art/Resources/runic_m.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 89ffff4842cb58d42ab6e8e4fed318cd
-timeCreated: 1454150347
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_n.png
+++ b/Assets/art/Resources/runic_n.png
--- a/Assets/art/Resources/runic_n.png.meta
+++ b/Assets/art/Resources/runic_n.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 161e1d211bfeaa244972371555887e86
-timeCreated: 1454150345
+timeCreated: 1454211288
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_o.png
+++ b/Assets/art/Resources/runic_o.png
--- a/Assets/art/Resources/runic_o.png.meta
+++ b/Assets/art/Resources/runic_o.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b590e2d865d1ab54c8d5da34b6cdbdf5
-timeCreated: 1454150348
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_p.png
+++ b/Assets/art/Resources/runic_p.png
--- a/Assets/art/Resources/runic_p.png.meta
+++ b/Assets/art/Resources/runic_p.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: f1e6ab4333b156a439c7c6cad73ace58
-timeCreated: 1454150348
+timeCreated: 1454211290
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_q.png
+++ b/Assets/art/Resources/runic_q.png
--- a/Assets/art/Resources/runic_q.png.meta
+++ b/Assets/art/Resources/runic_q.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: fbd303d243c0dc341a647933f14eff27
-timeCreated: 1454150348
+timeCreated: 1454211290
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_r.png
+++ b/Assets/art/Resources/runic_r.png
--- a/Assets/art/Resources/runic_r.png.meta
+++ b/Assets/art/Resources/runic_r.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 873afe4a1a97a484b8d177e3cc6ebfd5
-timeCreated: 1454150347
+timeCreated: 1454211288
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_s.png
+++ b/Assets/art/Resources/runic_s.png
--- a/Assets/art/Resources/runic_s.png.meta
+++ b/Assets/art/Resources/runic_s.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 53b1559eb09e3124cba03468f215269c
-timeCreated: 1454150345
+timeCreated: 1454211288
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_t.png
+++ b/Assets/art/Resources/runic_t.png
--- a/Assets/art/Resources/runic_t.png.meta
+++ b/Assets/art/Resources/runic_t.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 4c630df4caf0ff24f80fccd2e7350267
-timeCreated: 1454150345
+timeCreated: 1454211288
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_u.png
+++ b/Assets/art/Resources/runic_u.png
--- a/Assets/art/Resources/runic_u.png.meta
+++ b/Assets/art/Resources/runic_u.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: f0b2462c126d2db4eac0057e052d03f0
-timeCreated: 1454150348
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_v.png
+++ b/Assets/art/Resources/runic_v.png
--- a/Assets/art/Resources/runic_v.png.meta
+++ b/Assets/art/Resources/runic_v.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 9ed289a3741d80547a3597890377fd27
-timeCreated: 1454150347
+timeCreated: 1454212635
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_w.png
+++ b/Assets/art/Resources/runic_w.png
--- a/Assets/art/Resources/runic_w.png.meta
+++ b/Assets/art/Resources/runic_w.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: deaa858bd5a4f4f478e17b742c2e538b
-timeCreated: 1454150348
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_x.png
+++ b/Assets/art/Resources/runic_x.png
--- a/Assets/art/Resources/runic_x.png.meta
+++ b/Assets/art/Resources/runic_x.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c5362a9f32d439f49b827596620cd35f
-timeCreated: 1454150348
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_y.png
+++ b/Assets/art/Resources/runic_y.png
--- a/Assets/art/Resources/runic_y.png.meta
+++ b/Assets/art/Resources/runic_y.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: ccb79002fc6082b47a3c4a599c9a0550
-timeCreated: 1454150348
+timeCreated: 1454211289
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Assets/art/Resources/runic_z.png
+++ b/Assets/art/Resources/runic_z.png
--- a/Assets/art/Resources/runic_z.png.meta
+++ b/Assets/art/Resources/runic_z.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 68f365531dc0d6a4bafdcf72143a57d0
-timeCreated: 1454150346
+timeCreated: 1454212635
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: 16
+    aniso: -1
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/scripts/MainCameraBehavior.cs
+++ b/Assets/scripts/MainCameraBehavior.cs
@ -4,19 +4,12 @@ using System.Collections;
 public class MainCameraBehavior : MonoBehaviour {

    public Transform targetTransform;
-    public float y = 2.5f; // store the height value since it will never change
-    public float offsetZ = -2.2f;
-
-
-	
-////////////////////////////////////////////
-
-
-

    public float smooth = 1.5f;         // The relative speed at which the camera will catch up.

-    
+    public float screenCenterOffsetX = 0f;
+    public float screenCenterOffsetY = 0f;
+
    private Vector3 relCameraPos;       // The relative position of the camera from the targetTransform.
    private float relCameraPosMag;      // The distance of the camera from the targetTransform.
    private Vector3 newPos;             // The position the camera is trying to reach.
@ -94,6 +87,10 @@ public class MainCameraBehavior : MonoBehaviour {
        // Create a rotation based on the relative position of the targetTransform being the forward vector.
        Quaternion lookAtRotation = Quaternion.LookRotation(reltargetTransformPosition, Vector3.up);

+        // give an offset to look at centering
+        lookAtRotation.x += screenCenterOffsetY;
+        lookAtRotation.y += screenCenterOffsetX;
+
        // Lerp the camera's rotation between it's current rotation and the rotation that looks at the targetTransform.
        transform.rotation = Quaternion.Lerp(transform.rotation, lookAtRotation, smooth * Time.deltaTime);
    }