Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update #26

Merged
merged 79 commits into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
626f687
feat(mechanics): Governments can now fine the player for illegal ship…
TomGoodIdea Sep 11, 2023
d19bb7d
fix(ui): Fix plugin name overflow in plugin list (#9292)
warp-core Sep 11, 2023
b46c56b
feat(ux): Show all applicable takeoff warnings (#9189)
TomGoodIdea Sep 11, 2023
003d093
fix(cd): Don't skip upload to continuous when partially failed (#9283)
tibetiroka Sep 11, 2023
430693d
feat(ux): Clear the destination planet if the travel plan changed (#9…
warp-core Sep 13, 2023
1d882fc
feat(enhancement): Allow governments to define location filters that …
Hurleveur Sep 15, 2023
e670747
fix(content): Fix "Trash Fire Crops" source location filter (#9297)
warp-core Sep 16, 2023
21adffc
refactor: Remove unused #includes (#9266)
quyykk Sep 16, 2023
d0ab6f5
fix(content): Use correct brown dwarf sprite in system Ae Il A-3 (#9302)
warp-core Sep 16, 2023
7379ea7
feat(content): Add new pre-war missions that send the player south (#…
danaris Sep 18, 2023
d6e6326
fix(typo): Rouge -> rogue (#9303)
warp-core Sep 20, 2023
f606db9
perf: Limit the number of concurrent image loads on game startup (#9288)
quyykk Sep 20, 2023
6629030
chore(docs): Update system requirements (#9242)
quyykk Sep 20, 2023
88f0e8a
feat(docs): Update and improve the build instructions (#9235)
quyykk Sep 20, 2023
2f4186c
fix(compiler compatibility): Include <cstdint> in various places for …
quyykk Sep 21, 2023
a576744
feat(ux): Better scrolling in the shop panels (#9091)
flowers9 Sep 21, 2023
633ef96
fix: Fix departure if the player has less crew than required (#9326)
warp-core Sep 22, 2023
994d350
chore: Add editorconfig entry for credits.txt (#9328)
warp-core Sep 23, 2023
6c46696
feat(mechanics): Allow auto-refilling ammo from storage (#9327)
warp-core Sep 23, 2023
38e460a
docs: Clarify what tools are needed if using another MinGW distributi…
quyykk Sep 23, 2023
1d4402c
fix(typo): Remove an erroneous "and" from an on visit dialog (#9323)
Arachi-Lover Sep 23, 2023
9eb74d2
fix: Invalidate travel plan if it became invalid (#9289)
warp-core Sep 23, 2023
cfd5e03
feat(content): Coalition: Lunarium Intro (#6646)
Arachi-Lover Sep 24, 2023
fd12000
feat(content): Coalition: Heliarch Intro (#6647)
Arachi-Lover Sep 24, 2023
1e14099
fix(segfault): Always return a valid CargoHold when getting planetary…
quyykk Sep 24, 2023
2134b8a
fix(build): Allow building for MinGW without having a VS toolchain in…
quyykk Sep 24, 2023
3e11377
fix(content): Recategorize the Heliarch License (#9336)
DarcyManoel Sep 24, 2023
f52da65
fix(ui): Fix race condition when drawing the planet labels (#9332)
quyykk Sep 24, 2023
96a20e0
feat(content): Add more high-end passenger transport missions to huma…
Anarchist2 Sep 24, 2023
af25e09
fix(mechanics): The player takes off from the stellar object they lan…
quyykk Sep 24, 2023
bfac366
perf: Only generate planet labels once when entering a system (#9339)
quyykk Sep 24, 2023
c50e944
fix(build): Correctly add compiler flags for main.cpp (#9337)
quyykk Sep 24, 2023
aed90d9
fix(content): Coalition Intro Tweaks (#9340)
Arachi-Lover Sep 24, 2023
d44f1c0
perf: Batch apply the changes from multiple events occurring at once …
quyykk Sep 24, 2023
980d56d
feat(ui): Messages about being unable to land now use the "Highest" m…
AmbushedRaccoon Sep 24, 2023
80609c8
fix(internal): Correctly use SDL_GetPrefPath (#9296)
quyykk Sep 24, 2023
4b449e3
fix(typo): Typo in 'Refugees to Humanika' (#9343)
roadrunner56 Sep 25, 2023
95b5c4e
fix(content): Correct offer condition of "Care Package to South 3a" t…
ziproot Sep 25, 2023
4734f5c
fix(typo): Correct references to the types of passengers in two intra…
roadrunner56 Sep 25, 2023
5f5b766
feat(content): Add a dialog upon destroying an NPC that must be "save…
Arachi-Lover Sep 25, 2023
bfca1e0
feat(content): "Towards" to "Toward" in Coalition Files (#9352)
Arachi-Lover Sep 26, 2023
af6ff0e
fix(content): Missing `goto` in Heliarch Containment 3 (#9353)
Arachi-Lover Sep 26, 2023
e8d802d
fix(content): Fix Heliarch License 2 (#9351)
warp-core Sep 26, 2023
1c1ab9d
feat(content): Give the Hallucination ship a noun (#9345)
warp-core Sep 27, 2023
c6d74ba
fix(content): Don't give reputation penalties for aborting some Helia…
warp-core Sep 27, 2023
ab6c37e
feat(balance): Nerf the Refueling Module (#9341)
Arachi-Lover Sep 27, 2023
9a12b2d
style: Clean up Heliarch intro mission definitions (#9357)
warp-core Sep 27, 2023
4b99a93
refactor: Replace old (#9358)
warp-core Sep 27, 2023
242fff9
fix(content): Fix use of "Heliarch License: (offered | done)" conditi…
warp-core Sep 27, 2023
6347237
perf: Avoid unnecesary copies of potentially the whole ship list ever…
tibetiroka Sep 28, 2023
3d913d3
feat(content): Change wording of the secure package delivery job comp…
ziproot Sep 29, 2023
6537b85
feat(content): Adjust how "Heliarch Drill 3" `fails` (#9369)
Saugia Sep 29, 2023
a4bdd1b
refactor(content): Replace old "require" actions with autoconditions …
Saugia Sep 29, 2023
c0022e2
fix(content) Fix some conditions in the Coalition intros (#9382)
warp-core Sep 30, 2023
265e2af
fix(ui): Do not apply swizzle masks to the outline image used in the …
RisingLeaf Sep 30, 2023
34bc140
fix(mechanics): Reallow jump drives to use hyperlinks regardless of d…
warp-core Sep 30, 2023
51f800f
fix(typo): Missing article (#9384)
warp-core Sep 30, 2023
6c459eb
feat(content): Adjust jump range values of some Gegno & Rulei Systems…
Saugia Sep 30, 2023
c16bdf1
fix(content): `active` to `done` in 2 Coalition Intro Missions (#9383)
warp-core Sep 30, 2023
e81785a
fix(content): Condition Typos in Coalition Intro (#9385)
quyykk Sep 30, 2023
d02ba90
feat(docs): Update the changelog for v0.10.3 (#9344)
Amazinite Sep 30, 2023
a7dfb7b
fix(content): Fix incorrect condition in an Emerald Sword mission (#9…
quyykk Sep 30, 2023
4c9bb1d
chore: Update version to 0.10.3 (#9329)
warp-core Sep 30, 2023
862b2bf
chore: Update version numbers for v0.10.4-alpha (#9387)
warp-core Sep 30, 2023
570b5e9
fix(content): Add how many passengers you need room for to the descri…
bene-dictator Oct 1, 2023
8f71a84
fix: Correctly set the application icon on Linux (#9362)
quyykk Oct 1, 2023
e289a98
feat(preferences): Default extended jump effects to off + add a new l…
RisingLeaf Oct 1, 2023
36a8904
feat(content): Clarify wording in "FW Pirates: Attack 1" (#9366)
hexagonrecursion Oct 1, 2023
f87e2ae
fix(typo): Update spellcheck typos (#9403)
warp-core Oct 3, 2023
5f7b487
fix(content): A few adjustments to Coalition Intros (#9402)
Arachi-Lover Oct 4, 2023
9154b79
fix(typo): "equipement" to "equipment" in tooltips.txt (#9407)
tibetiroka Oct 4, 2023
c51076b
fix(content): Correct offer conditions of "Small Pirate gambling" (#9…
Anarchist2 Oct 7, 2023
bd29f81
fix(content): Fix Quarg attitudes towards the Kor Mereti post-Mind (#…
warp-core Oct 7, 2023
d16eaa2
fix(content): Update Quarg fleets to use the correct regional governm…
Saugia Oct 7, 2023
79b43e2
fix(content): Clean up descriptions of new spaceport missions (#9418)
Anarchist2 Oct 7, 2023
96bf237
fix(content): Fix duplicate text in "Remnant: Celebration 1" (#9419)
warp-core Oct 7, 2023
d0b3a70
fix(ui): Fix scrolling up the load panel with the keyboard (#9420)
warp-core Oct 7, 2023
791a39b
fix(ui): Fix blurriness with smooth scroll (#9410)
Hurleveur Oct 7, 2023
28cf535
fix(content): Choose which Coalition faction to side with if the play…
Saugia Oct 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .codespell.exclude
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
system Nnaug
object "Sies Upi"
planet "Sies Upi"
description "Sies Upi is one of the most recently colonized planets of the Gegno Vi. This hot, dry world with harsh living environments serves as more of an outpost than it does a colony, but nevertheless the Vi found ways to create manageable living conditions."
description `Sies Upi is one of the most recently colonized planets of the Gegno Vi. This hot, dry world with harsh living environments serves as more of an outpost than it does a colony, but nevertheless the Vi found ways to create manageable living conditions.`
"Brocken"
` "What part of non-negotiable did you not understand? You're pushing your luck, Captain <last>. I didn't expect you to be such a petty money pincher."`
"Shepard"
Expand All @@ -92,3 +92,11 @@ planet "Sies Upi"
` "No wait! Luf e ow, vai, luf e eh?"`
"Vai"
"Mis"
` Torrey breaks out into a brilliant grin. "Well, that's great news, then. You'll find Irene at the militia base on <destination> - that's Gunnery Sergeant Irene Brower. I do appreciate this. You'll be paid upon receipt of the package, too, lest you think my appreciation is all I can give."`
`You arrive at the militia base on <destination>, and ask at the gate for Gunnery Sergeant Irene Brower. After a few minutes, a compact young woman with close-cropped blonde hair appears and walks over. When she sees the package at your feet, her face splits into a lopsided grin and her steps quicken. "I see you've brought me a package; this must be from Torrey! She said she was sending something."`
` Staying carefully out of the way of the hurrying corpsmen and nurses, you watch as the triage tent begins to fill up with the walking wounded, the not-so-walking wounded... and a few gurneys that someone pulls a sheet over not long after they arrive. Before long, you spot someone you think you recognize: Irene Brower, the gunnery sergeant you delivered a care package to before the war.`
` MSGT BROWER, IRENE`
`As you leave the quartermaster's building, you spot a familiar face coming in the other direction: Irene Brower, the gunnery sergeant you delivered a care package to before the war, though she seems to have master sergeant insignia now. She's on crutches, with what looks like a brand-new prosthetic leg. When she spots you, her pained face brightens. "Hey, I know you! You brought me that package from Tor before. Thanks!" She shifts her weight, then winces and shifts it back.`
log "Minor People" "Torrey and Irene" `Torrey Dupont, an activist, is friends with SMDP militia NCO Irene Brower. You delivered a package for them.`
"Brin"
"exis"
2 changes: 2 additions & 0 deletions .codespell.words.exclude
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
aesthetic
aesthetics
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ indent_style = unset
indent_style = space
indent_size = 2

# Credits file
[credits.txt]
indent_style = space
indent_size = 2

# Markdown
[*.md]
trim_trailing_whitespace = false
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,15 @@ jobs:
with:
path: ${{ github.workspace }} # This will download all files to e.g `./EndlessSky-win64.zip/EndlessSky-win64.zip`
- name: Add ${{ env.OUTPUT_APPIMAGE }} to release tag
continue-on-error: true
run: |
github-release upload \
--tag continuous \
--replace \
--name ${{ env.OUTPUT_APPIMAGE }} \
--file ${{ env.OUTPUT_APPIMAGE }}/${{ env.OUTPUT_APPIMAGE }}
- name: Add ${{ env.OUTPUT_WINDOWS }} to release tag
continue-on-error: true
run: |
github-release upload \
--tag continuous \
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
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.3
project("Endless Sky" VERSION 0.10.4
DESCRIPTION "Space exploration, trading, and combat game."
HOMEPAGE_URL https://endless-sky.github.io/
LANGUAGES CXX)
Expand Down Expand Up @@ -226,7 +226,7 @@ else()
endif()

# Link with the library dependencies.
target_link_libraries(EndlessSky PRIVATE ExternalLibraries $<TARGET_OBJECTS:EndlessSkyLib> $<TARGET_NAME_IF_EXISTS:SDL2::SDL2main>)
target_link_libraries(EndlessSky PRIVATE ExternalLibraries EndlessSkyLib $<TARGET_NAME_IF_EXISTS:SDL2::SDL2main>)

# Copy the MinGW runtime DLLs if necessary.
if(MINGW AND WIN32)
Expand Down Expand Up @@ -263,7 +263,7 @@ elseif(UNIX)
install(TARGETS EndlessSky CONFIGURATIONS Release RUNTIME DESTINATION games)

# Install the desktop file.
install(FILES endless-sky.desktop DESTINATION share/applications)
install(FILES io.github.endless_sky.endless_sky.desktop DESTINATION share/applications)

# Install app center metadata.
install(FILES io.github.endless_sky.endless_sky.appdata.xml DESTINATION share/metainfo)
Expand Down
2 changes: 2 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
"cacheVariables": {
"CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++",
"CMAKE_RC_COMPILER": "windres",
"VCPKG_HOST_TRIPLET": "x64-mingw-dynamic",
"VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic"
},
"condition": {
Expand All @@ -170,6 +171,7 @@
"cacheVariables": {
"CMAKE_CXX_COMPILER": "i686-w64-mingw32-g++",
"CMAKE_RC_COMPILER": "windres",
"VCPKG_HOST_TRIPLET": "x86-mingw-dynamic",
"VCPKG_TARGET_TRIPLET": "x86-mingw-dynamic"
},
"condition": {
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Endless Sky has very minimal system requirements, meaning most systems should be

|| Minimum | Recommended |
|---|----:|----:|
|RAM | 500 MB | 1 GB |
|RAM | 750 MB | 2 GB |
|Graphics | OpenGL 3.0 | OpenGL 3.3 |
|Storage Free | 300 MB | 1 GB |
|Storage Free | 350 MB | 1.5 GB |

## Building from source

Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ env.AlwaysBuild("test")
env.Install("$DESTDIR$PREFIX/games", sky)

# Install the desktop file:
env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
env.Install("$DESTDIR$PREFIX/share/applications", "io.github.endless_sky.endless_sky.desktop")

# Install app center metadata:
env.Install("$DESTDIR$PREFIX/share/metainfo", "io.github.endless_sky.endless_sky.appdata.xml")
Expand Down
Loading
Loading