Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
allista committed May 3, 2020
2 parents 9fd53fd + 43eeb5e commit 9292b94
Show file tree
Hide file tree
Showing 60 changed files with 1,566 additions and 175 deletions.
33 changes: 22 additions & 11 deletions .gitignore
Expand Up @@ -13,24 +13,35 @@ obj/**
*.user

*.pdb
*.pdb.meta

.vs
Unity/Temp
Unity/Logs
Unity/Library
Unity/ProjectSettings
Unity/Assets/PartTools
Unity/Assets/Plugins
Unity/Assets/SquadCore

*.meta
Unity/AssetBundles
Unity/Assembly-CSharp-Editor.csproj
Unity/Assembly-CSharp.csproj
Unity/UnityPackageManager/manifest.json
Unity/Assets/Editor/KSPCurveEditor.cs
Unity/Assets/Editor/TextMeshProResolver.cs
Unity/Assets/PartTools
Unity/Assets/Plugins/KSPAssets
Unity/Assets/SquadCore
Unity/Assets/TextMesh Pro
Unity/.idea
Unity/AT_Utils.sln
Unity/AssetBundles
Unity/UnityPackageManager/manifest.json
/Unity/Assets/XML/squadcore_bundle.xml
/Unity/Assets/TextMesh Pro
/Unity/.idea
/Unity/Logs

Unity/Assets/XML/squadcore_bundle.xml
Unity/Assets/XML/squadcore_bundle.xml.meta
Unity/Assets/Editor/FindMissingScripts.cs.cs.meta
Unity/Assets/Editor/FindMissingScriptsRecursive.cs.meta
Unity/Assets/Editor/KSPCurveEditor.cs.meta
Unity/Assets/Plugins/KSPAssets.meta
Unity/Assembly-CSharp-Editor-firstpass.csproj
Unity/Assembly-CSharp-firstpass.csproj
Unity/PartTools.cfg
Unity/Assets/PartTools.meta
Unity/Assets/SquadCore.meta
Unity/Packages/manifest.json
8 changes: 7 additions & 1 deletion ChangeLog.md
@@ -1,6 +1,12 @@
#AT Utils ChangeLog

* **v1.9.2**
* **v1.9.3**
* Added all relevant .meta files from Unity project
* Added Utils.Log and its variants without params
* Added Utils.Debug .Info .Warning and .Error log methods
* Fixed loading of UI from bundles after scene switch

* v1.9.2
* Fixed UI bundle loading
* Changed Min/Max KSP versions to 1.9.0 - 1.9.1
* Changed references to KSP-1.9.1
Expand Down
2 changes: 1 addition & 1 deletion GameData/000_AT_Utils/000_AT_Utils.version
Expand Up @@ -7,7 +7,7 @@
{
"MAJOR":1,
"MINOR":9,
"PATCH":2,
"PATCH":3,
"BUILD":0
},
"KSP_VERSION_MIN":
Expand Down

0 comments on commit 9292b94

Please sign in to comment.