Merge branch 'FritzsHero/master' into testing

embeddedt · Feb 10, 2019 · 874a640 · 874a640
2 parents a048ccd + 4c11864
commit 874a640
Show file tree

Hide file tree

Showing 60 changed files with 42,154 additions and 38,071 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,37 @@
+# Changelog
+All notable changes to this RoadArchitect project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
+## [Version: 1.8_FH] - 2019.02.10
+### Improvements
+- Added some FH_Tag Optimizable as comments, since there is a way to further optimize the Code tagged by this
+- Added a few Lines of comments to the code, to get a better idea of what the code does
+
+### Changed
+- Changed some Layouts of the Scripts
+- Changed some Vars in Scripts to better reflect their purpose
+
+### Added
+- Added a few Regions to some Scripts
+
+###Fixed
+- Fixed embeddedt/RoadArchitect/issues/4
+
+## [Version: 1.7.5a_FH] - 2019.01.31
+### Changed
+- Changed most Layouts of the Scripts
+- Changed some Vars in Scripts to better reflect their purpose
+
+## [Version 1.7] - 2018.07.16
+### Changed
+- Adds support for Unity 2018.x
+- Updates to unit tests
+- No further Informations given at this point
+
+## [Version 1.6] - 2017.02.28
+### Changed
+- Initial Release
+- No further Informations given at this point
diff --git a/CHANGELOG.md.meta b/CHANGELOG.md.meta
diff --git a/Editor/GSDEditorProgressWindow.cs b/Editor/GSDEditorProgressWindow.cs
@@ -1,54 +1,63 @@
-#if UNITY_EDITOR
-using UnityEditor;
-#endif
-using UnityEngine;
-
-/// <summary>
-/// Used for progress information for other areas of RA.
-/// </summary>
-public class GSDEditorProgressWindow : EditorWindow
-{
-    float secs = 10.0f;
-    float startVal = 0f;
-    float progress = 0f;
-
-#if UNITY_EDITOR
-    static void Init()
-    {
-        GSDEditorProgressWindow window = (GSDEditorProgressWindow)EditorWindow.GetWindow(typeof(GSDEditorProgressWindow));
-        window.Show();
-    }
-#endif
-
-#if UNITY_EDITOR
-    void OnGUI()
-    {
-        secs = EditorGUILayout.FloatField("Time to wait:", secs);
-        if (GUILayout.Button("Display bar"))
-        {
-            if (secs < 1)
-            {
-                Debug.LogError("Seconds should be bigger than 1");
-                return;
-            }
-            startVal = (float)EditorApplication.timeSinceStartup;
-        }
-
-        if (progress < secs)
-            EditorUtility.DisplayProgressBar(
-                "Simple Progress Bar",
-                "Shows a progress bar for the given seconds",
-                progress / secs);
-        else
-            EditorUtility.ClearProgressBar();
-
-        progress = (float)(EditorApplication.timeSinceStartup - startVal);
-    }
-
-
-    void OnInspectorUpdate()
-    {
-        Repaint();
-    }
-#endif
+#region "Imports"
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+using UnityEngine;
+#endregion
+
+
+/// <summary>
+/// Used for progress information for other areas of RA.
+/// </summary>
+public class GSDEditorProgressWindow : EditorWindow
+{
+    float secs = 10.0f;
+    float startVal = 0f;
+    float progress = 0f;
+
+
+#if UNITY_EDITOR
+    static void Init()
+    {
+        GSDEditorProgressWindow window = (GSDEditorProgressWindow) EditorWindow.GetWindow(typeof(GSDEditorProgressWindow));
+        window.Show();
+    }
+#endif
+
+
+#if UNITY_EDITOR
+    void OnGUI()
+    {
+        secs = EditorGUILayout.FloatField("Time to wait:", secs);
+        if (GUILayout.Button("Display bar"))
+        {
+            if (secs < 1)
+            {
+                Debug.LogError("Seconds should be bigger than 1");
+                return;
+            }
+            startVal = (float) EditorApplication.timeSinceStartup;
+        }
+
+        if (progress < secs)
+        {
+            EditorUtility.DisplayProgressBar(
+            "Simple Progress Bar",
+            "Shows a progress bar for the given seconds",
+            progress / secs);
+        }
+        else
+        {
+            EditorUtility.ClearProgressBar();
+        }
+
+        progress = (float) (EditorApplication.timeSinceStartup - startVal);
+    }
+
+
+    void OnInspectorUpdate()
+    {
+        Repaint();
+    }
+#endif
 }
diff --git a/Editor/GSDHelpWindow.cs b/Editor/GSDHelpWindow.cs
@@ -1,37 +1,40 @@
-#region "Imports"
-using UnityEngine;
-using UnityEditor;
-#endregion
-public class GSDHelpWindow : EditorWindow
-{
-    void OnGUI()
-    {
-        EditorStyles.label.wordWrap = true;
-        EditorStyles.miniLabel.wordWrap = true;
-
-        EditorGUILayout.LabelField("Road Architect Help", EditorStyles.boldLabel);
-        EditorGUILayout.LabelField("Please visit the online manual for help.");
-        GUILayout.Space(4f);
-
-        if (GUILayout.Button("Click here to open online manual", EditorStyles.miniButton, GUILayout.Width(300f)))
-        {
-            Application.OpenURL("http://microgsd.com/Support.aspx");
-        }
-
-        EditorGUILayout.LabelField("http://microgsd.com/Support.aspx", EditorStyles.miniLabel);
-        GUILayout.Space(4f);
-        EditorGUILayout.LabelField("Please visit the online manual for help.", EditorStyles.miniLabel);
-        GUILayout.Space(4f);
-        EditorGUILayout.LabelField("Please visit our unity forum thread or contact [email protected] with any questions or comments.", EditorStyles.miniLabel);
-    }
-
-    #region "Init"
-    public void Initialize()
-    {
-        Rect fRect = new Rect(340, 170, 420, 180);
-        position = fRect;
-        Show();
-        titleContent.text = "Help Info";
-    }
-    #endregion
+#region "Imports"
+using UnityEngine;
+using UnityEditor;
+#endregion
+
+
+public class GSDHelpWindow : EditorWindow
+{
+    void OnGUI()
+    {
+        EditorStyles.label.wordWrap = true;
+        EditorStyles.miniLabel.wordWrap = true;
+
+        EditorGUILayout.LabelField("Road Architect Help", EditorStyles.boldLabel);
+        EditorGUILayout.LabelField("Please visit the online manual for help.");
+        GUILayout.Space(4f);
+
+        if (GUILayout.Button("Click here to open online manual", EditorStyles.miniButton, GUILayout.Width(300f)))
+        {
+            Application.OpenURL("http://microgsd.com/Support.aspx");
+        }
+
+        EditorGUILayout.LabelField("http://microgsd.com/Support.aspx", EditorStyles.miniLabel);
+        GUILayout.Space(4f);
+        EditorGUILayout.LabelField("Please visit the online manual for help.", EditorStyles.miniLabel);
+        GUILayout.Space(4f);
+        EditorGUILayout.LabelField("Please visit our unity forum thread or contact [email protected] with any questions or comments.", EditorStyles.miniLabel);
+    }
+
+
+    #region "Init"
+    public void Initialize()
+    {
+        Rect fRect = new Rect(340, 170, 420, 180);
+        position = fRect;
+        Show();
+        titleContent.text = "Help Info";
+    }
+    #endregion
 }
diff --git a/Editor/GSDNotification.cs b/Editor/GSDNotification.cs
@@ -1,29 +1,35 @@
-using UnityEngine;
-using UnityEditor;
-using System.Collections;
-
-/// <summary>
-/// Used for notifications in other areas of RA.
-/// </summary>
-public class GSDNotification : EditorWindow
-{
-    string notification = "This is a Notification";
-    static void Initialize()
-    {
-        GSDNotification window = EditorWindow.GetWindow<GSDNotification>();
-        window.Show();
-    }
-
-    void OnGUI()
-    {
-        notification = EditorGUILayout.TextField(notification);
-        if (GUILayout.Button("Show Notification"))
-        {
-            this.ShowNotification(new GUIContent(notification));
-        }
-        if (GUILayout.Button("Remove Notification"))
-        {
-            this.RemoveNotification();
-        }
-    }
+#region Imports
+using UnityEngine;
+using UnityEditor;
+using System.Collections;
+#endregion
+
+
+/// <summary>
+/// Used for notifications in other areas of RA.
+/// </summary>
+public class GSDNotification : EditorWindow
+{
+    string notification = "This is a Notification";
+
+
+    static void Initialize()
+    {
+        GSDNotification window = EditorWindow.GetWindow<GSDNotification>();
+        window.Show();
+    }
+
+
+    void OnGUI()
+    {
+        notification = EditorGUILayout.TextField(notification);
+        if (GUILayout.Button("Show Notification"))
+        {
+            this.ShowNotification(new GUIContent(notification));
+        }
+        if (GUILayout.Button("Remove Notification"))
+        {
+            this.RemoveNotification();
+        }
+    }
 }