Skip to content

Commit

Permalink
Merge branch 'DEVELOP' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
BobPalmer committed Jun 22, 2018
2 parents a97a7f9 + 246a343 commit 7853cee
Show file tree
Hide file tree
Showing 45 changed files with 444 additions and 198 deletions.
10 changes: 5 additions & 5 deletions FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version
Expand Up @@ -6,20 +6,20 @@
"VERSION":
{
"MAJOR":1,
"MINOR":5,
"MINOR":6,
"PATCH":0,
"BUILD":0
},
"KSP_VERSION_MIN":
{
"MAJOR":1,
"MINOR":3,
"PATCH":1
"MINOR":4,
"PATCH":3
},
"KSP_VERSION_MAX":
{
"MAJOR":1,
"MINOR":3,
"PATCH":1
"MINOR":4,
"PATCH":3
}
}
@@ -1,4 +1,4 @@
@PART[*]:HAS[@MODULE[AnisotropicPartResizer]]:NEEDS[FilterExtensions]
{
@bulkheadProfiles ^= :$:,proc:
@bulkheadProfiles ^= :$:,proc:
}
7 changes: 0 additions & 7 deletions FOR_RELEASE/GameData/000_AT_Utils/ModuleAsteroidFix.cfg

This file was deleted.

Binary file modified FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll
Binary file not shown.
Binary file not shown.
@@ -1,11 +1,15 @@
MeshesToSkip = flagtransform canopy
BadParts = RadialDrill

StylesConfig
{
//available colors: normal (meaning white), grey, red, dark_red, green, dark_green, yellow, dark_yellow, cyan, magenta
EnabledButtonColor = green
ActiveButtonColor = yellow
InactiveButtonColor = grey
ConfirmButtonColor = green
AddButtonColor = green
CloseButtonColor = red
DangerButtonColor = red
//available colors: normal (meaning white), grey, red, dark_red, green, dark_green, yellow, dark_yellow, cyan, magenta
EnabledButtonColor = green
ActiveButtonColor = yellow
InactiveButtonColor = grey
ConfirmButtonColor = green
AddButtonColor = green
CloseButtonColor = red
DangerButtonColor = red
}

This file was deleted.

This file was deleted.

8 changes: 4 additions & 4 deletions FOR_RELEASE/GameData/GroundConstruction/Engineer.cfg
@@ -1,7 +1,7 @@
@EXPERIENCE_TRAIT[Engineer]
{
EFFECT
{
name = ConstructionSkill
}
EFFECT
{
name = ConstructionSkill
}
}
Expand Up @@ -5,21 +5,21 @@
"CHANGE_LOG_URL":"https://github.com/allista/GroundConstruction/blob/master/ChangeLog.md",
"VERSION":
{
"MAJOR":1,
"MINOR":2,
"MAJOR":2,
"MINOR":0,
"PATCH":1,
"BUILD":0
},
"KSP_VERSION_MIN":
{
"MAJOR":1,
"MINOR":3,
"PATCH":1
"MINOR":4,
"PATCH":3
},
"KSP_VERSION_MAX":
{
"MAJOR":1,
"MINOR":3,
"PATCH":1
"MINOR":4,
"PATCH":3
}
}
18 changes: 9 additions & 9 deletions FOR_RELEASE/GameData/GroundConstruction/KitResources.cfg
@@ -1,12 +1,12 @@
GC_KIT_RESOURCES
{
keep = Ablator
keep = SolidFuel
keep = EnrichedUranium
keep = Plutonium-238
keep = Uraninite
keep = UraniumNitride
keep = UF4
keep = ThF4
keep = Actinides
keep = Ablator
keep = SolidFuel
keep = EnrichedUranium
keep = Plutonium-238
keep = Uraninite
keep = UraniumNitride
keep = UF4
keep = ThF4
keep = Actinides
}
119 changes: 64 additions & 55 deletions FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.cfg
@@ -1,64 +1,73 @@
PART
{
name = DIYKit
module = Part
author = Allis Tauri
name = DIYKit
module = Part
author = Allis Tauri

MODEL
{
model = GroundConstruction/Parts/DIYKit/DIYKit
}
rescaleFactor = 1.0
scale = 1.0
node_stack_top = 0.0, 1.25, 0.0, 0, 1, 0, 2
node_stack_bottom = 0.0, -1.25, 0.0, 0, -1, 0, 2
MODEL
{
model = GroundConstruction/Parts/DIYKit/DIYKit
}
rescaleFactor = 1.0
scale = 1.0
node_stack_top = 0.0, 1.25, 0.0, 0, 1, 0, 2
node_stack_bottom = 0.0, -1.25, 0.0, 0, -1, 0, 2

TechRequired = advConstruction
category = Payload
subcategory = 0
title = DIY Kit Container
manufacturer = AT Industries
description = DIY Kit is a pack of all the needed tools, blueprints and hightech components needed to build a vessel offworld. Provided that you have enough raw materials, a workshop and a powersupply already in place.
TechRequired = advConstruction
category = Payload
subcategory = 0
title = DIY Kit Container
manufacturer = AT Industries
description = DIY Kit is a pack of all the needed tools, blueprints and hightech components needed to build a vessel offworld. Provided that you have enough raw materials, a workshop and a powersupply already in place.

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

entryCost = 200
cost = 100
mass = 0.5
entryCost = 200
cost = 100
mass = 0.5

dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
angularDrag = 2
crashTolerance = 10
breakingForce = 200
breakingTorque = 200
maxTemp = 2600
bulkheadProfiles = size2

fuelCrossFeed = False
vesselType = Lander
CrewCapacity = 0

MODULE
{
name = ModuleConstructionKit
SpawnTransforms = launch-position
DetachableNode = top
}

MODULE
{
name = ModuleDecouple
ejectionForce = 10
explosiveNodeID = top
isOmniDecoupler = false
menuName = Detach Container
stagingEnabled = False
stagingEnableText = Detaching Not Staged
stagingDisableText = Detaching Staged
}
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
angularDrag = 2
crashTolerance = 10
breakingForce = 200
breakingTorque = 200
maxTemp = 2600
bulkheadProfiles = size2

fuelCrossFeed = False
vesselType = Lander
CrewCapacity = 0

stagingIcon = DECOUPLER_VERT

MODULE
{
name = ModuleConstructionKit
SpawnTransforms = launch-position
DetachableNode = top
KitType = Box
}

MODULE
{
name = ATGroundAnchor
Controllable = False
}

MODULE
{
name = ModuleDockingNode
referenceAttachNode = top
nodeType = size0 size1 size2 size3
stagingEnabled = False
undockEjectionForce = 1
acquireForce = 0
acquireTorque = 0
captureRange = 0.1
}
}
//:mode=c#:
Binary file not shown.
Binary file modified FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.mu
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7853cee

Please sign in to comment.