Alpha5 #336
Open
Alpha5 #336
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Noticed this when ground_station crashed
… offsets when calculating stride
It is now obsolete, as one can specify at which star one wants to jump.
This commit adds new InitiateHyperjump and AbortHyperjump methods to Ship, with only the minimal consistency checking (not in hyperspace already, and not jumping towards the current system), as well as a way to use an arbitrary Lua function to abort the jump during the countdown. The plan is to make these methods available from Lua, and to implement all Hyperspace-related policies in Lua (waiting on pioneerspacesim#1719, as usual). In the end, I plan on removing CheckHyperSpaceTo and friends. In order to make this work, I had to add a temporary flag to the HyperspaceOut structure to tell the various checking functions not to deal with considerations of fuel or range when the hyperjump has been initiated by the new methods. This flag will definitely be on its way along with all the fuel-related code in an hopefully near future.
and use it to still do the simple checks before jumping into hyperspace.
Make it compile again
…-delete VS2012 doesn't support `= delete`.
Update for text and pioneer project file removals.
…of JobHandle (fixes pioneerspacesim#2799).
* new ship exhaust trails * new ship; civilian corvette * new npc ship; passenger liner * new npc ship; ultraheavy tanker * new ship; civilian fighter * new shields for all ships * fixed mission spawning bug * updates to missions and reputation
Conflicts: .gitignore data/ui/InfoView/CrewRoster.lua data/ui/Settings.lua src/Background.cpp src/Background.h src/Camera.cpp src/Makefile.am src/SystemInfoView.cpp src/SystemView.cpp src/WorldView.cpp src/galaxy/Sector.h src/galaxy/StarSystem.cpp src/graphics/Makefile.am src/graphics/Renderer.h src/graphics/RendererGL2.cpp src/graphics/RendererGL2.h win32/vc2012/graphics/graphics.vcxproj win32/vc2012/graphics/graphics.vcxproj.filters win32/vc2012/pioneer.vcxproj win32/vc2012/pioneer.vcxproj.filters
Conflicts: .gitignore data/ui/InfoView/CrewRoster.lua data/ui/Settings.lua src/Background.cpp src/Background.h src/Camera.cpp src/Makefile.am src/SystemInfoView.cpp src/SystemView.cpp src/WorldView.cpp src/galaxy/Sector.h src/galaxy/StarSystem.cpp src/graphics/Makefile.am src/graphics/Renderer.h src/graphics/RendererGL2.cpp src/graphics/RendererGL2.h win32/vc2012/graphics/graphics.vcxproj win32/vc2012/graphics/graphics.vcxproj.filters win32/vc2012/pioneer.vcxproj win32/vc2012/pioneer.vcxproj.filters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Paragon alpha 5 source release + pioneer's latest changes
Alpha 5 changes include: