-
Notifications
You must be signed in to change notification settings - Fork 230
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop'
Conflicts: .travis.yml
- Loading branch information
Showing
214 changed files
with
7,673 additions
and
1,562 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,27 @@ | ||
bin/ | ||
obj/ | ||
# VisualStudio | ||
[Bb]in/ | ||
[Oo]bj/ | ||
*.suo | ||
packages/ | ||
/src/kOS.sln.ide | ||
|
||
# Monodevelop | ||
[Ee]xported[Oo]bj/ | ||
*.userprefs | ||
|
||
# Unity | ||
[Ll]ibrary/ | ||
[Tt]emp/ | ||
/*.pidb | ||
/*.user | ||
|
||
# Build products and files generated during gameplay | ||
Resources/GameData/kOS/Plugins/ | ||
!Resources/GameData/kOS/ICSharpCode.SharpZipLib.dll | ||
|
||
# Symlink to KSP directory | ||
KSPdirlink | ||
|
||
# OS Specific | ||
.DS_STORE* | ||
[Tt]humbs.db |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,32 @@ | ||
Pull Requests | ||
============= | ||
|
||
* All PRs must be related to an open issue | ||
* If a PR changes the scripting API, it must include all related changes to the documentation. | ||
|
||
Setting Up Your Environment | ||
=========================== | ||
|
||
1. Copy `Resources/GameData/kOS` to `$KSP/GameData/`, `where $KSP` is your | ||
Kerbal Space Program installation directory. | ||
|
||
2. Download the latest KSPAPIExtensions.dll from | ||
https://github.com/Swamp-Ig/KSPAPIExtensions/releases, and copy | ||
it to `$KSP/GameData/kOS/Plugins`. | ||
|
||
3. Create a file at src/kOS/kOS.csproj.user conaining the following XML, | ||
replacing /path/to/KSP with your own KSP install directory. | ||
|
||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
<PropertyGroup> | ||
<ReferencePath> | ||
/path/to/KSP/KSP_Data/Managed; | ||
/path/to/KSP/GameData/kOS/Plugins | ||
</ReferencePath> | ||
</PropertyGroup> | ||
</Project> | ||
|
||
4. If you want building the solution to update the dlls in your KSP | ||
directory, create a symbolic link called `KSPdirlink` from the root | ||
of this repository to your KSP installation directory. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
Resources/GameData/kOS/Parts/kOSMachine0m/KR-2042_uv_layout_1_EMIS.mbm
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
Resources/GameData/kOS/Parts/kOSMachine0m/KR-2042_uv_layout_1_d_NRM.mbm
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
Resources/GameData/kOS/Parts/kOSMachine0m/KR-2042_uv_layout_d.mbm
Binary file not shown.
Binary file modified
BIN
+7.88 KB
(120%)
Resources/GameData/kOS/Parts/kOSMachine0m/model.mu
100644 → 100755
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-5.74 KB
(88%)
Resources/GameData/kOS/Parts/kOSMachine1m/model.mu
100644 → 100755
Binary file not shown.
Binary file not shown.
Binary file renamed
BIN
+4 MB
...eData/kOS/Parts/kOSMachine1m/model000.mbm → ...eData/kOS/Parts/kOSMachine1m/model002.mbm
Binary file not shown.
110 changes: 55 additions & 55 deletions
110
Resources/GameData/kOS/Parts/kOSMachine1m/part.cfg
100644 → 100755
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,55 +1,55 @@ | ||
PART | ||
{ | ||
// --- general parameters --- | ||
name = kOSMachine1m | ||
module = Part | ||
author = KevinLaity | ||
|
||
// --- asset parameters --- | ||
mesh = model/model.mu | ||
scale = 1 | ||
rescaleFactor = 0.99999999999 | ||
iconCenter = 0, 3, 0 | ||
|
||
// --- node definitions --- | ||
node_attach = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0 | ||
node_stack_bottom = 0.0, -0.173, 0.0, 0.0, -1.0, 0.0 | ||
node_stack_top = 0.0, 0.173, 0.0, 0.0, 1.0, 0.0 | ||
|
||
// --- Tech tree --- | ||
TechRequired = flightControl | ||
|
||
// --- editor parameters --- | ||
cost = 1200 | ||
entryCost = 4200 | ||
category = Control | ||
subcategory = 0 | ||
title = CX-4181 Scriptable Control System | ||
manufacturer = Compotronix | ||
description = Would you trust life and limb to a mindless autopilot, powered by untested software you hastily wrote yourself? Spacefaring kerbals would! | ||
|
||
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision | ||
attachRules = 1,0,1,1,0 | ||
|
||
// --- standard part parameters --- | ||
mass = 0.12 | ||
dragModelType = default | ||
maximum_drag = 0.2 | ||
minimum_drag = 0.2 | ||
angularDrag = 2 | ||
crashTolerance = 9 | ||
maxTemp = 3400 | ||
|
||
MODULE | ||
{ | ||
name = kOSProcessor | ||
diskSpace = 10000 | ||
} | ||
|
||
RESOURCE | ||
{ | ||
name = ElectricCharge | ||
amount = 5 | ||
maxAmount = 5 | ||
} | ||
} | ||
PART | ||
{ | ||
// --- general parameters --- V2~ fixed collision mesh | ||
name = kOSMachine1m | ||
module = Part | ||
author = KevinLaity / Peter Goddard | ||
|
||
// --- asset parameters --- | ||
mesh = model/model.mu | ||
scale = 1 | ||
rescaleFactor = 0.99999999999 | ||
iconCenter = 0, 3, 0 | ||
|
||
// --- node definitions --- | ||
node_attach = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0 | ||
node_stack_bottom = 0.0, -0.173, 0.0, 0.0, -1.0, 0.0 | ||
node_stack_top = 0.0, 0.173, 0.0, 0.0, 1.0, 0.0 | ||
|
||
// --- Tech tree --- | ||
TechRequired = flightControl | ||
|
||
// --- editor parameters --- | ||
cost = 1200 | ||
entryCost = 4200 | ||
category = Control | ||
subcategory = 0 | ||
title = CX-4181 Scriptable Control System | ||
manufacturer = Compotronix | ||
description = Would you trust life and limb to a mindless autopilot, powered by untested software you hastily wrote yourself? Spacefaring kerbals would! | ||
|
||
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision | ||
attachRules = 1,0,1,1,0 | ||
|
||
// --- standard part parameters --- | ||
mass = 0.12 | ||
dragModelType = default | ||
maximum_drag = 0.2 | ||
minimum_drag = 0.2 | ||
angularDrag = 2 | ||
crashTolerance = 9 | ||
maxTemp = 3400 | ||
|
||
MODULE | ||
{ | ||
name = kOSProcessor | ||
diskSpace = 10000 | ||
} | ||
|
||
RESOURCE | ||
{ | ||
name = ElectricCharge | ||
amount = 5 | ||
maxAmount = 5 | ||
} | ||
} |
Binary file modified
BIN
-51 KB
(49%)
Resources/GameData/kOS/Parts/kOSMachineRad/Model.mu
100644 → 100755
Binary file not shown.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.