Merge branch 'master' into kspexp
author Gerry1135
()
committer Gerry1135
()
commit fa0b3c449519ee0c4ec5efe1bda6595c63415034
tree 4ca9801d014e2b7ff90c7c1e243efa60d0e3a167
parent 81b7238d835a0b45e9804519a4a79463f3461232
parent b5b932111bc048c06b2210ba38cb78222de6d9b7
Merge branch 'master' into kspexp

Resolved conflicts to use Sarbian's object pooling
27 files changed:
Assets/CurseLogo.png
Assets/CurseLogo.psd
Documents/CHANGES.txt
KerbalEngineer/CelestialBodies.cs
KerbalEngineer/Editor/BuildAdvanced.cs
KerbalEngineer/Editor/BuildOverlayPartInfo.cs
KerbalEngineer/Editor/BuildOverlayResources.cs
KerbalEngineer/Editor/BuildOverlayVessel.cs
KerbalEngineer/Editor/BuildToolbar.cs
KerbalEngineer/Editor/PartInfoItem.cs
KerbalEngineer/EngineerGlobals.cs
KerbalEngineer/Extensions/PartExtensions.cs
KerbalEngineer/Flight/ActionMenu.cs
KerbalEngineer/Flight/Readouts/Surface/AtmosphericProcessor.cs
KerbalEngineer/Helpers/Averager.cs
KerbalEngineer/Helpers/ForceAccumulator.cs
KerbalEngineer/Helpers/Pool.cs
KerbalEngineer/Helpers/Units.cs
KerbalEngineer/KerbalEngineer.csproj
KerbalEngineer/VesselSimulator/AttachNodeSim.cs
KerbalEngineer/VesselSimulator/EngineSim.cs
KerbalEngineer/VesselSimulator/PartSim.cs
KerbalEngineer/VesselSimulator/SimManager.cs
KerbalEngineer/VesselSimulator/Simulation.cs
KerbalEngineer/VesselSimulator/Stage.cs
Output/KerbalEngineer/KerbalEngineer.dll
Output/KerbalEngineer/KerbalEngineer.version