Merge remote-tracking branch 'origin/develop'

Components/update.LiveSplit.Skyrim.xml

@@ -1,4 +1,17 @@
 <updates>
+    <update version="1.4.2">
+        <files>
+            <file path="Components/LiveSplit.Skyrim.dll" status="changed"/>
+        </files>
+        <changelog>
+            <change>
+                Fixed guild autosplits.
+            </change>
+            <change>
+                Fixed timer not starting on first run.
+            </change>
+        </changelog>
+    </update>
     <update version="1.4.1">
         <files>
             <file path="Components/LiveSplit.Skyrim.dll" status="changed"/>

Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.1.0")]
-[assembly: AssemblyFileVersion("1.4.1.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
 
 [assembly: ComponentFactory(typeof(SkyrimFactory))]

README.md

@@ -1,5 +1,5 @@
-LiveSplit.Skyrim v1.4
-=====================
+LiveSplit.Skyrim v1.4.2
+=======================
 
 LiveSplit.Skyrim is a [LiveSplit](http://livesplit.org/) component for The Elder Scrolls V: Skyrim.
 

SkyrimComponent.cs

@@ -7,6 +7,7 @@
 using System.Drawing;
 using System.Xml;
 using System.Windows.Forms;
+using System.Diagnostics;
 
 namespace LiveSplit.Skyrim
 {
@@ -147,14 +148,15 @@ void gameMemory_OnLoadFinished(object sender, EventArgs e)
         //     // Nothing to do
         // }
 
-        void gameMemory_OnSplitCompleted(object sender, GameMemory.SplitArea split)
+        void gameMemory_OnSplitCompleted(object sender, GameMemory.SplitArea split, uint frame)
         {
+            Trace.WriteLineIf(split != GameMemory.SplitArea.None, String.Format("[NoLoads] {0} Split - {1}", split, frame));
             if (!_gameMemory.splitStates[(int)split] &&
                 ((split == GameMemory.SplitArea.Helgen && this.Settings.Helgen) ||
-                (split == GameMemory.SplitArea.HailSithisCompleted && this.Settings.HailSithis) ||
-                (split == GameMemory.SplitArea.GloryOfTheDeadCompleted && this.Settings.GloryOfTheDead) ||
-                (split == GameMemory.SplitArea.TheEyeOfMagnusCompleted && this.Settings.TheEyeofMagnus) ||
-                (split == GameMemory.SplitArea.UnderNewManagenementCompleted && this.Settings.UnderNewManagement) ||
+                (split == GameMemory.SplitArea.DarkBrotherhoodQuestlineCompleted && this.Settings.DarkBrotherhood) ||
+                (split == GameMemory.SplitArea.CompanionsQuestlineCompleted && this.Settings.Companions) ||
+                (split == GameMemory.SplitArea.CollegeQuestlineCompleted && this.Settings.CollegeOfWinterhold) ||
+                (split == GameMemory.SplitArea.ThievesGuildQuestlineCompleted && this.Settings.ThievesGuild) ||
                 (split == GameMemory.SplitArea.AlduinDefeated && this.Settings.AlduinDefeated)))
             {
                 _timer.Split();

SkyrimSettings.cs

@@ -11,19 +11,19 @@ public partial class SkyrimSettings : UserControl
         public bool AutoStart { get; set; }
         public bool AlduinDefeated { get; set; }
         public bool Helgen { get; set; }
-        public bool HailSithis { get; set; }
-        public bool GloryOfTheDead { get; set; }
-        public bool UnderNewManagement { get; set; }
-        public bool TheEyeofMagnus { get; set; }
+        public bool DarkBrotherhood { get; set; }
+        public bool Companions { get; set; }
+        public bool ThievesGuild { get; set; }
+        public bool CollegeOfWinterhold { get; set; }
 
         private const bool DEFAULT_DRAWWITHOUTLOADS = true;
         private const bool DEFAULT_AUTOSTART = true;
         private const bool DEFAULT_ALDUINDEFEATED = true;
         private const bool DEFAULT_HELGEN = false;
-        private const bool DEFAULT_HAILSITHIS = false;
-        private const bool DEFAULT_GLORYOFTHEDEAD = false;
-        private const bool DEFAULT_UNDERNEWMANAGEMENT = false;
-        private const bool DEFAULT_THEEYEOFMAGNUS = false;
+        private const bool DEFAULT_DARKBROTHERHOOD = false;
+        private const bool DEFAULT_COMPANIONS = false;
+        private const bool DEFAULT_THIEVESGUILD = false;
+        private const bool DEFAULT_COLLEGEOFWINTERHOLD = false;
 
         public SkyrimSettings()
         {
@@ -33,20 +33,20 @@ public SkyrimSettings()
             this.chkAutoStart.DataBindings.Add("Checked", this, "AutoStart", false, DataSourceUpdateMode.OnPropertyChanged);
             this.chkAlduinDefeated.DataBindings.Add("Checked", this, "AlduinDefeated", false, DataSourceUpdateMode.OnPropertyChanged);
             this.chkHelgen.DataBindings.Add("Checked", this, "Helgen", false, DataSourceUpdateMode.OnPropertyChanged);
-            this.chkHailSithis.DataBindings.Add("Checked", this, "HailSithis", false, DataSourceUpdateMode.OnPropertyChanged);
-            this.chkGloryOfTheDead.DataBindings.Add("Checked", this, "GloryOfTheDead", false, DataSourceUpdateMode.OnPropertyChanged);
-            this.chkUnderNewManagement.DataBindings.Add("Checked", this, "UnderNewManagement", false, DataSourceUpdateMode.OnPropertyChanged);
-            this.chkTheEyeofMagnus.DataBindings.Add("Checked", this, "TheEyeofMagnus", false, DataSourceUpdateMode.OnPropertyChanged);
+            this.chkDarkBrotherhood.DataBindings.Add("Checked", this, "DarkBrotherhood", false, DataSourceUpdateMode.OnPropertyChanged);
+            this.chkCompanions.DataBindings.Add("Checked", this, "Companions", false, DataSourceUpdateMode.OnPropertyChanged);
+            this.chkThievesGuild.DataBindings.Add("Checked", this, "ThievesGuild", false, DataSourceUpdateMode.OnPropertyChanged);
+            this.chkCollege.DataBindings.Add("Checked", this, "CollegeOfWinterhold", false, DataSourceUpdateMode.OnPropertyChanged);
 
             // defaults
             this.DrawWithoutLoads = DEFAULT_DRAWWITHOUTLOADS;
             this.AutoStart = DEFAULT_AUTOSTART;
             this.AlduinDefeated = DEFAULT_ALDUINDEFEATED;
             this.Helgen = DEFAULT_HELGEN;
-            this.HailSithis = DEFAULT_HAILSITHIS;
-            this.GloryOfTheDead = DEFAULT_GLORYOFTHEDEAD;
-            this.TheEyeofMagnus = DEFAULT_THEEYEOFMAGNUS;
-            this.UnderNewManagement = DEFAULT_UNDERNEWMANAGEMENT;
+            this.DarkBrotherhood = DEFAULT_DARKBROTHERHOOD;
+            this.Companions = DEFAULT_COMPANIONS;
+            this.CollegeOfWinterhold = DEFAULT_COLLEGEOFWINTERHOLD;
+            this.ThievesGuild = DEFAULT_THIEVESGUILD;
         }
 
         public XmlNode GetSettings(XmlDocument doc)
@@ -59,10 +59,10 @@ public XmlNode GetSettings(XmlDocument doc)
             settingsNode.AppendChild(ToElement(doc, "AutoStart", this.AutoStart));
             settingsNode.AppendChild(ToElement(doc, "AlduinDefeated", this.AlduinDefeated));
             settingsNode.AppendChild(ToElement(doc, "Helgen", this.Helgen));
-            settingsNode.AppendChild(ToElement(doc, "HailSithis", this.HailSithis));
-            settingsNode.AppendChild(ToElement(doc, "GloryOfTheDead", this.GloryOfTheDead));
-            settingsNode.AppendChild(ToElement(doc, "UnderNewManagement", this.UnderNewManagement));
-            settingsNode.AppendChild(ToElement(doc, "TheEyeofMagnus", this.TheEyeofMagnus));
+            settingsNode.AppendChild(ToElement(doc, "DarkBrotherhood", this.DarkBrotherhood));
+            settingsNode.AppendChild(ToElement(doc, "Companions", this.Companions));
+            settingsNode.AppendChild(ToElement(doc, "ThievesGuild", this.ThievesGuild));
+            settingsNode.AppendChild(ToElement(doc, "CollegeOfWinterhold", this.CollegeOfWinterhold));
 
             return settingsNode;
         }
@@ -73,10 +73,10 @@ public void SetSettings(XmlNode settings)
             this.AutoStart = ParseBool(settings, "AutoStart", DEFAULT_AUTOSTART);
             this.AlduinDefeated = ParseBool(settings, "AlduinDefeated", DEFAULT_ALDUINDEFEATED);
             this.Helgen = ParseBool(settings, "Helgen", DEFAULT_HELGEN);
-            this.HailSithis = ParseBool(settings, "HailSithis", DEFAULT_HAILSITHIS);
-            this.GloryOfTheDead = ParseBool(settings, "GloryOfTheDead", DEFAULT_GLORYOFTHEDEAD);
-            this.UnderNewManagement = ParseBool(settings, "UnderNewManagement", DEFAULT_UNDERNEWMANAGEMENT);
-            this.TheEyeofMagnus = ParseBool(settings, "TheEyeofMagnus", DEFAULT_THEEYEOFMAGNUS);
+            this.DarkBrotherhood = ParseBool(settings, "DarkBrotherhood", DEFAULT_DARKBROTHERHOOD);
+            this.Companions = ParseBool(settings, "Companions", DEFAULT_COMPANIONS);
+            this.ThievesGuild = ParseBool(settings, "ThievesGuild", DEFAULT_THIEVESGUILD);
+            this.CollegeOfWinterhold = ParseBool(settings, "CollegeOfWinterhold", DEFAULT_COLLEGEOFWINTERHOLD);
         }
 
         static bool ParseBool(XmlNode settings, string setting, bool default_ = false)

SkyrimSettings.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -117,4 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-</root>
+</root>