Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
Conflicts:
	.travis.yml
  • Loading branch information
erendrake committed Jun 28, 2015
2 parents 14a4e02 + 4652d84 commit be9f16a
Show file tree
Hide file tree
Showing 214 changed files with 7,673 additions and 1,562 deletions.
26 changes: 24 additions & 2 deletions .gitignore
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
64 changes: 63 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,69 @@
kOS Mod Changelog
=================

# v0.17.1
# v0.17.3

1.0.4 Release
-----------

### BREAKING CHANGES
* Removed all `ETA_` and `ALT_` bindings, please use `ETA:` and `ALT:` instead
* `TRUEANOMALY` and `MEANANOMALYATEPOCH` are now expressed in degrees to conform to our policy
* Deprecated INCOMMRANGE - now throws an exception with instructions to use the new addons:rt methods.
* Updated maxtthrust and availablethrust calculations for KSP v1.0.x. Due to the way KSP handles thrust, neither available thrust nor maxthrust values are constant at all altitudes around bodies with atmospheres.
* Boot files are now stored on local hard drives with their original names. You may get or set the boot file name using CORE:BOOTFILENAME suffix.
* Some undocumented and nonsensical bool math operations have been removed
* The Steering deadzone is much smaller now, this will allow for every precise RCS manauvers.

### New Hotness
* You can now point RemoteTech antenna directly from script
* You can now get RemoteTech's 'local conrol' status
* Infernal Robotics integration improvements
* New loop structure to allow for more flexable itteration
* New struct object `CORE:` to interact with the currently running processor.
* Added vessel:dockingports and vessel:elements suffixes.
* Added element:dockingports and element:vessel suffixes.
* Added availablethrust suffix to engines which mirrors the availablethrust suffix for vessels.
* Added maxthrustat, availablethrustat, and ispat suffixes to engines to read the values at specified atmoshperic pressures. See the documentation for details.
* Added maxthrustat and availablethrustat suffixes to vessels to read the values at a specified atmoshperic pressures. See the documentation for details.
* You can now use bootfiles while "Start on Archive volume" is enabled
* Many new sound effects have been added (error, beep, and an option for key click)
* Boolean AND and OR operations can now short circut
* Add new WARPTO command that uses the new KSP function
* Added new `BODY:SOIRADIUS`
* Added new suffixes to part that lets you get the bare names of events, actions, and modules
* You can now use bootfiles while "Start on Archive volume" is enabled
* Many new sound effects have been added (error, beep, and an option for key click)
* Boolean AND and OR operations can now short circut
* Added `CLEARVECDRAWS` that will remove all VECDRAWS
* Any floating point value that has no floating component will be converted to an integer

### Old and busted
* Fixed empty return statements crashing with an argument count exception #934
* Fix setting vector:mag to a new value actually setting the magnitude to 1 #952
* Fix electricity being consumed while the game was paused #526
* Fix Part Resource string representation #1062
* Fix UNLOCK inside brace statements #1048 #1051
* Fix setting PHYSICS warp mode #989
* Fix printing engine list duplication #1026, #1057
* Fix terminal lockout when RemoteTech has no connection to the KSC, but the ship has local control.
* Fixed a crappy parser error that was causing `,` to do bazzare things to some code #925
* Fix running an empty program resetting the parent #858
* Fix some error printing related to nodes #905
* Fix kOS processor sinking into launch pad #980
* Fix `rename file` command #971
* Fix `return` statement breaking closure #923
* Fix docking port query #937
* better expression support inside square brackets #935
* you can now `LOCK` in a loop #954
* the kOS toolbar button should be better behaved now
* Volume indexes will truncate floating values rather than throwing an error
* `LIST FILES IN` syntax now works for archive
* electricity consumption is better behaved
* setting the target to an empty string will always unset target


# v0.17.2

1.0 Release
-----------
Expand Down
30 changes: 30 additions & 0 deletions CONTRIBUTING.md
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.
1 change: 0 additions & 1 deletion RELEASECHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

### Build
* Build kOS solution in release mode
* Copy kOS.dll and kOS.Safe.dll to \Resources\GameData\kOS\Plugins\
* Create zip file with a root starting in the \Resources\ directory
* Name the zip file with the following pattern kOS.v<major>.<minor>.<patch>.zip (eg kOS.v0.14.2.zip )
* Build the documentation in \docs\
Expand Down
Binary file added Resources/GameData/kOS/GFX/error.wav
Binary file not shown.
Binary file added Resources/GameData/kOS/GFX/terminal-beep.wav
Binary file not shown.
Binary file added Resources/GameData/kOS/GFX/terminal-click.wav
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Resources/GameData/kOS/Parts/kOSMachine0m/model.mu
100644 → 100755
Binary file not shown.
12 changes: 6 additions & 6 deletions Resources/GameData/kOS/Parts/kOSMachine0m/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PART
// --- general parameters ---
name = kOSMachine0m
module = Part
author = SMA
author = SMA and Peter Goddard

// --- asset parameters ---
mesh = model/model.mu
Expand All @@ -12,8 +12,8 @@ rescaleFactor = 1

