Skip to content

Commit 0f98a7d

Browse files
author
Hamish
committed
Merge branch 'develop'
2 parents 4dd13e4 + f9294d9 commit 0f98a7d

14 files changed

+346
-87
lines changed

src/koside.sln

+30
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,46 @@ VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "koside", "koside\koside.csproj", "{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}"
77
EndProject
8+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Any CPU = Debug|Any CPU
13+
Debug|ARM = Debug|ARM
14+
Debug|x64 = Debug|x64
15+
Debug|x86 = Debug|x86
1116
Release|Any CPU = Release|Any CPU
17+
Release|ARM = Release|ARM
18+
Release|x64 = Release|x64
19+
Release|x86 = Release|x86
1220
EndGlobalSection
1321
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1422
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1523
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Debug|ARM.ActiveCfg = Debug|Any CPU
25+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Debug|ARM.Build.0 = Debug|Any CPU
26+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Debug|x64.ActiveCfg = Debug|Any CPU
27+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Debug|x64.Build.0 = Debug|Any CPU
28+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Debug|x86.ActiveCfg = Debug|Any CPU
29+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Debug|x86.Build.0 = Debug|Any CPU
1630
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
1731
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Release|ARM.ActiveCfg = Release|Any CPU
33+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Release|ARM.Build.0 = Release|Any CPU
34+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Release|x64.ActiveCfg = Release|Any CPU
35+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Release|x64.Build.0 = Release|Any CPU
36+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Release|x86.ActiveCfg = Release|Any CPU
37+
{F251A1CF-AFB1-4BF6-8FCA-2122C3AC6B9D}.Release|x86.Build.0 = Release|Any CPU
38+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Debug|Any CPU.ActiveCfg = Debug|x86
39+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Debug|ARM.ActiveCfg = Debug|x86
40+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Debug|x64.ActiveCfg = Debug|x86
41+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Debug|x86.ActiveCfg = Debug|x86
42+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Debug|x86.Build.0 = Debug|x86
43+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Release|Any CPU.ActiveCfg = Release|x86
44+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Release|ARM.ActiveCfg = Release|x86
45+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Release|x64.ActiveCfg = Release|x86
46+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Release|x86.ActiveCfg = Release|x86
47+
{B014AAA1-4EEF-48CE-8ECB-FDFF40A0127D}.Release|x86.Build.0 = Release|x86
1848
EndGlobalSection
1949
GlobalSection(SolutionProperties) = preSolution
2050
HideSolutionNode = FALSE

src/koside/App.config

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="koside.Settings1" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="koside.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
66
</sectionGroup>
77
</configSections>
88
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
1010
</startup>
1111
<userSettings>
12-
<koside.Settings1>
12+
<koside.Properties.Settings>
1313
<setting name="KSPLoc" serializeAs="String">
14-
<value>(Fill this in)\steamapps\common\Kerbal Space Program</value>
14+
<value />
1515
</setting>
1616
<setting name="DarkMode" serializeAs="String">
1717
<value>False</value>
1818
</setting>
19-
</koside.Settings1>
19+
<setting name="FirstRun" serializeAs="String">
20+
<value>True</value>
21+
</setting>
22+
</koside.Properties.Settings>
2023
</userSettings>
21-
</configuration>
24+
</configuration>

src/koside/Form1.Designer.cs

+21-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)