Skip to content

Commit

Permalink
Merge tag 'v0.10.8' of https://github.com/endless-sky/endless-sky int…
Browse files Browse the repository at this point in the history
…o android
  • Loading branch information
thewierdnut committed Jun 23, 2024
2 parents 51c7a76 + d5dcdd6 commit 590301d
Show file tree
Hide file tree
Showing 81 changed files with 617 additions and 277 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ blank_issues_enabled: false
contact_links:
- name: Endless Sky Mobile
url: https://github.com/thewierdnut/endless-mobile/issues/
about: Please report bugs any issues related to the mobile port here.
about: Please report any issues related to the mobile port here.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,11 @@ ipch/
.idea/
.idea_modules/
compile_commands.json
<<<<<<< HEAD
/.gitmodules
*.swp
*.swo
=======
CMakeUserPresets.json
.gitmodules

# static code analysis
/.scannerwork
>>>>>>> v0.10.0
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
cmake_minimum_required(VERSION 3.16...3.29)

include(CMakeDependentOption)
if(UNIX AND NOT APPLE)
if(UNIX AND NOT APPLE AND NOT ES_STEAM)
option(ES_USE_VCPKG "Use vcpkg to get dependencies." OFF)
else()
option(ES_USE_VCPKG "Use vcpkg to get dependencies." ON)
endif()
cmake_dependent_option(ES_GLES "Build the game with OpenGL ES" OFF UNIX OFF)
cmake_dependent_option(ES_STEAM "Build the game for the Steam Linux runtime" OFF UNIX OFF)
cmake_dependent_option(ES_USE_SYSTEM_LIBRARIES "Use system libraries instead of the vcpkg ones." ON APPLE OFF)
cmake_dependent_option(ES_USE_SYSTEM_LIBRARIES "Use system libraries instead of the vcpkg ones." ON "APPLE OR ES_STEAM" OFF)
cmake_dependent_option(ES_CREATE_BUNDLE "Create a Bundle instead of an executable. Not suitable for development purposes." OFF APPLE OFF)

# Support Debug and Release configurations.
Expand Down Expand Up @@ -58,7 +58,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT EndlessSky)
set(CMAKE_VS_JUST_MY_CODE_DEBUGGING ON)

project("Endless Sky" VERSION 0.10.7
project("Endless Sky" VERSION 0.10.8
DESCRIPTION "Space exploration, trading, and combat game."
HOMEPAGE_URL https://endless-sky.github.io/
LANGUAGES CXX)
Expand Down
Binary file not shown.
53 changes: 52 additions & 1 deletion changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,55 @@
version 0.10.7
Version 0.10.8
* Bug fixes:
* Content bugs:
* Typo fixes. (@eebop, @Hannah-E-M, @roadrunner56, @TheGiraffe3, @tibetiroka)
* Shortened Darkrest's description to better fit the planet description box. (@roadrunner56)
* Replaced duplicated words with weights in phrases. (@tibetiroka)
* The Hai festival jobs now have deadlines, as their descriptions suggested they should have had. (@ziproot)
* Updated Korath World-ship names for Remnant jobs. (@ziproot)
* The '"Benga" Reverse Thruster' now properly makes noise when in use. (@Saugia)
* Engine bugs:
* Fixed a crash when sorting ships without a ship selected with clang. (@warp-core)
* Fixed a crash with non-ASCII characters passed to cctype methods with clang. (@warp-core)
* Fixed a crash when sorting the ship list with no ships. (@warp-core)
* Fixed issues with the player interacting with the game after death. (@tibetiroka)
* Unicode byte order marks at the beginning of data files will no longer be tokenized. (@warp-core)
* The flagship will no longer move through wormholes ahead of escorts when using fleet jumping. (@Koranir)
* Fixed edge cases for the battery only flight check warning. (@nickshanks)
* Fixed a crash when drawing cloaked ship and flagship outlines. (@tibetiroka)
* The "flagship only" flotsam collection setting now works. (@tibetiroka)
* Game content:
* Mission changes:
* The Pact Recon missions will now no longer offer immediately after each other. (@Anarchist2)
* Reduced the pay and availability of Swiftsong jobs. (@roadrunner56)
* In the "Pirate Duel" mission, Umbral is now a marked system instead of a waypoint, meaning it is no longer required to visit the system in order to complete the mission. (@ziproot)
* Balance:
* Reduced "relative heat damage" sources by a factor of 1.5, for consistency with the mass rebalance in v0.10.7. (@Quantumshark)
* Reduced the difficulty of "Wanderers: Mind 6". (@TheGiraffe3)
* Wanderer escorts:
* +1 Tempest
* Friendly Mereti:
* -1 Model 128
* +2 Model 16
* Hostile Mereti:
* -1 Model 128
* -1 Model 64
* -1 Model 32
* Game mechanics:
* New mechanics:
* Added a gamerule for controlling disabled fighter projectile collision. (@tibetiroka)
* Illegal mission passengers can now be detected by planetary security. Previously, missions with only illegal passengers could never result in a fine. (@TomGoodIdea)
* User interface:
* The message for a player escort being destroyed will now appear the moment the ship is destroyed instead of after it explodes and will not be duplicated. (@nickshanks)
* The message for the destruction of an escort will now include its model name. (@nickshanks)
* Salaries and tribute payments in the player info panel are now sorted in descending order. (@nickshanks)
* The mission description pane will no longer be shown if there is no mission selected. (@nickshanks)
* The scroll speed setting can now be configured to move from to 10 to 60 pixels at a time in steps of 10, instead of 20 to 60 pixels at a time in steps of 20. (@nickshanks)
* CI/CD and development environment:
* Updated the issue and PR templates to account for the new wiki repository. (@warp-core)
* Fixed the Steam Linux build. (@warp-core)
* Added an action to update the GitHub wiki from the endless-sky/endless-sky-wiki repository. (@warp-core)

Version 0.10.7
* Big changes:
* Rebalanced ship mass and engine performance across the game. (@Quantumshark)
* Increased thrust, turn, reverse thrust, and afterburner thrust by 50% for all engines.
Expand Down
5 changes: 4 additions & 1 deletion credits.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Welcome to Endless Sky!
version 0.10.7
version 0.10.8

The player's manual and other
resources are available at:
Expand Down Expand Up @@ -247,6 +247,7 @@ contributed to Endless Sky:
gunqqer
Hacklin
Hadron1776
Hannah-E-M
har9862
Hatrask
Hecter94
Expand Down Expand Up @@ -325,6 +326,7 @@ contributed to Endless Sky:
nathan-b
Nescio0
neurotrope
nickshanks
nobodywasishere
NomadicVolcano
nothing-but-the-rain
Expand Down Expand Up @@ -412,6 +414,7 @@ contributed to Endless Sky:
Terin
The-Legendary-M
thebigh2014
TheGiraffe3
TheMarksman-ES
thenerdfreak
TheUnfetteredOne
Expand Down
Loading

0 comments on commit 590301d

Please sign in to comment.