Skip to content

Commit

Permalink
Bug Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Angel-125 committed Sep 2, 2016
1 parent df05f27 commit cfd4890
Show file tree
Hide file tree
Showing 732 changed files with 42 additions and 1,953 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -47,5 +47,6 @@ Temporary Items
/Releases/
/Scenes/
/Textures/
/Unity4/
/Unity/
/Docs/
2 changes: 1 addition & 1 deletion MoleUtils/MoleUtils.csproj
Expand Up @@ -63,7 +63,7 @@
<ItemGroup>
<Compile Include="ModuleAbortModeEngine.cs" />
<Compile Include="ModuleBackseatController.cs" />
<Compile Include="ModuleMarkOneLab.cs" />
<Compile Include="WBISkylab.cs" />
<Compile Include="ModuleDeployableWing.cs" />
<Compile Include="ModuleMultiEngineAdapter.cs" />
<Compile Include="ModuleRCSDisabler.cs" />
Expand Down
41 changes: 40 additions & 1 deletion MoleUtils/ModuleMarkOneLab.cs → MoleUtils/WBISkylab.cs
Expand Up @@ -19,7 +19,8 @@
*/
namespace WildBlueIndustries
{
public class ModuleMarkOneLab : WBIMultiConverter
[KSPModule("Skylab")]
public class WBISkylab : WBIMultiConverter
{
[KSPField]
public string opsViewTitle = string.Empty;
Expand All @@ -44,6 +45,12 @@ public override void OnStart(StartState state)
public override void RedecorateModule(bool loadTemplateResources = true)
{
base.RedecorateModule(loadTemplateResources);
updateScienceLab();
updateWorkshop();
}

protected void updateScienceLab()
{
bool enableMPLModules = false;

if (CurrentTemplate.HasValue("enableMPLModules"))
Expand Down Expand Up @@ -74,5 +81,37 @@ public override void RedecorateModule(bool loadTemplateResources = true)
converter.enabled = enableMPLModules;
}
}

protected void updateWorkshop()
{
PartModule oseWorkshop = null;
PartModule oseRecycler = null;
bool enableWorkshop = false;

//See if the drill is enabled.
if (CurrentTemplate.HasValue("enableWorkshop"))
enableWorkshop = bool.Parse(CurrentTemplate.GetValue("enableWorkshop"));

//Find the workshop modules
foreach (PartModule pm in this.part.Modules)
{
if (pm.moduleName == "OseModuleWorkshop")
oseWorkshop = pm;
else if (pm.moduleName == "OseModuleRecycler")
oseRecycler = pm;
}

if (oseWorkshop != null)
{
oseWorkshop.enabled = enableWorkshop;
oseWorkshop.isEnabled = enableWorkshop;
}

if (oseRecycler != null)
{
oseRecycler.enabled = enableWorkshop;
oseRecycler.isEnabled = enableWorkshop;
}
}
}
}
Binary file modified MoleUtils/bin/Debug/MoleUtils.dll
Binary file not shown.
Binary file modified MoleUtils/bin/Debug/MoleUtils.pdb
Binary file not shown.
Binary file modified MoleUtils/bin/Debug/WildBlueTools.dll
Binary file not shown.
Binary file modified MoleUtils/bin/Debug/WildBlueTools.pdb
Binary file not shown.
Binary file not shown.
Binary file modified MoleUtils/obj/Debug/MoleUtils.dll
Binary file not shown.
Binary file modified MoleUtils/obj/Debug/MoleUtils.pdb
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Adapters/Adapter.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Adapters/SD18.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Adapters/SD25.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/BOWLights.anim
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/BOWLights.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/BOWProps.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/BOWSpace.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Backseat/BPPropASET.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Backseat/BPPropRPM.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Backseat/BSPropsStock.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Backseat/Backseat.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Backseat/Backseat2.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Backseat/BackseatLights.anim
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Backseat/BackseatSpace.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/BigCrewModule/BigA.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/BigCrewModule/BigAInt.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/BigCrewModule/BigASpace.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/BigCrewModule/BigbyLights.anim
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Brumby/BrumIntStock.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Brumby/Brumby.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Brumby/BrumbyIntASET.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Brumby/BrumbyIntRPM.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Brumby/BrumbyLights.anim
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Brumby/BrumbySpace.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Coach/Coach225.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Coach/Coach300.unity
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/DockingPorts/DR18Lights.anim
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/DockingPorts/FCP.unity
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/FuelTanks/WB400.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Fulcrum/LV-T270.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Fulcrum/LVT270EngineHeat.anim
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Heatshields/HeatShield.unity
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/InlineRadiator.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Interstages/IA25.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Interstages/IA375.unity
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Interstages/MK85ISC.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Interstages/MK85ISC2.unity
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Korona.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/LargeInstrumentUnit.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/MOBLLights.anim
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/MOHLights.anim
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/MOLE.png
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/MOLE2.png
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/MPU.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Adapter.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/AirlockModule.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/AirlockSpace.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/BOW.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/BOWSpace.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Backseat.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/BackseatOrig.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/BackseatSpace.FBX
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/BigA.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/BigBSpace.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/BotanyLab.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Brumby.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/BrumbySpace.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/BrumbySpaceBare.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Coach225.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Coach300.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Colt.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/ControlModule.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/DR-18DockingPort.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/FCP.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/FuelCell.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/IA25.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/InlineRadiator.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/InterstageAdapter.FBX
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/KH10.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/KargoBay.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Korona.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/LV-T270.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/LargeInstrumentUnit.FBX
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/MK85ISC.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/MK85ISC2.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/MOBLSpace.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/MOH.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/MOHSpace.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/MOLESolarPanel.FBX
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Brumby.mat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Decals.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Decoupler.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/DragChute.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Fern.mat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Grass.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/GrayGlow.mat
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/IsoGrid.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/LV-T270.mat
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Leaf.mat
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MCM.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MCMShiny.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MCM_DIF.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MOLE.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MOLE2.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MOLE3.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MOLELight.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MOLEShiny.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MS3Spec.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MainChute.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Mole2Shiny.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MoleDull.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MoleSheet1.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MoleSpace1.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MoleSpace2.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/MoleSpace3.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Netting.mat
Binary file not shown.
30 changes: 0 additions & 30 deletions Unity4 - Copy/Assets/Models/Materials/No Name.mat

