Skip to content

Commit

Permalink
Merge pull request #109 from snjo/DEVELOP
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
BobPalmer committed May 5, 2015
2 parents 80e438f + 2e058ac commit 7646dee
Show file tree
Hide file tree
Showing 41 changed files with 51 additions and 59 deletions.
3 changes: 1 addition & 2 deletions Firespitter/cockpit/FSmonitorScript.cs
@@ -1,5 +1,4 @@
using A;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
Expand Down
2 changes: 1 addition & 1 deletion For release/Firespitter/Firespitter.version
Expand Up @@ -4,7 +4,7 @@
"VERSION": {
"MAJOR": 7,
"MINOR": 1,
"PATCH": 0
"PATCH": 1
},
"KSP_VERSION": {
"MAJOR": 1,
Expand Down
Expand Up @@ -13,8 +13,8 @@ scale = 1

// --- node definitions ---
//node_stack_top = 0.0, 0.35, -0.12, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.236, 0.0, 0.0, 1.0, 0.0
node_attach = 0.0, -0.236, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.236, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, -0.236, 0.0, 0.0, -1.0, 0.0, 1



Expand Down
Expand Up @@ -14,7 +14,7 @@ rescaleFactor = 1
// --- node definitions ---
// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
node_stack_top = 0.0, 1.252, 0.215, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.851, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.851, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, 0.512, 0.0, 0.0, -1.0, 1

// --- editor parameters ---
Expand Down
Expand Up @@ -16,7 +16,7 @@ scale = 1
//node_stack_top = 0.0, 10.2, -9.4, 0.0, 0.0, -1.0
//node_stack_bottom = 0.0, -19.2, 0.0, 0.0, 1.0, 0.0
node_stack_top = 0.0, 1.02, -0.94, 0.0, 0.0, -1.0
node_stack_bottom = 0.0, -1.92, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -1.92, 0.0, 0.0, -1.0, 0.0



Expand Down
Expand Up @@ -13,8 +13,7 @@ scale = 1.0

// --- node definitions ---
// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
//node_stack_bottom = 0.0, -7.11, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.711, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.711, 0.0, 0.0, -1.0, 0.0, 1



Expand Down
Expand Up @@ -14,7 +14,7 @@ rescaleFactor = 1
// --- node definitions ---
// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
node_stack_top = 0.0, 0.938, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -1.07, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -1.07, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, 0.512, 0.0, 0.0, -1.0, 1

// --- editor parameters ---
Expand Down
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Engine/FS_PROpeller/part.cfg
Expand Up @@ -16,7 +16,7 @@ scale = 1.0
rescaleFactor = 1.0

// --- node definitions ---
node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_stack_top = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0


// --- editor parameters ---
Expand All @@ -26,7 +26,7 @@ category = Propulsion
subcategory = 0
title = FS1PRO Customizable Propeller engine
manufacturer = Bitesized Industries
description = A totally customizable propelelr engine. Tweak the engine size and power, the number of blades and their length.
description = A totally customizable propeller engine. Tweak the engine size and power, the number of blades and their length.

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,0,1,0,0
Expand Down
Expand Up @@ -16,7 +16,7 @@ scale = 1.0
rescaleFactor = 1.0

// --- node definitions ---
node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_stack_top = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0


// --- editor parameters ---
Expand Down
Expand Up @@ -15,8 +15,8 @@ mesh = model.mu
scale = 1.0

// --- node definitions ---
node_stack_top = 0.0, 0.0, 0.0, 0.0, 0.0, 1.0
node_stack_bottom = 0.0, 0.75, 0.0, 0.0, 0.0, -1.0
node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, 0.75, 0.0, 0.0, 1.0, 0.0

// --- FX definitions ---

Expand Down Expand Up @@ -48,7 +48,7 @@ manufacturer = Bitesized Industries
description = This engine will take you up, up, dooown!

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,1,1,1,1
attachRules = 1,1,0,0,0

// --- standard part parameters ---
mass = 0.5
Expand Down
Expand Up @@ -11,7 +11,7 @@ mesh = model.mu
scale = 1.0

// --- node definitions ---
node_stack_top = 0.0, 0.0, 0.0, 0.0, 0.0, 1.0
node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0

// --- FX definitions ---

Expand All @@ -35,7 +35,7 @@ manufacturer = Bitesized Industries
description = When there's just not enough oxygen to burn your dead dinosaurs, you will want to fly using this potato battery compatible engine. Warning: potato battery array will need to be massive! Keep the arrow pointed forward when placing!
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,1,1,1,1
attachRules = 1,1,0,0,0
// --- standard part parameters ---
mass = 0.5
Expand Down
Expand Up @@ -11,8 +11,8 @@ mesh = model.mu
scale = 1.0

// --- node definitions ---
node_stack_top = 0.0, 0.0, 0.0, 0.0, 0.0, 1.0
node_stack_bottom = 0.0, 0.75, 0.0, 0.0, 0.0, -1.0
node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, 0.75, 0.0, 0.0, 1.0, 0.0

// --- FX definitions ---

Expand Down Expand Up @@ -44,7 +44,7 @@ manufacturer = Bitesized Industries
description = This engine will take you up, up, dooown! Make sure to attach our patented tail rotor FS2F (sold separately) to control your rotation. Keep the arrow pointed forward when placing!

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,1,1,1,1
attachRules = 1,1,0,0,0

// --- standard part parameters ---
mass = 0.005
Expand Down
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Engine/FS_noseEngine/part.cfg
Expand Up @@ -11,8 +11,8 @@ mesh = model.mu
scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_stack_top = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0

// --- FX definitions ---

Expand Down
Expand Up @@ -11,8 +11,8 @@ mesh = model.mu
scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_stack_top = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0

// --- FX definitions ---

Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.7505, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -1.296, -0.29, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -1.296, -0.29, 0.0, -1.0, 0.0
node_attach = 0.0, 0.75, 0.0, 0.0, 0.0, 1.0, 1

// --- FX definitions ---
Expand Down
Expand Up @@ -12,8 +12,8 @@ scale = 1.0
rescaleFactor = 0.9

// --- node definitions ---
node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
node_stack_top = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0

// --- FX definitions ---

Expand Down
Expand Up @@ -10,7 +10,7 @@ scale = 1
rescaleFactor = 1

node_attach = 0.00, 0.0, -0.244, 0.0, 0.0, 1.0, 1
node_stack_top = 0.00, 0.0, -0.244, 0.0, 0.0, 1.0, 1
node_stack_top = 0.00, 0.0, -0.244, 0.0, 0.0, -1.0, 1

TechRequired = fuelSystems
cost = 500
Expand Down
Expand Up @@ -10,7 +10,7 @@ scale = 1
rescaleFactor = 1

node_attach = 0.0, 0.0, -0.02, 0.0, 0.0, 1.0, 1
node_stack_bottom = 0.0, 0.0, 0.132, 0.0, 0.0, -1.0, 1
node_stack_bottom = 0.0, 0.0, 0.132, 0.0, 0.0, 1.0, 1

TechRequired = fuelSystems
cost = 50
Expand Down
2 changes: 1 addition & 1 deletion For release/Firespitter/Parts/Fuselage/FS_bombBay/part.cfg
Expand Up @@ -14,7 +14,7 @@ node_stack_two = 0.0, 0.0, -0.62, 0.0, 0.0, 1.0, 1
node_stack_three = 0.0, -1.0, -0.62, 0.0, 0.0, 1.0, 1

node_stack_top = 0.0, 1.875, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -1.875, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -1.875, 0.0, 0.0, -1.0, 0.0, 2
node_attach = 1.25, 0.0, 0.0, 1.0, 0.0, 0.0, 1

TechRequired = highAltitudeFlight
Expand Down
Expand Up @@ -10,7 +10,7 @@ scale = 1
rescaleFactor = 1

node_stack_top = 0.0, 1.875, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -1.875, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -1.875, 0.0, 0.0, -1.0, 0.0, 2
node_attach = 1.25, 0.0, 0.0, 1.0, 0.0, 0.0, 1

TechRequired = highAltitudeFlight
Expand Down
Expand Up @@ -10,7 +10,7 @@ scale = 1
rescaleFactor = 1

node_stack_top = 0.0, 2.06, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -2.85, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -2.85, 0.0, 0.0, -1.0, 0.0, 2
node_attach = 1.25, 2.59, 0.0, 1.0, 0.0, 0.0, 1

TechRequired = highAltitudeFlight
Expand Down
Expand Up @@ -16,11 +16,8 @@ scale = 1
//scale = 0.01

// --- node definitions ---
//node_stack_top = 0.0, 75.01, 0.0, 0.0, 1.0, 0.0
//node_stack_bottom = 0.0, -75.01, 0.0, 0.0, 1.0, 0.0
//node_attach = 0.0, 0.0, -50.1, 0.0, 0.0, 1.0, 1
node_stack_top = 0.0, 0.7501, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.7501, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.7501, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, -0.501, 0.0, 0.0, 1.0, 1

CrewCapacity = 2
Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.3766, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.3758, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.3758, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, -0.51, 0.0, 0.0, 1.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ rescaleFactor = 1.0

// --- node definitions ---
node_stack_top = 0.0, 0.941125, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.94075, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.94075, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, -0.6375, 0.0, 0.0, 1.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.359, -0.12, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.236, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.236, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, -0.236, 0.0, 0.0, 1.0, 0.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
//node_stack_top = 0.0, 1.691, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.155, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.155, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, -0.155, 0.0, 0.0, 1.0, 0.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
//node_stack_top = 0.0, 0.47, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.155, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.155, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, -0.155, 0.0, 0.0, 1.0, 0.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.7505, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -1.296, -0.29, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -1.296, -0.29, 0.0, -1.0, 0.0
node_attach = 0.0, 0.75, 0.0, 0.0, 0.0, 1.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.251, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.250, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.250, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, -0.51, 0.0, 0.0, 1.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.245, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.207, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.207, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, -0.207, 0.0, 0.0, 1.0, 0.0, 1


Expand Down
Expand Up @@ -17,7 +17,7 @@ scale = 1.0
//node_stack_bottom = 0.0, -9.6, -1.15, 0.0, 1.0, 0.0, 0
//node_attach = 0.0, 7.55, 0.0, 0.0, 1.0, 0.0
node_stack_top = 0.0, 0.755, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.96, -0.115, 0.0, 1.0, 0.0, 0
node_stack_bottom = 0.0, -0.96, -0.115, 0.0, -1.0, 0.0, 0
node_attach = 0.0, 0.755, 0.0, 0.0, 1.0, 0.0

// --- FX definitions ---
Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
//node_stack_top = 0.0, 0.5, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.251, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.251, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, -0.3022, 0.0, 0.0, 1.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.501, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.501, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.501, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, -0.3022, 0.0, 0.0, 1.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.501, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.501, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.501, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, -0.3022, 0.0, 0.0, 1.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ scale = 1

// --- node definitions ---
node_stack_top = 0.0, 0.0387, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.0387, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.0387, 0.0, 0.0, -1.0, 0.0
node_attach = 0.0, 0.0, -1.091, 0.0, 0.0, 1.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ rescaleFactor = 1.0


// --- node definitions ---
node_stack_top = 0.0, 0.0, -0.1, 0.0, 0.0, 1.0
node_stack_top = 0.0, 0.0, -0.1, 0.0, 0.0, -1.0
node_attach = 0.0, 0.0, -0.1, 0.0, 0.0, 1.0, 1


Expand Down
Expand Up @@ -13,7 +13,7 @@ rescaleFactor = 1

// --- node definitions ---
// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
node_stack_bottom = 0, 0, 0, 0.0, 1.0, 0.0
node_stack_bottom = 0, 0, 0, 0.0, -1.0, 0.0


// --- FX definitions ---
Expand Down
5 changes: 1 addition & 4 deletions For release/Firespitter/Parts/Utility/FS_battery/part.cfg
Expand Up @@ -12,11 +12,8 @@ mesh = model.mu
scale = 1.0

// --- node definitions ---
//node_stack_top = 0.0, 5.01, 0.0, 0.0, 1.0, 0.0
//node_stack_bottom = 0.0, -5.01, 0.0, 0.0, 1.0, 0.0
//node_attach = 5.01, 0.0, 0.0, 1.0, 0.0, 0.0, 1
node_stack_top = 0.0, 0.501, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.501, 0.0, 0.0, 1.0, 0.0
node_stack_bottom = 0.0, -0.501, 0.0, 0.0, -1.0, 0.0
node_attach = 0.501, 0.0, 0.0, 1.0, 0.0, 0.0, 1


Expand Down

0 comments on commit 7646dee

Please sign in to comment.