Merge remote-tracking branch 'upstream/master'

Author: MasterOfGrey

.appveyor.yml

@@ -20,11 +20,15 @@ environment:
     - MINGW_ROOT: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
       MINGW_VERSION: v8.1.0
 
+matrix:
+  fast_finish: true
+
 install:
   # Update env variables to use the desired MinGW version
   - ps: |
       Set-AppveyorBuildVariable -Name PATH -Value "$Env:MINGW_ROOT\bin\;$Env:PATH";
       Set-AppveyorBuildVariable -Name DIR_MINGW64 -Value "$Env:MINGW_ROOT\x86_64-w64-mingw32";
+      Set-AppveyorBuildVariable -Name SCCACHE_C_CUSTOM_CACHE_BUSTER -Value "$Env:MINGW_VERSION"
   # Ensure we have the precompiled libraries to link with (SDL, etc.).
   - ps: |
       if (!(Test-Path 'C:\dev64')) { New-Item 'C:\dev64' -ItemType Directory; }
@@ -49,19 +53,22 @@ build_script:
   - ps: mingw32-make.exe -re -j2 -f .winmake $Env:es_run_mode;
 
 before_test:
-  - ps: mingw32-make.exe -re -j2 -f .winmake build-tests;
+  - ps: |
+      Set-AppveyorBuildVariable -Name BUILDDIR -Value "build/pkgd"
+      mingw32-make.exe -re -j2 -f .winmake build-tests;
   - ps: |
       $here = (Get-Location).Path;
       Copy-Item -Path "bin\pkgd\release\endless-sky.exe" -Destination $here;
       Copy-Item -Path "C:\dev64\bin\*.dll" -Exclude "libstdc*" -Destination $here;
 
 test_script:
-  - ps: .\tests\endless-sky-tests.exe -n es-ci -i --warn NoAssertions --order rand --rng-seed 'time' --filenames-as-tags -r junit -o $Env:TEST_REPORT_FILE;
-  - ps: .\tests\test_parse.ps1 'endless-sky.exe';
+  - ps: .\tests\unit\endless-sky-tests.exe -n es-ci -i --warn NoAssertions --order rand --rng-seed 'time' --filenames-as-tags -r junit -o $Env:TEST_REPORT_FILE;
+  - ps: .\utils\test_parse.ps1 'endless-sky.exe';
 
 # Upload the build if tests passed.
 after_test:
   - ps: |
+      sccache --show-stats
       $here = (Get-Location).Path;
       Copy-Item -Path "$Env:DIR_MINGW64\lib\libstdc++-6.dll" -Destination $here;
       Copy-Item -Path "$Env:DIR_MINGW64\lib\libgcc_s_seh-1.dll" -Destination $here;

.codespell.exclude

@@ -1,10 +1,12 @@
 		"Woh"
+		"Yot"
 		"mor"
 		"Grey"
 		"Mitre"
 		"Alph"
 		"Gord"
 		"gard"
+		"Mata"
 		"Diamond Grey"
 		"Grey Wolf"
 				`	"The Grey Goose."`
@@ -17,3 +19,29 @@
 		"cach"
 		"oder"
 		" Grat"