This file was deleted.

Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Seat.mat
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/TankEndCap.mat
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Titan.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/TitanII.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/TitanShiny.mat
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/Window.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/flagDecal.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/ladderrung.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/material1.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/port.mat
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Materials/portcap.mat
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Mk1DockingPort.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Mk1RadialDockingPort.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Mk25HeatShield.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Mk85HeatShield.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Mole18.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/MoleSpace.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/PowerModule.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/ProcessorSocket.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/QuadEngineCoupler.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/S18Separator.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/S25Separator.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/SD-18A.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/SD-18B.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/SD-18C.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/SD-25A.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/SD-25B.FBX
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/SimpleWing.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/SkylabSolarPanel.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/StationHub.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/StationHubSpace.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/StationLight.FBX
Binary file not shown.
176 changes: 0 additions & 176 deletions Unity4 - Copy/Assets/Models/Test Animator.controller

This file was deleted.

Binary file removed Unity4 - Copy/Assets/Models/TestPart.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Titan1800.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Titan450.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/Titan900.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/TitanAdapterTank.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/TitanII-16.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/TitanII-32.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/TitanII-64.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/TitanII-8.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/TitanInstrumentUnit.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/TwinEngineCoupler.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/WB-700.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/WB400.FBX
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/outerDoorCOL.blend
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/outerDoorLeftCOL.blend
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/outerDoorRightCOL.blend
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/tankGlykerol.mb
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/Models/tank_Glykerol.blend
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/MoleSheet1.png
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/MoleSpaceSpec1.png
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/New Animation.anim
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/OMS/Colt.unity
Binary file not shown.
Binary file removed Unity4 - Copy/Assets/OMS/OMSFlame.unity
Binary file not shown.
37 changes: 0 additions & 37 deletions Unity4 - Copy/Assets/PartTools/Editor/InternalSpaceEditor.cs

This file was deleted.

42 changes: 0 additions & 42 deletions Unity4 - Copy/Assets/PartTools/Editor/KSPParticleEmitterEditor.cs

This file was deleted.

0 comments on commit cfd4890

Please sign in to comment.