Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RI from MASTER to DEV in prep for 1.1 #142

Merged
merged 52 commits into from
Mar 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
7646dee
Merge pull request #109 from snjo/DEVELOP
BobPalmer May 5, 2015
a39768b
partcatalog icon atribution by request from author
snjo May 6, 2015
c289008
Merge pull request #111 from snjo/DEVELOP
BobPalmer May 11, 2015
019386a
Merge pull request #113 from snjo/DEVELOP
BobPalmer May 16, 2015
5e33777
Merge pull request #120 from snjo/DEVELOP
BobPalmer Jun 25, 2015
c72be1e
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
39cf0d3
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
e41cc75
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
96db117
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
fc536c8
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
d97ffc3
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
b8f527f
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
c887f35
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
49d3a06
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
7e80d9c
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
6d43add
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
b59854f
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
89c1491
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
27325d3
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
014610c
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
9fdf990
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
a031f15
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
0d16516
Update part.cfg
Ruedii Aug 24, 2015
4869c9e
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
e72b4ec
Use "Engine" category instead of "Propulsion"
Ruedii Aug 24, 2015
44c967a
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
6d006ad
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
b213333
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
d1c5a72
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
07aafe6
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
0f30b6f
Update part.cfg
khr15714n Oct 14, 2015
f4a5544
Update part.cfg
khr15714n Oct 14, 2015
6d9a601
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
cbf813d
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
33d7796
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
302669d
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
3e8c326
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
93c781a
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
b9eae92
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
e364c9e
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 14, 2015
805e387
Merge pull request #129 from khr15714n/patch-1
snjo Oct 15, 2015
788a849
Merge pull request #131 from khr15714n/patch-3
snjo Oct 15, 2015
7ee271b
Merge pull request #130 from khr15714n/patch-2
snjo Oct 15, 2015
693526f
Merge pull request #132 from khr15714n/patch-4
snjo Oct 15, 2015
2d7fdb9
Merge pull request #133 from khr15714n/patch-5
snjo Oct 15, 2015
a5f72bb
Merge pull request #126 from Ruedii/master
snjo Oct 15, 2015
e5069cf
FAR dependency, missing sound and a few errors (; & f)
khr15714n Oct 16, 2015
fc66020
Merge pull request #134 from khr15714n/master
snjo Oct 17, 2015
6b0c54a
Merge remote-tracking branch 'refs/remotes/snjo/master'
khr15714n Oct 31, 2015
b3760ce
Cannot parse Vector3 value:Unknown char: ;
khr15714n Oct 31, 2015
6b78d9c
Merge pull request #135 from khr15714n/master
snjo Nov 4, 2015
dc62075
Updated compilation and version for KSP 1.0.5
BobPalmer Nov 8, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Firespitter/Firespitter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -49,7 +49,7 @@
<Reference Include="System.Xml" />
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/tools/FSversionCheck.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class FSversionCheck : MonoBehaviour
{
static int CompatibleWithMajor = 1;
static int CompatibleWithMinor = 0;
static int CompatibleWithRevision = 4;
static int CompatibleWithRevision = 5;
static System.Version FSversion;

public void Start()
Expand Down
4 changes: 2 additions & 2 deletions For release/Firespitter/Firespitter.version
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"VERSION": {
"MAJOR": 7,
"MINOR": 1,
"PATCH": 4
"PATCH": 5
},
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 0,
"PATCH": 4
"PATCH": 5
}
}
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Aero/FS_bomberWing/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ breakingTorque = 200
// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----


MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARControllableSurface
MAC = 2.7
Expand All @@ -87,7 +87,7 @@ MODULE
TaperRatio = 0.3
}

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARWingAerodynamicModel
S = 8.33
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
// [LOG ] PartLoader: Compiling Part 'Firespitter/Parts/Aero/FS_bomberWingExtender/part/FSbomberWingExtender'
// [LOG ] PartLoader: Part 'Firespitter/Parts/Aero/FS_bomberWingExtender/part/FSbomberWingExtender' has no database record. Creating.
// [LOG ] DragCubeSystem: Creating drag cubes for part 'FSbomberWingExtender'
// [WRN ] [ModuleCtrlSurface]: No ctrlSurface transform found! This is most likely wrong!
// [WRN ] [ModuleCtrlSurface]: No ctrlSurface transform found! This is most likely wrong!
// [WRN ] [ModuleCtrlSurface]: No ctrlSurface transform found! This is most likely wrong!

PART
{

Expand Down Expand Up @@ -58,7 +65,7 @@ breakingTorque = 200

// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec -----

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARWingAerodynamicModel
S = 8.33
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ MODULE
dragMultiplier = 1
}

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARControllableSurface
b_2 = 2.0 //distance from wing root to tip; semi-span
Expand All @@ -81,9 +81,9 @@ MODULE
TaperRatio = 0.5 //Ratio of tip chord to root chord generally < 1, must be > 0
MidChordSweep = 32 //Sweep angle in degrees; measured down the center of the span / midchord position
maxdeflect = 15 //Default maximum deflection value; only used by FARControlableSurface
controlSurfacePivot = 1, 0, 0; //Local vector that obj_ctrlSrf pivots about; defaults to 1, 0, 0 (right)
controlSurfacePivot = 1, 0, 0 //Local vector that obj_ctrlSrf pivots about; defaults to 1, 0, 0 (right)
ctrlSurfFrac = 0.8
}

