Skip to content

Commit

Permalink
Merge pull request #756 from jrodrigv/master
Browse files Browse the repository at this point in the history
New release for KSP 1.9.0
  • Loading branch information
jrodrigv authored Feb 23, 2020
2 parents 2061875 + 7328aeb commit 521b7d3
Show file tree
Hide file tree
Showing 40 changed files with 844 additions and 277 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,4 @@ BDArmory/LocalDev/Refs/UnityEngine.dll
/BDArmory/_ReSharper.Caches/ReSharperPlatformVs16191_4011600b.BDArmory.00
/BDArmory/_ReSharper.Caches/ReSharperPlatformVs16191_4011600b.BDArmory.01
/_ReSharper.Caches/ReSharperPlatformVs16191_4011600b.00
/BDArmory/_ReSharper.Caches/ReSharperPlatformVs16193_4011600b.BDArmory.00
4 changes: 2 additions & 2 deletions BDArmory.Core/Module/HitpointTracker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ public class HitpointTracker : PartModule
{
#region KSP Fields

[KSPField(isPersistant = false, guiActive = true, guiActiveEditor = true, guiName = "Hitpoints"),
[KSPField(isPersistant = false, guiActive = true, guiActiveEditor = true, guiName = "#LOC_BDArmory_Hitpoints"),//Hitpoints
UI_ProgressBar(affectSymCounterparts = UI_Scene.None, controlEnabled = false, scene = UI_Scene.All, maxValue = 100000, minValue = 0, requireFullControl = false)]
public float Hitpoints;

[KSPField(isPersistant = true, guiActive = true, guiActiveEditor = true, guiName = "Armor Thickness"),
[KSPField(isPersistant = true, guiActive = true, guiActiveEditor = true, guiName = "#LOC_BDArmory_ArmorThickness"),//Armor Thickness
UI_FloatRange(minValue = 1f, maxValue = 500f, stepIncrement = 5f, scene = UI_Scene.All)]
public float Armor = 10f;

Expand Down
4 changes: 2 additions & 2 deletions BDArmory.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.2.0")]
[assembly: AssemblyFileVersion("1.3.2.0")]
[assembly: AssemblyVersion("1.3.3.0")]
[assembly: AssemblyFileVersion("1.3.3.0")]
[assembly: KSPAssembly("BDArmory.Core", 1, 0)]
4 changes: 2 additions & 2 deletions BDArmory/CounterMeasure/CMDropper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public enum CountermeasureTypes
public CountermeasureTypes cmType = CountermeasureTypes.Flare;
[KSPField] public string countermeasureType = "flare";

[KSPField(isPersistant = true, guiActive = false, guiActiveEditor = true, guiName = "Eject Velocity"),
[KSPField(isPersistant = true, guiActive = false, guiActiveEditor = true, guiName = "#LOC_BDArmory_EjectVelocity"),//Eject Velocity
UI_FloatRange(controlEnabled = true, scene = UI_Scene.Editor, minValue = 1f, maxValue = 200f, stepIncrement = 1f)]
public float ejectVelocity = 30;

Expand All @@ -50,7 +50,7 @@ public void AGDropCM(KSPActionParam param)
DropCM();
}

[KSPEvent(guiActive = true, guiName = "Fire Countermeasure", active = true)]
[KSPEvent(guiActive = true, guiName = "#LOC_BDArmory_FireCountermeasure", active = true)]//Fire Countermeasure
public void DropCM()
{
switch (cmType)
Expand Down
12 changes: 6 additions & 6 deletions BDArmory/Distribution/GameData/BDArmory/BDArmory.version
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
{
"MAJOR":1,
"MINOR":3,
"PATCH":2,
"PATCH":3,
"BUILD":0
},
"KSP_VERSION":
{
"MAJOR":1,
"MINOR":8,
"PATCH":1
"MINOR":9,
"PATCH":0
},
"KSP_VERSION_MIN":
{
"MAJOR":1,
"MINOR":8,
"PATCH":1
"MINOR":9,
"PATCH":0
},
"KSP_VERSION_MAX":
{
"MAJOR":1,
"MINOR":8,
"MINOR":9,
"PATCH":999
}
}
11 changes: 10 additions & 1 deletion BDArmory/Distribution/GameData/BDArmory/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
v1.3.2
v1.3.3
* NEW FEATURES:
* Recompiled for KSP 1.9.0
* Localization en-us and zh-cn (Thanks to tinygrox!)
* FIXES
* Some NRE here and there.
* Fixes to Laser accuracy (Thanks to Gedas!)
* Part Categories for BDArmory is now activated by default

v1.3.2
* NEW FEATURES:
* Recompiled for KSP 1.8.1
* Munition count to Weapon Manager GUI.
Expand Down
266 changes: 266 additions & 0 deletions BDArmory/Distribution/GameData/BDArmory/Localization/UI/en-us.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
Localization
{
en-us
{
#LOC_BDArmory_Generic_Cancel = Cancel
#LOC_BDArmory_Generic_New = New
#LOC_BDArmory_Generic_On = On
#LOC_BDArmory_Generic_Off = Off
#LOC_BDArmory_VesselStatus_Landed = (Landed)
#LOC_BDArmory_VesselStatus_Splashed = (Splashed)

#LOC_BDArmory_WMWindow_title = BDA Weapon Manager
#LOC_BDArmory_WMWindow_GuardModebtn = Guard Mode
#LOC_BDArmory_WMWindow_ArmedText = Trigger is\u0020
#LOC_BDArmory_WMWindow_ArmedText_ARMED = ARMED.
#LOC_BDArmory_WMWindow_ArmedText_DisArmed = disarmed.
#LOC_BDArmory_WMWindow_TeamText = Team
#LOC_BDArmory_WMWindow_selectionText = Weapon: <<1>>
#LOC_BDArmory_WMWindow_rippleText1 = Barrage: <<1>> RPM
#LOC_BDArmory_WMWindow_rippleText2 = Salvo
#LOC_BDArmory_WMWindow_rippleText3 = Ripple: <<1>> RPM
#LOC_BDArmory_WMWindow_rippleText4 = Ripple: OFF
#LOC_BDArmory_WMWindow_ListWeapons = Weapons
#LOC_BDArmory_WMWindow_GuardMenu = Guard Menu
#LOC_BDArmory_WMWindow_ModulesToggle = Modules
#LOC_BDArmory_WMWindow_NoneWeapon = None
#LOC_BDArmory_WMWindow_NoneWeapon = Guard Mode <<1>>
#LOC_BDArmory_WMWindow_FiringInterval = Firing Interval
#LOC_BDArmory_WMWindow_BurstLength = Burst Length
#LOC_BDArmory_WMWindow_FieldofView = Field of View
#LOC_BDArmory_WMWindow_VisualRange = Visual Range
#LOC_BDArmory_WMWindow_GunsRange = Guns Range
#LOC_BDArmory_WMWindow_MissilesTgt = Missiles/Tgt
#LOC_BDArmory_WMWindow_TargetType = Target Type:
#LOC_BDArmory_WMWindow_TargetType_Missiles = Missiles
#LOC_BDArmory_WMWindow_TargetType_All = All Targets
#LOC_BDArmory_WMWindow_RadarWarning = Radar Warning Receiver
#LOC_BDArmory_WMWindow_GPSCoordinator = GPS Coordinator
#LOC_BDArmory_WMWindow_WingCommand = Wing Command
#LOC_BDArmory_WMWindow_NoWeaponManager = No Weapon Manager found.
#LOC_BDArmory_WMWindow_GPSTarget = GPS Target
#LOC_BDArmory_WMWindow_NoTarget = No Target
#LOC_BDArmory_Settings_Title = BDArmory Settings
#LOC_BDArmory_Settings_Instakill = Instakill
#LOC_BDArmory_Settings_InfiniteAmmo = Infinite Ammo
#LOC_BDArmory_Settings_BulletHits = Bullet Hits
#LOC_BDArmory_Settings_EjectShells = Eject Shells
#LOC_BDArmory_Settings_AimAssist = Aim Assist
#LOC_BDArmory_Settings_DrawAimers = Draw Aimers
#LOC_BDArmory_Settings_DebugLines = Debug Lines
#LOC_BDArmory_Settings_DebugLabels = Debug Labels
#LOC_BDArmory_Settings_RemoteFiring = Remote Firing
#LOC_BDArmory_Settings_ClearanceCheck = Clearance Check
#LOC_BDArmory_Settings_AmmoGauges = Ammo Gauges
#LOC_BDArmory_Settings_ShellCollisions = Shell Collisions
#LOC_BDArmory_Settings_BulletHoleDecals = Bullet Hole Decals
#LOC_BDArmory_Settings_PerformanceLogging = Performance Logging
#LOC_BDArmory_Settings_ShowEditorSubcategories = Show Editor Subcategories
#LOC_BDArmory_Settings_AutocategorizeParts = Autocategorize Parts
#LOC_BDArmory_Settings_MaxBulletHoles = Max Bullet Holes
#LOC_BDArmory_Settings_PeaceMode = Peace Mode
#LOC_BDArmory_Settings_RWRWindowScale = RWR Window Scale
#LOC_BDArmory_Settings_RadarWindowScale = Radar Window Scale
#LOC_BDArmory_Settings_TargetWindowScale = Target Window Scale
#LOC_BDArmory_Settings_TriggerHold = Trigger Hold
#LOC_BDArmory_Settings_UIVolume = UI Volume
#LOC_BDArmory_Settings_WeaponVolume = Weapon Volume
#LOC_BDArmory_Settings_DogfightCompetition = Dogfight Competition
#LOC_BDArmory_Settings_CompetitionDistance = Competition Distance
#LOC_BDArmory_Settings_StartCompetition = Start Competition
#LOC_BDArmory_Settings_CompetitionStarting = Starting Competition...
#LOC_BDArmory_Settings_EditInputs = Edit Inputs
#LOC_BDArmory_Generic_SaveandClose = Save and Close
#LOC_BDArmory_InputSettings_Weapons = Weapons
#LOC_BDArmory_InputSettings_TargetingPod = Targeting Pod
#LOC_BDArmory_InputSettings_Radar = Radar
#LOC_BDArmory_InputSettings_VesselSwitcher = Vessel Switcher
#LOC_BDArmory_InputSettings_BackBtn = Back
#LOC_BDArmory_InputSettings_recordedInput = Press a key or button.
#LOC_BDArmory_InputSettings_SetKey = Set Key
#LOC_BDArmory_InputSettings_Clear = Clear

#LOC_BDArmory_ProtoStageIconInfo_Reloading = Reloading
#LOC_BDArmory_ProtoStageIconInfo_Overheat = Overheat
#LOC_BDArmory_ProtoStageIconInfo_AmmoOut = Ammo Depleted

#LOC_BDArmory_WingCommander_Title = WingCommander
#LOC_BDArmory_WingCommander_Guiname1 = Formation Spread
#LOC_BDArmory_WingCommander_Guiname2 = Formation Lag
#LOC_BDArmory_WingCommander_Guiname3 = ToggleGUI
#LOC_BDArmory_WingCommander_SelectAll = Select All
#LOC_BDArmory_WingCommander_CommandSelf = Command Self
#LOC_BDArmory_WingCommander_Follow = Follow
#LOC_BDArmory_WingCommander_FlyToPos = Fly To Pos
#LOC_BDArmory_WingCommander_AttackPos = Attack Pos
#LOC_BDArmory_WingCommander_ActionGroup = Action Group
#LOC_BDArmory_WingCommander_ActionGroups = Action Groups
#LOC_BDArmory_WingCommander_TakeOff = Take Off
#LOC_BDArmory_WingCommander_Release = Release
#LOC_BDArmory_WingCommander_FormationSettings = Formation Settings
#LOC_BDArmory_WingCommander_Spread = Spread
#LOC_BDArmory_WingCommander_Lag = Lag
#LOC_BDArmory_WingCommander_ScreenMessage = Select target coordinates.\nRight-click to cancel.

#LOC_BDArmory_BDAVesselSwitcher_Title = BDA Vessel Switcher

//GUI Names
#LOC_BDArmory_EjectVelocity = Eject Velocity
#LOC_BDArmory_TNTMass = TNT mass equivalent
#LOC_BDArmory_BlastRadius = Blast Radius
#LOC_BDArmory_WeaponName = Weapon Name\u0020
#LOC_BDArmory_GuidanceType = Guidance Type\u0020
#LOC_BDArmory_TargetingMode = Targeting Mode\u0020
#LOC_BDArmory_ActiveRadarRange = Active Radar Range
#LOC_BDArmory_SteerLimiter = Steer Limiter
#LOC_BDArmory_StagesNumber = Stages Number
#LOC_BDArmory_StageToTriggerOnProximity = Stage to Trigger On Proximity
#LOC_BDArmory_SteerDamping = Steer Damping
#LOC_BDArmory_SteerFactor = Steer Factor
#LOC_BDArmory_RollCorrection = Roll Correction
#LOC_BDArmory_RollCorrection_enabledText = Roll enabled
#LOC_BDArmory_RollCorrection_disabledText = Roll disabled
#LOC_BDArmory_TimeBetweenStages = Time Between Stages
#LOC_BDArmory_MinSpeedGuidance = Min Speed before guidance
#LOC_BDArmory_ClearanceRadius = Clearance radius
#LOC_BDArmory_ClearanceLength = Clearance length
#LOC_BDArmory_showRFGUI = Show Weapon Name Editor
#LOC_BDArmory_showRFGUI_enabledText = Weapon Name GUI
#LOC_BDArmory_showRFGUI_disabledText = GUI
#LOC_BDArmory_DefaultAltitude = Default Alt.
#LOC_BDArmory_MinAltitude = Min Altitude
#LOC_BDArmory_SteerKi = Steer Ki
#LOC_BDArmory_MaxSpeed = Max Speed
#LOC_BDArmory_MaxDrift = Max drift
#LOC_BDArmory_TakeOffSpeed = TakeOff Speed
#LOC_BDArmory_MinSpeed = MinCombatSpeed
#LOC_BDArmory_IdleSpeed = Idle Speed
#LOC_BDArmory_maxAllowedGForce = Max G
#LOC_BDArmory_maxAllowedAoA = Max AoA
#LOC_BDArmory_Orbit = Orbit\u0020
#LOC_BDArmory_Orbit_enabledText = Starboard (CW)
#LOC_BDArmory_Orbit_disabledText = Port (CCW)
#LOC_BDArmory_UnclampTuning = Unclamp tuning\u0020
#LOC_BDArmory_UnclampTuning_enabledText = Unclamped
#LOC_BDArmory_UnclampTuning_disabledText = Clamped
#LOC_BDArmory_StandbyMode = Standby Mode
#LOC_BDArmory_On = On
#LOC_BDArmory_Off = Off
#LOC_BDArmory_VehicleType = Vehicle type
#LOC_BDArmory_MaxSlopeAngle = Max slope angle
#LOC_BDArmory_CruiseSpeed = Cruise speed
#LOC_BDArmory_TargetPitch = Moving pitch
#LOC_BDArmory_BankAngle = Bank angle
#LOC_BDArmory_BroadsideAttack = Attack vector
#LOC_BDArmory_BroadsideAttack_enabledText = Broadside
#LOC_BDArmory_BroadsideAttack_disabledText = Bow
#LOC_BDArmory_MinEngagementRange = Min engagement range
#LOC_BDArmory_MaxEngagementRange = Max engagement range
#LOC_BDArmory_ManeuverRCS = RCS active
#LOC_BDArmory_ManeuverRCS_enabledText = Maneuvers
#LOC_BDArmory_ManeuverRCS_disabledText = Combat
#LOC_BDArmory_MinObstacleMass = Min obstacle mass
#LOC_BDArmory_PreferredBroadsideDirection = Preferred broadside direction
#LOC_BDArmory_GoesUp = Goes up to
#LOC_BDArmory_GoesUp_enabledText = eleven
#LOC_BDArmory_GoesUp_disabledText = ten
#LOC_BDArmory_Rails = Rails
#LOC_BDArmory_DeployAltitude = Deploy Altitude
#LOC_BDArmory_EngageRangeMin = Engage Range Min
#LOC_BDArmory_EngageRangeMax = Engage Range Max
#LOC_BDArmory_EngageAir = Engage Air
#LOC_BDArmory_EngageMissile = Engage Missile
#LOC_BDArmory_EngageSurface = Engage Surface
#LOC_BDArmory_EngageSLW = Engage SLW
#LOC_BDArmory_DisableEngageOptions = Disable Engage Options
#LOC_BDArmory_EnableEngageOptions = Enable Engage Options
#LOC_BDArmory_MaxStaticLaunchRange = Max Static Launch Range
#LOC_BDArmory_MinStaticLaunchRange = Min Static Launch Range
#LOC_BDArmory_MaxOffBoresight = Max Off Boresight
#LOC_BDArmory_DetonationDistanceOverride = Detonation distance override
#LOC_BDArmory_DropTime = Drop Time
#LOC_BDArmory_InCargoBay = In Cargo Bay:\u0020
#LOC_BDArmory_DetonationTime = Detonation Time
#LOC_BDArmory_BallisticOvershootFactor = Ballistic Overshoot factor
#LOC_BDArmory_BallisticAnglePath = Ballistic Angle path
#LOC_BDArmory_CruiseAltitude = Cruise Altitude
#LOC_BDArmory_CruisePredictionTime = Cruise prediction time
#LOC_BDArmory_GPSTarget = GPS Target
#LOC_BDArmory_FiringInterval = Firing Interval
#LOC_BDArmory_FiringBurstLength = Firing Burst Length
#LOC_BDArmory_FieldOfView = Field of View
#LOC_BDArmory_VisualRange = Visual Range
#LOC_BDArmory_GunsRange = Guns Range
#LOC_BDArmory_MissilesORTarget = Missiles/Target
#LOC_BDArmory_GaurdMode = Gaurd Mode:\u0020
#LOC_BDArmory_Team = Team
#LOC_BDArmory_Weapon = Weapon
#LOC_BDArmory_Direction = Direction:\u0020
#LOC_BDArmory_Direction_disabledText = Lateral
#LOC_BDArmory_Direction_enabledText = Forward
#LOC_BDArmory_DecoupleSpeed = Decouple Speed
#LOC_BDArmory_MaxAltitude = Max Altitude
#LOC_BDArmory_TerminalGuidance = Terminal Guidance:\u0020
#LOC_BDArmory_false = False
#LOC_BDArmory_true = True
#LOC_BDArmory_TurretEnabled = Turret Enabled
#LOC_BDArmory_AutoReturn = Auto-Return
#LOC_BDArmory_AddedCost = Added cost
#LOC_BDArmory_DryMass = Dry mass
#LOC_BDArmory_Enabled = Enabled
#LOC_BDArmory_Enable = Enable
#LOC_BDArmory_EMPBlastRadius = EMP Blast Radius
#LOC_BDArmory_OrdinanceAvailable = Ordinance Available
#LOC_BDArmory_MissileAssign = Missile Assign
#LOC_BDArmory_CurrentLocks = Current Locks
#LOC_BDArmory_MaxPitch = Max Pitch
#LOC_BDArmory_MinPitch = Min Pitch
#LOC_BDArmory_YawRange = Yaw Range
#LOC_BDArmory_FireLimits = Fire Limits
#LOC_BDArmory_FireLimits_disabledText = None
#LOC_BDArmory_FireLimits_enabledText = In range
#LOC_BDArmory_DefaultDetonationRange = Fuzed Detonation Range\u0020
#LOC_BDArmory_ProximityFuzeRadius = Proximity Fuze Radius
#LOC_BDArmory_MaxDetonationRange = Max Detonation Range
#LOC_BDArmory_Barrage = Barrage
#LOC_BDArmory_ToggleBarrage = Toggle Barrage
#LOC_BDArmory_Status = Status
#LOC_BDArmory_Toggle = Toggle
#LOC_BDArmory_ShowGroupEditor = Show Group Editor
#LOC_BDArmory_ShowGroupEditor_enabledText = close Group GUI
#LOC_BDArmory_ShowGroupEditor_disabledText = open Group GUI
#LOC_BDArmory_DeactivationDepth = Deactivation Depth
#LOC_BDArmory_Hitpoints = Hitpoints
#LOC_BDArmory_ArmorThickness = Armor Thickness
#LOC_BDArmory_FireCountermeasure = Fire Countermeasure
#LOC_BDArmory_IncreaseHeight = Height ++
#LOC_BDArmory_DecreaseHeight = Height --
#LOC_BDArmory_IncreaseLength = Length ++
#LOC_BDArmory_DecreaseLength = Length --
#LOC_BDArmory_Detonate = Detonate
#LOC_BDArmory_TogglePilot = Toggle Pilot
#LOC_BDArmory_DeactivatePilot = Deactivate Pilot
#LOC_BDArmory_ActivatePilot = Activate Pilot
#LOC_BDArmory_FireMissile = Fire Missile
#LOC_BDArmory_GuidanceMode = Guidance Mode
#LOC_BDArmory_Jettison = Jettison
#LOC_BDArmory_ToggleTurret = Toggle Turret
#LOC_BDArmory_HideUI = Hide Weapon Name UI
#LOC_BDArmory_ShowUI = Set Weapon Name UI
#LOC_BDArmory_RailsPlus = Rails++
#LOC_BDArmory_RailsMinus = Rails--
#LOC_BDArmory_ChangetoLowAltitudeRange = Change to Low Altitude Range
#LOC_BDArmory_SelectTeam = Select Team
#LOC_BDArmory_OpenGUI = Open GUI
#LOC_BDArmory_ReturnTurret = Return Turret
#LOC_BDArmory_ToggleAnimation = Toggle Animation
#LOC_BDArmory_NextTankSetup = Next tank setup
#LOC_BDArmory_PreviousTankSetup = Previous tank setup
#LOC_BDArmory_Resupply = Resupply
#LOC_BDArmory_ToggleRadar = Toggle Radar
#LOC_BDArmory_NextTexture = Next Texture
#LOC_BDArmory_HideWeaponGroupUI = Hide Weapon Group UI
#LOC_BDArmory_SetWeaponGroupUI = Set Weapon Group UI
#LOC_BDArmory_Fire = Fire
}
}
Loading

0 comments on commit 521b7d3

Please sign in to comment.