Merge branch 'development'

NPBruce · Mar 24, 2017 · 63121f2 · 63121f2
2 parents 8d9eddd + bd84151
commit 63121f2
Show file tree

Hide file tree

Showing 169 changed files with 14,944 additions and 5,621 deletions.
diff --git a/Assets/Editor.meta b/Assets/Editor.meta
diff --git a/Assets/Resources/Fonts/FontMaterial.mat b/Assets/Resources/Fonts/FontMaterial.mat
@@ -0,0 +1,148 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: FontMaterial
+  m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+    - first:
+        name: _BumpMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _DetailAlbedoMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _DetailMask
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _DetailNormalMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _EmissionMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _MainTex
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _MetallicGlossMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _OcclusionMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _ParallaxMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - first:
+        name: _BumpScale
+      second: 1
+    - first:
+        name: _ColorMask
+      second: 15
+    - first:
+        name: _Cutoff
+      second: 0.5
+    - first:
+        name: _DetailNormalMapScale
+      second: 1
+    - first:
+        name: _DstBlend
+      second: 0
+    - first:
+        name: _GlossMapScale
+      second: 1
+    - first:
+        name: _Glossiness
+      second: 0.5
+    - first:
+        name: _GlossyReflections
+      second: 1
+    - first:
+        name: _Metallic
+      second: 0
+    - first:
+        name: _Mode
+      second: 0
+    - first:
+        name: _OcclusionStrength
+      second: 1
+    - first:
+        name: _Parallax
+      second: 0.02
+    - first:
+        name: _SmoothnessTextureChannel
+      second: 0
+    - first:
+        name: _SpecularHighlights
+      second: 1
+    - first:
+        name: _SrcBlend
+      second: 1
+    - first:
+        name: _Stencil
+      second: 0
+    - first:
+        name: _StencilComp
+      second: 8
+    - first:
+        name: _StencilOp
+      second: 0
+    - first:
+        name: _StencilReadMask
+      second: 255
+    - first:
+        name: _StencilWriteMask
+      second: 255
+    - first:
+        name: _UVSec
+      second: 0
+    - first:
+        name: _UseUIAlphaClip
+      second: 0
+    - first:
+        name: _ZWrite
+      second: 1
+    m_Colors:
+    - first:
+        name: _Color
+      second: {r: 1, g: 1, b: 1, a: 1}
+    - first:
+        name: _EmissionColor
+      second: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Resources/Fonts/FontMaterial.mat.meta b/Assets/Resources/Fonts/FontMaterial.mat.meta
diff --git a/Assets/Resources/version.txt b/Assets/Resources/version.txt
@@ -1 +1 @@
-0.6.0
+0.7.0
diff --git a/Assets/Scripts/ConfigFile.cs b/Assets/Scripts/ConfigFile.cs
@@ -1,6 +1,4 @@
 using System.IO;
-using UnityEngine;
-using System.Collections.Generic;
 
 // Class to control user configuration of Valkyrie
 // This is a generic system and has no knowledge of the actual configuration structure
@@ -36,7 +34,7 @@ public void Save()
         }
         catch (System.Exception)
         {
-            Debug.Log("Warning: Unable to write to config file: " + optionsFile + System.Environment.NewLine);
+            ValkyrieDebug.Log("Warning: Unable to write to config file: " + optionsFile + System.Environment.NewLine);
         }
     }
 }
diff --git a/Assets/Scripts/Content/AssetImport/AssetsFile.cs b/Assets/Scripts/Content/AssetImport/AssetsFile.cs
@@ -240,7 +240,7 @@ private void readBase(StringBuilder cb, int level)
             a_Stream.ReadInt16();
             int childrenCount = a_Stream.ReadInt32();
 
-            //Debug.WriteLine(baseFormat + " " + baseName + " " + childrenCount);
+            //ValkyrieDebug.WriteLine(baseFormat + " " + baseName + " " + childrenCount);
             cb.AppendFormat("{0}{1} {2} {3}\r\n", (new string('\t', level)), varType, varName, size);
             for (int i = 0; i < childrenCount; i++) { readBase(cb, level + 1); }
         }
@@ -350,8 +350,8 @@ private void readBase5()
                     if (index == 0) { className = varTypeStr + " " + varNameStr; }
                     else { classVarStr.AppendFormat("{0}{1} {2} {3}\r\n", (new string('\t', level)), varTypeStr, varNameStr, size); }
 
-                    //for (int t = 0; t < level; t++) { Debug.Write("\t"); }
-                    //Debug.WriteLine(varTypeStr + " " + varNameStr + " " + size);
+                    //for (int t = 0; t < level; t++) { ValkyrieDebug.Write("\t"); }
+                    //ValkyrieDebug.WriteLine(varTypeStr + " " + varNameStr + " " + size);
                 }
                 a_Stream.Position += stringSize;