+			`	"Fantastic, you understand the situation," she says, though her tone is much more businesslike than the wording would imply. "In that case, if you could please take this to Earth and communicate with your various governments we can begin a dialogue on how best to deal with this current scenario."`
+			`	"Hello, ser! I hope you've been enjoying your stay in our state of the art spaceport! But why stay cooped up in here, when you could be out there?" She gestures toward the windows.`
+			`	"So ser," she continues, "what do you say? Should I sign you up for the VIP Winter-Wonder Excursion Package for a special time limited-only offer of 2,000 credits?"`
+			`	The woman frowns, but nods knowingly. "I am afraid, ser, most seem to think the way you do. Still, if you ever run into anyone out there who might be interested, let them know. We could really use the work." With that, she turns and walks briskly back to her booth.`
+			`	The woman's face lights up, and you get the sense that she isn't used to hearing "yes" very often. "Oh, that is wonderful ser, just wonderful!"`
+			`	She puts her finger to her ear and says, "Hjlod, we have a customer! Get the crawler warmed up!" The woman then drops her hand and waves to you. "Right this way, ser! And might I add - you will not be disappointed." She chatters excitedly about the cultural, artistic and scientific merits of the trip as she leads you toward a large pressure hatch.`
+			`	The woman's face, red with the cold, looks crest-fallen, but unsurprised, like she was half expecting this outcome. "Brunhilda can be an... intimidating vehicle, it's true. But she is safe ser, I assure you. Either way, I'll take you back to the spaceport."`
+			`	The uneventful journey to the boiling ice river of Slidr is suddenly interrupted when a deep tremor followed by a thunderous boom shakes the Ice-Crawler to its core and causes it to slip on the disturbed ice and snow. Somewhere outside, subsequent rumble starts to build rapidly. After Hjlod regains control of the crawler, she immediately veers away from the noise. "That vas Nifel-quake, and loud noise was avalanche, or landslide, maybe both. This is not good."`
+			`	By the time you are on your feet, Hjlod has already gathered up numerous supplies and is preparing to open the hatch and dig her way to the surface. She looks at you. "Nothing to vorry about. Happens all time. Vell, not really. First time this happen, but Hjlod not let you die, probably. I can lead us to settlement not far from here."`
+			`	Hjlod abruptly stops and glares at you. "You are fool. You vill certainly die, and you endanger me in process. This is no game, valk only vhere I valk or die.`
+			`	Evening and exhaustion approach hand in hand, and as the last sun sets, you're not sure how much farther you can go. "There!" Hjlod breaks the silence of hours as she points at the weak flicker of light in the twilight landscape. "This is good," she admits hoarsely as you both stumble toward the light. "Ve vould have not survived night."`
+			`	"I just vant to thank you." Hjlod's gray-blue eyes glitter in the morning light. "I alvays say Hjlod keep tourist safe. But yesterday you save Hjlod. I vill not forgot, know this."`
+			`There are no signs of Hjlod when you arrive at the mostly empty spaceport. You spend a few minutes wandering around before you see her heading down the hall toward you. "Sorry to be late, you vould not believe all paper-vork they had for me. I think they aren't happy about Ice-Crawler."`
+			`	You ask her if she's worried you've been compromised - that you might be working against the Skadenga's best interests. Hjlod shakes her head. "No. Future is set. Vhat vill, vill be. You are given task to tell us vhere to go, ve go vhere you say. The rest is just noise.`
+			`	"Sounds like herbalist box. Ondurdis had one long before I vas born. Gave it to liar. It not important though, not Setstokkr."`
+			`	Hjlod nods. "Hrithfjall sounds like good place. I vill tell Ondurdis.`
+			`	Hjlod nods. "The Skadenga have alvays been guides, pathfinders. I vill tell Ondurdis.`
+			`	"Vhen you were gone, thing, or assembly, vas held. Ondurdis called in all Skadenga from all villages across Nifel. You must find transportation for 2,200 folk. That is what Onderduis told me to tell you."`
+			`	Hjlod takes a deep, calming breath. "I call because you are our only hope. They vill not let us leave. They vill not let us be. They will steal our souls." She points a shaky finger at you. "Take us back to Nifel. All those who are left. Take us home. Ve know the cold vill get us eventually. But better to live on a dying vorld as Skadenga than to live here as nothing."`
+			`	Hjlod grimaces. "Once they know you are here, they vill collect us. Come back here in an hour. Any longer than that, and ve vill be gone." She slumps down on the ground as you exit the dark, dirty tunnel where the remaining Skadenga cling to their fleeting identity.`
+			`	"Ve have 52 people that need off this vorld right now." Hjlod hesitates a moment, and then adds, "I know how much you like money. Ve have pooled all our savings together and will pay you <payment> for this job." She grabs a ragged duffle bag and a group gather around her. "The rest vill meet us at your ship. Ve move now."`
+			`	"I do not know vhy you sent us to that place. But I am happy to be home. So go, and maybe one day I vill not hate to see you again."`
+			`A familiar woman is waiting for you outside your ship. Although it's been more than seven years since you've last seen her, you recognize Hjlod instantly. Her eyes are brighter than when last you parted, and she has the same lopsided grin that you remember. "<first>, I saw your ship landing, and thought I vould say hello."`
+			`	She reaches into her pocket and pulls out a small wooden box, similar to the one you saw displayed at Asgard years ago. "I have been thinking," Hjlod says. "Maybe all this vas vill of Skade. Maybe you took us to Asgard to make us stronger, to make us better. It is bitter lesson, but I understand it now."`
+			`	"A data archive with the latest briefings and analyses. Heavily shielded and encrypted, of course, so no need to worry about it showing up on a scan. It has to get there by <date>. So, could you do it?" They hold out a small case with a data crystal visible through the window.`
+			`As the scan results arrive the data is relayed down to the team in the cargo hold. Your video feed shows a large hologram of the system floating in midair above one of the pallets. Nearby, terminals flash rolling readouts and analyses. As the data on the spectral ship solidifies, cones of projected courses appear on the display. Line by line the cone tightens in as additional data flows from your telemetry, closing in on a path intersecting with the nearby world.`

