Merge remote-tracking branch 'upstream/master' into for105
author Gerry1135
()
committer Gerry1135
()
commit 91843ec860401756f4bb2f267f665ff554f187b7
tree 5983b66fee159ac79b0228c1adb222577df6bcbc
parent fce5401e38e9b0bb9a8f285803c506532d40b4fb
parent 2e43e35f35c3adbf1daa62674ef4d978e612cc24
Merge remote-tracking branch 'upstream/master' into for105
67 files changed:
.gitignore
Assets/Images/app-launcher-icon.psd [ moved from Assets/ToolbarIcon.psd with 100%% similarity ]
Assets/Images/flight-menu-background.psd [ moved from Assets/ToolbarBackground.psd with 100%% similarity ]
Assets/Images/ui-drop-down.psd [ moved from Assets/DropDownBackground.psd with 100%% similarity ]
Assets/Plugins/KerbalEngineer.Unity.dll [ new file with mode 0644 ]
Assets/Prefabs/FlightMenu.prefab [ new file with mode 0644 ]
Assets/Prefabs/FlightMenuSection.prefab [ new file with mode 0644 ]
Assets/Scenes/main.unity [ new file with mode 0644 ]
Assets/Scripts/Editor/BuildAssetBundles.cs [ new file with mode 0644 ]
Assets/Testing/background-editor.png [ new file with mode 0644 ]
Assets/Testing/background-flight.png [ new file with mode 0644 ]
Documents/CHANGES.txt
KerbalEngineer.CSharp.Editor.csproj [ new file with mode 0644 ]
KerbalEngineer.CSharp.csproj [ new file with mode 0644 ]
KerbalEngineer.Unity/CanvasGroupFader.cs [ new file with mode 0644 ]
KerbalEngineer.Unity/Flight/FlightMenu.cs [ new file with mode 0644 ]
KerbalEngineer.Unity/Flight/FlightMenuSection.cs [ new file with mode 0644 ]
KerbalEngineer.Unity/Flight/IFlightAppLauncher.cs [ new file with mode 0644 ]
KerbalEngineer.Unity/Flight/ISectionModule.cs [ new file with mode 0644 ]
KerbalEngineer.Unity/KerbalEngineer.Unity.csproj [ new file with mode 0644 ]
KerbalEngineer.Unity/Properties/AssemblyInfo.cs [ new file with mode 0644 ]
KerbalEngineer.sln
KerbalEngineer/AppLauncherButton.cs [ new file with mode 0644 ]
KerbalEngineer/AssetBundleLoader.cs [ new file with mode 0644 ]
KerbalEngineer/Editor/BuildAppLauncher.cs [ new file with mode 0644 ]
KerbalEngineer/Editor/BuildOverlayPartInfo.cs
KerbalEngineer/Editor/BuildToolbar.cs [ deleted file ]
KerbalEngineer/Flight/ActionMenu.cs
KerbalEngineer/Flight/DisplayStack.cs
KerbalEngineer/Flight/FlightAppLauncher.cs [ new file with mode 0644 ]
KerbalEngineer/Flight/FlightEngineerCore.cs
KerbalEngineer/Flight/Sections/SectionEditor.cs
KerbalEngineer/Flight/Sections/SectionModule.cs
KerbalEngineer/Flight/Sections/SectionWindow.cs
KerbalEngineer/Helpers/TimeFormatter.cs
KerbalEngineer/Helpers/Units.cs
KerbalEngineer/KerbalEngineer.csproj
KerbalEngineer/KeyBinding/KeyBindPopup.cs
KerbalEngineer/TapeDriveAnimator.cs
Output/KerbalEngineer/KerbalEngineer [ new file with mode 0644 ]
Output/KerbalEngineer/KerbalEngineer.Unity.dll [ new file with mode 0644 ]
Output/KerbalEngineer/KerbalEngineer.dll
Output/KerbalEngineer/KerbalEngineer.manifest [ new file with mode 0644 ]
Output/KerbalEngineer/KerbalEngineer.version
Output/KerbalEngineer/Textures/ToolbarIcon.png [ deleted file ]
Output/KerbalEngineer/images [ new file with mode 0644 ]
Output/KerbalEngineer/images.manifest [ new file with mode 0644 ]
Output/KerbalEngineer/prefabs [ new file with mode 0644 ]
Output/KerbalEngineer/prefabs.manifest [ new file with mode 0644 ]
ProjectSettings/AudioManager.asset [ new file with mode 0644 ]
ProjectSettings/DynamicsManager.asset [ new file with mode 0644 ]
ProjectSettings/EditorBuildSettings.asset [ new file with mode 0644 ]
ProjectSettings/EditorSettings.asset [ new file with mode 0644 ]
ProjectSettings/GraphicsSettings.asset [ new file with mode 0644 ]
ProjectSettings/InputManager.asset [ new file with mode 0644 ]
ProjectSettings/NavMeshAreas.asset [ new file with mode 0644 ]
ProjectSettings/NetworkManager.asset [ new file with mode 0644 ]
ProjectSettings/Physics2DSettings.asset [ new file with mode 0644 ]
ProjectSettings/ProjectSettings.asset [ new file with mode 0644 ]
ProjectSettings/ProjectVersion.txt [ new file with mode 0644 ]
ProjectSettings/QualitySettings.asset [ new file with mode 0644 ]
ProjectSettings/TagManager.asset [ new file with mode 0644 ]
ProjectSettings/TimeManager.asset [ new file with mode 0644 ]
ProjectSettings/UnityAdsSettings.asset [ new file with mode 0644 ]
ProjectSettings/UnityAnalyticsManager.asset [ new file with mode 0644 ]
Publishing/CurseLogo.png [ moved from Assets/CurseLogo.png with 100%% similarity ]
Publishing/CurseLogo.psd [ moved from Assets/CurseLogo.psd with 100%% similarity ]