Merge branch 'master' of git://github.com/Whitecat106/OrbitalDecay

zajc3w · Jun 17, 2017 · 528a146 · 528a146
2 parents 07590ec + 6d648de
commit 528a146
Show file tree

Hide file tree

Showing 20 changed files with 2,732 additions and 643 deletions.
diff --git a/GameData/OrbitalDecay1.5.dll b/GameData/OrbitalDecay1.5.dll
diff --git a/GameData/OrbitalDecay1.6.0(NbodyTests).dll b/GameData/OrbitalDecay1.6.0(NbodyTests).dll
diff --git a/GameData/PluginData/MasConData.cfg → GameData/Plugins/PluginData/MasConData.cfg b/GameData/PluginData/MasConData.cfg → GameData/Plugins/PluginData/MasConData.cfg
diff --git a/GameData/PluginData/Settings.cfg → GameData/Plugins/PluginData/Settings.cfg b/GameData/PluginData/Settings.cfg → GameData/Plugins/PluginData/Settings.cfg
@@ -5,6 +5,9 @@ SIMULATION
 	DecayDifficulty = 1.0
 	PlanetariumTracking = False
 	PlanetariumDebrisTracking = False
+	NBodySimulation = True
+	NBodySimulationConics = True
+	NBodySimulationConicsPatches = 50.0
 }
 RESOURCES
 {

diff --git a/GameData/PluginData/VesselData.cfg → GameData/Plugins/PluginData/VesselData.cfg b/GameData/PluginData/VesselData.cfg → GameData/Plugins/PluginData/VesselData.cfg
diff --git a/Source/DecayManager.cs b/Source/DecayManager.cs