.ecrc

@@ -0,0 +1,3 @@
+{
+  "Exclude": ["\\.mp3$", "test_datafile.cpp", "\\Shader.cpp$", "Font.cpp", "Mask.cpp"]
+}

.editorconfig

@@ -11,8 +11,11 @@ trim_trailing_whitespace = false
 indent_style = tab
 
 # Code files
-[*.{cpp,h,rc,hpp}, SConstruct, SConscript]
+[{*.{cpp,h,rc,hpp}, SConstruct, SConscript}]
 indent_style = tab
+# Except any third-party libraries
+[catch.hpp]
+indent_style = unset
 
 # Markdown
 [*.md]

.github/ISSUE_TEMPLATE/bug-report.yaml .github/ISSUE_TEMPLATE/bug-report.yml.github/ISSUE_TEMPLATE/bug-report.yaml renamed to .github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,29 @@
+name: Documentation Issue
+description: There is an error in documentation, such as documentation being wrong or outdated. Documentation may include the wiki on GitHub, RFCs, style guides, or other such pages/documents.
+labels: [documentation]
+
+body:
+  - type: markdown
+    attributes:
+      value: Thank you for filing a wiki report!
+  - type: input
+    attributes:
+      label: Location
+      description: Where the issue is.
+      placeholder: wiki, style guide, etc.
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the issue
+      description: Provide a clear and concise description of what the issue is.
+    validations:
+      required: true
+  - type: textarea
+    id: content
+    attributes:
+      label: Expected content
+      description: Provide content you expected that is missing.
+    validations:
+      required: true

…thub/ISSUE_TEMPLATE/feature-request.yaml …ithub/ISSUE_TEMPLATE/feature-request.yml.github/ISSUE_TEMPLATE/feature-request.yaml renamed to .github/ISSUE_TEMPLATE/feature-request.yml .github/ISSUE_TEMPLATE/feature-request.yaml renamed to .github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,45 +1,57 @@
 data:
- - 'changelog*'
- - 'copyright*'
- - credits.txt
- - icon.png
- - keys.txt
- - license.txt
- - 'data/**/*'
- - 'images/**/*'
- - 'sounds/**/*'
+  - 'changelog*'
+  - 'copyright*'
+  - credits.txt
+  - icon.png
+  - keys.txt
+  - license.txt
+  - 'data/**/*'
+  - 'images/**/*'
+  - 'sounds/**/*'
 
 game_code: &build
- - 'source/**'
+  - 'source/**'
 
 macos:
- - 'XCode/**'
- - '**/*.xcodeproj'
- - 'icons/endless-sky.iconset/**'
- - 'utils/fetch_sdl2_framework.sh'
- - 'utils/set_dylibs_rpath.sh'
- - *build
+  - 'XCode/**'
+  - '**/*.xcodeproj'
+  - 'icons/endless-sky.iconset/**'
+  - 'utils/fetch_sdl2_framework.sh'
+  - 'utils/set_dylibs_rpath.sh'
+  - *build
 
 windows:
- - '**/*.cbp'
- - EndlessSky.workspace
- - SConstruct
- - .winmake
- - *build
+  - '**/*.cbp'
+  - EndlessSky.workspace
+  - SConstruct
+  - .winmake
+  - *build
 
 linux:
- - SConstruct
- - *build
+  - SConstruct
+  - *build
 
 unit_tests:
- - 'tests/**/*.h'
- - 'tests/**/*.hpp'
- - 'tests/**/*.cpp'
+  - 'tests/unit/**/*.h'
+  - 'tests/unit/**/*.hpp'
+  - 'tests/unit/**/*.cpp'
 
 integration_tests:
- - 'tests/test_parse.*'
- - 'tests/run_tests*'
- - 'data/tests/**'
+  - 'utils/test_parse.*'
+  - 'tests/integration/run_tests*'
+  - 'data/tests/**'
+  - 'tests/integration/universes/**'
 
 codespell:
- - .codespell.exclude
+  - .codespell.exclude
+
+xcode_files:
+  - 'EndlessSky.xcodeproj/**'
+  - 'utils/check_xcode.sh'
+
+codeblocks_files:
+  - '*.cbp'
+  - 'utils/check_codeblocks.sh'
+
+copyright:
+  - 'copyright'

.github/ISSUE_TEMPLATE/wiki-issue.yml

@@ -11,9 +11,9 @@ NOTICE: Delete the sections that do not apply to your PR, and fill out the secti
 This save file can be used to play through the new mission content:
 {{attach a save file that allows people to easily test your added mission content or see your new in-game art}}
 
-## PR Checklist
+## Artwork Checklist
  - [ ] I updated the copyright attributions, or decline to claim copyright of any assets produced or modified
- - [ ] I uploaded the necessary image, blend, and texture assets here: {{insert link to assets}}
+ - [ ] I created a PR to the [endless-sky-assets repo](https://github.com/EndlessSkyCommunity/endless-sky-assets) with the necessary image, blend, and texture assets: {{insert PR link}}
  - [ ] I created a PR to the [endless-sky-high-dpi repo](https://github.com/endless-sky/endless-sky-high-dpi) with the `@2x` versions of these art assets: {{insert PR link}}
 
 

.github/path-filters.yml

@@ -39,10 +39,11 @@ jobs:
           path: ${{ env.OUTPUT }}
 
   cd_appimage_x86_64:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       ARCH: x86_64
       OUTPUT: endless-sky-x86_64-continuous.AppImage
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
@@ -64,7 +65,7 @@ jobs:
   cd_windows_win64:
     runs-on: windows-latest
     env:
-      DIR_MINGW64: C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\x86_64-w64-mingw32
+      DIR_MINGW64: C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64
       DIR_ESLIB: .\dev64
       OUTPUT: EndlessSky-win64-continuous.zip
       AR: gcc-ar
@@ -89,9 +90,9 @@ jobs:
         run: |
           COPY .\bin\pkgd\release\endless-sky.exe EndlessSky.exe
           COPY ".\dev64\bin\*.dll" .
-          COPY $Env:DIR_MINGW64\lib\libgcc_s_seh-1.dll .
-          COPY $Env:DIR_MINGW64\lib\libstdc++-6.dll .
-          COPY $Env:DIR_MINGW64\lib\libwinpthread-1.dll .
+          COPY $Env:DIR_MINGW64\bin\libgcc_s_seh-1.dll .
+          COPY $Env:DIR_MINGW64\bin\libstdc++-6.dll .
+          COPY $Env:DIR_MINGW64\bin\libwinpthread-1.dll .
           7z a ${{ env.OUTPUT }} .\sounds\ .\images\ .\data\ *.dll license.txt keys.txt icon.png EndlessSky.exe credits.txt copyright changelog
       - name: Upload artifact
         uses: actions/upload-artifact@v2
@@ -109,12 +110,12 @@ jobs:
       - name: Update Homebrew
         run: brew update
       - name: Install dependencies
-        run: brew install libmad libpng jpeg-turbo
+        run: brew install libpng jpeg-turbo
       - name: Restore cached SDL2 framework
         uses: actions/cache@v2
         with:
           path: ${{ env.SDL2_FRAMEWORK }}
-          key: macos-latest-sdl2-${{ hashFiles('utils/fetch_sdl2_framework.sh') }}-${{ hashFiles('.github/workflows/ci.yml', 'EndlessSky.xcodeproj/**') }}
+          key: macos-latest-sdl2-${{ hashFiles('EndlessSky.xcodeproj/**', 'utils/set_dylibs_rpath.sh', 'utils/fetch_sdl2_framework.sh') }}
       - name: Adjust version strings
         run: ./utils/cd_update_versions.sh
         shell: bash