// --- node definitions ---
// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z, connector node size
node_stack_bottom = 0.0, -0.0566, 0.0, 0.0, 1.0, 0.0, 0
node_stack_top = 0.0, 0.0466, 0.0, 0.0, 1.0, 0.0, 0
node_stack_bottom = 0.0, -0.04, 0.0, 0.0, -1.0, 0.0, 0
node_stack_top = 0.0, 0.03, 0.0, 0.0, 1.0, 0.0, 0


// --- Tech tree ---
Expand All @@ -29,7 +29,7 @@ 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,1
attachRules = 1,0,1,1,0

// --- standard part parameters ---
mass = 0.08
Expand Down Expand Up @@ -58,7 +58,7 @@ MODULE
name = ModuleLight
lightName = PowerLight
useAnimationDim = true
lightBrightenSpeed = 4
lightBrightenSpeed = 8
lightDimSpeed = 4
resourceAmount = 0.01
animationName = PowerLight
Expand All @@ -68,4 +68,4 @@ MODULE
}


}
}
Binary file modified Resources/GameData/kOS/Parts/kOSMachine1m/model.mu
100644 → 100755
Binary file not shown.
Binary file not shown.
Binary file not shown.
110 changes: 55 additions & 55 deletions Resources/GameData/kOS/Parts/kOSMachine1m/part.cfg
100644 → 100755
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 Resources/GameData/kOS/Parts/kOSMachineRad/Model.mu
100644 → 100755
Binary file not shown.
Empty file modified Resources/GameData/kOS/Parts/kOSMachineRad/colorTexture.mbm
100644 → 100755
Empty file.
24 changes: 12 additions & 12 deletions Resources/GameData/kOS/kOS.version
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"NAME": "kOS",
"URL": "https://raw.githubusercontent.com/KSP-KOS/KOS/master/Resources/GameData/kOS/kOS.version",
"DOWNLOAD":"TODO - when release..."
"CHANGE_LOG_URL":"https://raw.githubusercontent.com/KSP-KOS/KOS/master/CHANGELOG.md",
"DOWNLOAD": "TODO - when release...",
"CHANGE_LOG_URL": "https://raw.githubusercontent.com/KSP-KOS/KOS/master/CHANGELOG.md",
"GITHUB": {
"USERNAME":"KSP-KOS",
"REPOSITORY":"KOS",
Expand All @@ -11,21 +11,21 @@
"VERSION": {
"MAJOR": 0,
"MINOR": 17,
"PATCH": 2
"PATCH": 3
},
"KSP_VERSION": {
"MAJOR": 0,
"MINOR": 90,
"PATCH": 0
}
"MAJOR": 1,
"MINOR": 0,
"PATCH": 4
},
"KSP_VERSION_MIN": {
"MAJOR": 0,
"MINOR": 90,
"PATCH": 0
"MAJOR": 1,
"MINOR": 0,
"PATCH": 4
},
"KSP_VERSION_MAX": {
"MAJOR": 0,
"MINOR": 90,
"MAJOR": 1,
"MINOR": 0,
"PATCH": 99
}
}
2 changes: 1 addition & 1 deletion doc/source/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ About **kOS** and **KerboScript**
=================================

kOS was originally created by Nivekk.
It is under `active development`_ by the
It is under active development by the
`kOS Team <https://github.com/orgs/KSP-KOS/people>`_ and is licensed under terms of GNU General Public License Version 3, 29 June 2007, Copyright © 2007 `Free Software Foundation, Inc. <http://fsf.org/>`_

32 changes: 32 additions & 0 deletions doc/source/addons/IR.rst
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ Access structure IRAddon via `ADDONS:IR`.
:attr:`SPEED` float Servo speed multiplier, from tweakable.
:attr:`CURRENTSPEED` float (readonly) Current Servo speed.
:attr:`ACCELERATION` float Servo acceleration multiplier, from tweakable.
:attr:`ISMOVING` bool (readonly) True if Servo is moving
:attr:`ISFREEMOVING` bool (readonly) True if Servo is uncontrollable (ex. docking washer)
:attr:`LOCKED` bool Servo's locked status, set true to lock servo.
:attr:`INVERTED` bool Servo's inverted status, set true to invert servo's axis.

:meth:`MOVERIGHT()` void Commands servo to move in positive direction
:meth:`MOVELEFT()` void Commands servo to move in negative direction
Expand Down Expand Up @@ -284,6 +288,34 @@ Access structure IRAddon via `ADDONS:IR`.

Servo acceleration multiplier, from tweakable.

.. attribute:: IRServo:ISMOVING

:type: bool
:access: Get

True if Servo is moving

.. attribute:: IRServo:ISFREEMOVING

:type: bool
:access: Get

True if Servo is uncontrollable (ex. docking washer)

.. attribute:: IRServo:LOCKED

:type: bool
:access: Get/Set

Servo's locked status, set true to lock servo.

.. attribute:: IRServo:INVERTED

:type: bool
:access: Get/Set

Servo's inverted status, set true to invert servo's axis.


.. method:: IRServo:MOVERIGHT()

Expand Down
Loading

0 comments on commit be9f16a

Please sign in to comment.