// PART END
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ MODULE
dragMultiplier = 1
}

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARControllableSurface
b_2 = 2.5 //distance from wing root to tip; semi-span
Expand All @@ -83,9 +83,9 @@ MODULE
TaperRatio = 0.5 //Ratio of tip chord to root chord generally < 1, must be > 0
MidChordSweep = 32 //Sweep angle in degrees; measured down the center of the span / midchord position
maxdeflect = 15 //Default maximum deflection value; only used by FARControlableSurface
controlSurfacePivot = 1, 0, 0; //Local vector that obj_ctrlSrf pivots about; defaults to 1, 0, 0 (right)
controlSurfacePivot = 1, 0, 0 //Local vector that obj_ctrlSrf pivots about; defaults to 1, 0, 0 (right)
ctrlSurfFrac = 0.8
}

// PART END
}
}
6 changes: 3 additions & 3 deletions For release/Firespitter/Parts/Aero/FS_fighterJetWing/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ MODULE
dragMultiplier = 1
}

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARControllableSurface
b_2 = 5.85 //distance from wing root to tip; semi-span
Expand All @@ -104,9 +104,9 @@ MODULE
TaperRatio = 0.48 //Ratio of tip chord to root chord generally < 1, must be > 0
MidChordSweep = 32 //Sweep angle in degrees; measured down the center of the span / midchord position
maxdeflect = 15 //Default maximum deflection value; only used by FARControlableSurface
controlSurfacePivot = 1, 0, 0; //Local vector that obj_ctrlSrf pivots about; defaults to 1, 0, 0 (right)
controlSurfacePivot = 1, 0, 0 //Local vector that obj_ctrlSrf pivots about; defaults to 1, 0, 0 (right)
ctrlSurfFrac = 0.11
}

// PART END
}
}
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Aero/FS_fighterWing/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RESOURCE

// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARControllableSurface
MAC = 2.2
Expand All @@ -87,7 +87,7 @@ MODULE
TaperRatio = 0.3
}

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARWingAerodynamicModel
S = 8.33
Expand Down
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Aero/FS_tailWing/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ explosionPotential = 0.1

// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARControllableSurface
MAC = 1.0
Expand All @@ -78,7 +78,7 @@ MODULE
TaperRatio = 0.53
}

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARWingAerodynamicModel
S = 8.33
Expand Down
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Aero/FS_tailWingLarge/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ explosionPotential = 0.1

// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARControllableSurface
MAC = 2.3
Expand All @@ -77,7 +77,7 @@ MODULE
TaperRatio = 0.3
}

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARWingAerodynamicModel
S = 8.33
Expand Down
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Aero/FS_winglet/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ explosionPotential = 0.1

// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARControllableSurface
MAC = 1.0
Expand All @@ -76,7 +76,7 @@ MODULE
TaperRatio = 0.3
}

MODULE
MODULE:NEEDS[FerramAerospaceResearch]
{
name = FARWingAerodynamicModel
S = 8.33
Expand Down
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Engine/FS_PROpeller/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ node_stack_top = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0
TechRequired = aerodynamicSystems
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS1PRO Customizable Propeller engine
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -140,4 +140,4 @@ MODULE
}

// PART END
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ node_stack_top = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0
TechRequired = aerodynamicSystems
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS1PRE Customizable Electric Propeller engine
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -117,4 +117,4 @@ MODULE
}

// PART END
}
}
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Engine/FS_VTOLengine/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sound_explosion_low = flameout
TechRequired = advAerodynamics
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS2V VTOL engine
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -395,4 +395,4 @@ MODULE
name = FSengineMenuCleaner
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ sound_explosion_low = flameout
TechRequired = highAltitudeFlight
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS1LEG Lancaster Engine
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -315,4 +315,4 @@ MODULE
}

// PART END
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sound_explosion_low = flameout
TechRequired = highAltitudeFlight
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS1LEG Lancaster Engine
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -184,4 +184,4 @@ MODULE
}

// PART END
}
}
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Engine/FS_noseEngine/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ sound_explosion_low = flameout
TechRequired = aerodynamicSystems
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS1EN Nose Mounted Engine
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -183,4 +183,4 @@ MODULE
}

//END PART
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fx_exhaustSparks_flameout = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, flameout
TechRequired = electrics
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS1ENE Nose Mounted Electric Engine
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -183,4 +183,4 @@ MODULE
}

//PART END
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sound_explosion_low = flameout
TechRequired = supersonicFlight
cost = 800
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS1OJ Oblong Tail Jet
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -146,4 +146,4 @@ MODULE
}

//PART END
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fx_exhaustSparks_flameout = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, flameout
TechRequired = electrics
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS1FPE Folding Electric Propeller
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -188,4 +188,4 @@ MODULE
}

//PART END
}
}
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Engine/FS_swampEngine/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sound_explosion_low = flameout
TechRequired = specializedControl
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS3SE Swamp Engine
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -167,4 +167,4 @@ MODULE
}

// END PART
}
}
4 changes: 2 additions & 2 deletions For release/Firespitter/Parts/Engine/FS_turboProp/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fx_exhaustSparks_flameout = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, flameout
TechRequired = highAltitudeFlight
cost = 950
entryCost = 2200
category = Propulsion
category = Engine
subcategory = 0
title = FS1TP Turboprop Engine
manufacturer = Bitesized Industries
Expand Down Expand Up @@ -136,4 +136,4 @@ MODULE
}

// PART END
}
}
Loading