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

SpaceWarp 1.8 #282

Merged
merged 91 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
3da9d60
Update release_nuget.yml
cheese3660 Dec 22, 2023
efe1807
add french localization
MBoutray Dec 24, 2023
4c07ff5
translated AvcDialog/MainText and AvcDialog/MinorText for portuguese
MBoutray Dec 24, 2023
792635c
Merge pull request #279 from MBoutray/dev
jan-bures Dec 24, 2023
a660260
Changed variable to literal "1" in singleChangeDetected loc string
jan-bures Dec 24, 2023
9472362
Plugin constants now use values from swinfo.json
jan-bures Dec 25, 2023
8fb94a1
Start of fixing all SpaceWarp warnings, removes all unused imports an…
jan-bures Dec 26, 2023
7a1d323
Possible fix for both callbacks and the threading issue
cheese3660 Dec 28, 2023
9a76482
Make sure to remove the right delegate
cheese3660 Dec 28, 2023
62c3de4
first bit of C# 12 code :3
cheese3660 Dec 28, 2023
f7218f8
Search for localizations in subfolders
jan-bures Dec 30, 2023
8cea3a6
Reload the language dropdown in Settings in OnInitialized
jan-bures Dec 30, 2023
9349cab
Allow mods to override existing localizations
jan-bures Dec 30, 2023
702ccb4
Merge remote-tracking branch 'origin/dev' into dev
cheese3660 Dec 30, 2023
44fdffd
Constrain the mod saving API to only allow reference types (as non re…
cheese3660 Dec 30, 2023
f759c5b
Removed unneeded imports
jan-bures Dec 30, 2023
77f305e
Patch for localization fallbacks
jan-bures Dec 30, 2023
6ee2443
https://youtu.be/0xyxtzD54rM
jan-bures Dec 31, 2023
c08c5d5
Fixed localization patch
jan-bures Jan 1, 2024
5533fba
Fixed loading of localization overrides
jan-bures Jan 1, 2024
81556db
Fix non-localized main menu buttons changing to "Single Player" after…
jan-bures Jan 1, 2024
afe4242
Fixed SpaceWarp.API.Loading warnings
jan-bures Jan 1, 2024
da9e1d1
Remove LogNone and LogAll methods
jan-bures Jan 1, 2024
19bd97e
Fixed SpaceWarp.API.Logging warnings
jan-bures Jan 1, 2024
af66f9a
Fixed SpaceWarp.API.Lua warnings
jan-bures Jan 1, 2024
2c91322
Reorganized BaseSpaceWarpPlugin, replaced uses of internal ModLogger …
jan-bures Jan 1, 2024
cce1b20
Mark obsolete members of BaseSpaceWarpPlugin
jan-bures Jan 1, 2024
aa9d712
PluginList updates for member visibility and more
jan-bures Jan 1, 2024
5092319
Fixed SpaceWarp.API.Mods warnings
jan-bures Jan 1, 2024
d4b3e0d
Fixed some more SpaceWarp.Core warnings
jan-bures Jan 1, 2024
3ce2765
Fixed SpaceWarp.Backend warnings
jan-bures Jan 1, 2024
151ccb7
Fixed SpaceWarpPlugin warnings
jan-bures Jan 1, 2024
c13d602
PluginRegister refactoring
jan-bures Jan 1, 2024
48a389b
SpaceWarp.API refactoring
jan-bures Jan 1, 2024
1e1bcfc
Fixed SpaceWarp.Modules warnings
jan-bures Jan 1, 2024
c40e336
SpaceWarp.Patching refactoring
jan-bures Jan 1, 2024
d84cbba
LocalizationHelper for language source adding
jan-bures Jan 1, 2024
cb1edb1
Fixed SpaceWarp.Patching warnings
jan-bures Jan 1, 2024
c512883
Fixed SpaceWarp.Game warnings
jan-bures Jan 1, 2024
a522ec0
Fixed SpaceWarp.Messaging warnings
jan-bures Jan 1, 2024
4a4bfa9
Fixed SpaceWarp.Sound warnings
jan-bures Jan 1, 2024
9ddc823
Fixed SpaceWarp.VersionChecking warnings
jan-bures Jan 1, 2024
2ef92ac
Fixed SpaceWarp assembly warnings
jan-bures Jan 1, 2024
24428d1
Fixed SpaceWarpPatcher warnings
jan-bures Jan 1, 2024
9510df8
Fixed SpaceWarpTest warnings
jan-bures Jan 1, 2024
9a4d94b
Fixed SpaceWarp.UI warnings
jan-bures Jan 2, 2024
49354d0
Update release_nuget.yml
cheese3660 Jan 2, 2024
e99b3da
Update release_nuget.yml
cheese3660 Jan 2, 2024
a884e9b
Add missing space
cheese3660 Jan 2, 2024
e54e4c7
Updated logging to use new wrapper API
jan-bures Jan 2, 2024
a2ca148
Replace obsolete LogEntry override (that doesn't even seem to be doin…
jan-bures Jan 2, 2024
982ef2d
Merge remote-tracking branch 'origin/dev' into dev
jan-bures Jan 2, 2024
d1981da
Remove unused member in UI module
jan-bures Jan 2, 2024
d13c440
Update release_nuget.yml
cheese3660 Jan 3, 2024
08c6a0c
Added preloader and restarter
jan-bures Jan 4, 2024
a86a02f
Fix dropdowns from bepinex configs
cheese3660 Jan 4, 2024
f69b236
Merge remote-tracking branch 'origin/dev' into dev
cheese3660 Jan 4, 2024
26df719
Fix KeyNotFoundException
cheese3660 Jan 4, 2024
99b2e46
Completely fix dropdowns and sliders again
cheese3660 Jan 4, 2024
e2c5cea
Fully working preloader (hopefully)
jan-bures Jan 4, 2024
ef9b9c3
Merge remote-tracking branch 'origin/dev' into dev
jan-bures Jan 4, 2024
0844f5e
Merge pull request #280 from SpaceWarpDev/preload-and-restart
jan-bures Jan 4, 2024
43b84dd
Fixed restarter project name
jan-bures Jan 4, 2024
b8060bb
Merge branch 'preload-and-restart' into dev
jan-bures Jan 4, 2024
1acee62
Merge remote-tracking branch 'origin/dev' into dev
jan-bures Jan 4, 2024
c96ef0a
Removed Configuration Manager
jan-bures Jan 5, 2024
1f8b069
Integrated SpaceWarpUI Unity project
jan-bures Jan 5, 2024
b7f821a
Update UI for 1.8
jan-bures Jan 5, 2024
3562ab3
Added automated run of tests to workflow
EwyBoy Jan 5, 2024
76b1da7
Added a simple semanticVersion to string test
EwyBoy Jan 5, 2024
e34acc3
Run tests before build & exit the workflow
EwyBoy Jan 5, 2024
55f77fd
Pushing a test that fails to test if the workflow also fails
EwyBoy Jan 5, 2024
4d8b50b
Success! Removing the intentional failed test
EwyBoy Jan 5, 2024
2562320
Fix double load issue
cheese3660 Jan 6, 2024
f10909d
progress on the Restarter.cs
Rexicon226 Jan 8, 2024
61cf8da
Changed restarter to target net471, use Win32 API to invoke it
jan-bures Jan 9, 2024
2911f2f
Add a middle step where the restarter is started from a bat file
jan-bures Jan 9, 2024
5f4e92f
Finally working restarter
jan-bures Jan 10, 2024
d33c1d7
Moved MainMenuPatcher to correct namespace, fixed typo
jan-bures Jan 10, 2024
e421ad5
Open mod settings from mod list
jan-bures Jan 10, 2024
7c39cc1
Removed preloader
jan-bures Jan 11, 2024
583518f
SpaceWarpPatcher reorganized (into the first Galactic Empire)
jan-bures Jan 11, 2024
f923894
Renamed SpaceWarp.Patcher
jan-bures Jan 11, 2024
639dcbe
Removed preloader from post-build events and doorstop config
jan-bures Jan 11, 2024
59bdd47
Patcher API implementation (with a bug)
jan-bures Jan 11, 2024
430dff3
Move the disabled check to a method instead of a delegate
cheese3660 Jan 12, 2024
76f0bb1
Don't auto apply harmony patches for modules
cheese3660 Jan 12, 2024
9c7f7a6
Use spacedock upload action
cheese3660 Jan 12, 2024
0dda6f2
Removed unnecessary stuff
jan-bures Jan 12, 2024
64ac3ef
Create custom loggers for patchers
jan-bures Jan 12, 2024
50aed07
Merge remote-tracking branch 'origin/dev' into dev
jan-bures Jan 12, 2024
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
9 changes: 9 additions & 0 deletions .github/workflows/build_spacewarp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@ jobs:
run: |
sudo curl -o /usr/local/bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe

- name: Running automated tests
run: |
dotnet test "SpaceWarp.sln"
test_exit_code=$?
if [ $test_exit_code -ne 0 ]; then
echo "Tests failed. Cancelling the build."
exit $test_exit_code
fi

- name: Build the solution
run: dotnet build "SpaceWarp.sln" -c Release

Expand Down
20 changes: 18 additions & 2 deletions .github/workflows/release_nuget.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
name: Publish NuGet Package
env:
MOD_ID: 3277
KSP2_ID: 22407

on:
release:
Expand All @@ -7,7 +10,7 @@ on:
jobs:
publish:
runs-on: ubuntu-latest

permissions: write-all
steps:
- name: Check out repository
uses: actions/checkout@v3
Expand All @@ -32,6 +35,7 @@ jobs:
echo "artifact_name=spacewarp-release-$version.zip" >> $GITHUB_ENV
echo "zip=$(ls -1 dist/SpaceWarp-*.zip | head -n 1)" >> $GITHUB_ENV
echo "upload_url=$(wget -qO- https://api.github.com/repos/$GITHUB_REPOSITORY/releases | jq '.[0].upload_url' | tr -d \")" >> $GITHUB_ENV
wget -qO- https://api.github.com/repos/$GITHUB_REPOSITORY/releases | jq -r '.[0].body' > ./changelog.md

- name: Check if version exists
id: check-version
Expand All @@ -41,7 +45,6 @@ jobs:
exists=$(echo "$response" | jq -r --arg id "SpaceWarp" --arg version "$version" '.data[] | select(.id == $id) | .versions[] | select(.version == $version) | .version')
if [ "$exists" == "$version" ]; then
echo "Version $version already exists in the NuGet repository"
exit 1
else
echo "Version $version does not exist in the NuGet repository"
echo "should_publish=true" >> $GITHUB_ENV
Expand All @@ -62,4 +65,17 @@ jobs:
asset_path: ${{ env.zip }}
asset_name: ${{ env.artifact_name }}
asset_content_type: application/zip

- name: Add Mask
run: echo "::add-mask::${{ secrets.SPACEDOCK_PASSWORD }}"

- name: Update spacedock
uses: KSP2Community/[email protected]
with:
username: ${{ secrets.SPACEDOCK_USER }}
password: ${{ secrets.SPACEDOCK_PASSWORD }}
game_id: 22407
mod_id: 3277
version: ${{ env.version }}
zipball: ${{ env.zip }}
changelog: ./changelog.md
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ StyleCopReport.xml
*_p.c
*_h.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
Expand Down
11 changes: 7 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
<ModulesObjPath>$(SolutionDir)build/obj/modules/$(Configuration)</ModulesObjPath>
<PatcherBinPath>$(SolutionDir)build/bin/patcher/$(Configuration)</PatcherBinPath>
<PatcherObjPath>$(SolutionDir)build/obj/patcher/$(Configuration)</PatcherObjPath>
<RestarterBinPath>$(SolutionDir)build/bin/restarter/$(Configuration)</RestarterBinPath>
<RestarterObjPath>$(SolutionDir)build/obj/restarter/$(Configuration)</RestarterObjPath>
<RestarterDistPath>$(SolutionDir)dist/$(Configuration)/BepInEx/plugins/SpaceWarp/restarter</RestarterDistPath>
<BaseOutputPath>$(ModulesBinPath)/$(MSBuildProjectName)</BaseOutputPath>
<BaseIntermediateOutputPath>$(ModulesObjPath)/$(MSBuildProjectName)</BaseIntermediateOutputPath>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
Expand Down Expand Up @@ -56,9 +59,9 @@
<Description>@(Swinfo -> '%(description)')</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>@(Swinfo -> '%(source)')</RepositoryUrl>
<BepInExPluginGuid>$(ModId)</BepInExPluginGuid>
<BepInExPluginName>$(Product)</BepInExPluginName>
<BepInExPluginVersion>$(Version)</BepInExPluginVersion>
<SpaceWarpPluginGuid>$(ModId)</SpaceWarpPluginGuid>
<SpaceWarpPluginName>$(Product)</SpaceWarpPluginName>
<SpaceWarpPluginVersion>$(Version)</SpaceWarpPluginVersion>
</PropertyGroup>
</Target>
</Project>
</Project>
22 changes: 21 additions & 1 deletion SpaceWarp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarp.Game", "src/Space
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarp.Messaging", "src/SpaceWarp.Messaging/SpaceWarp.Messaging.csproj", "{66BA4E01-8521-42EB-9D7D-8EB653757177}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarpRestarter", "src\SpaceWarpRestarter\SpaceWarpRestarter.csproj", "{4B509D31-4C02-4D6E-8508-8417F0745776}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarp.Sound", "src/SpaceWarp.Sound/SpaceWarp.Sound.csproj", "{BA439A24-7EA3-4E79-A44C-1FA303B9331C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarp.UI", "src/SpaceWarp.UI/SpaceWarp.UI.csproj", "{CB131B63-51E6-4ED7-A47C-28B1EB65B8D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarp.VersionChecking", "src/SpaceWarp.VersionChecking/SpaceWarp.VersionChecking.csproj", "{6B76C415-5BC2-4AB0-8862-760D9DC8F485}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarpPatcher", "src/SpaceWarpPatcher/SpaceWarpPatcher.csproj", "{2EF642D0-F66D-461C-A5B0-953E39307B76}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarp.Preload", "src\SpaceWarp.Preload\SpaceWarp.Preload.csproj", "{2EF642D0-F66D-461C-A5B0-953E39307B76}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarpTest", "src/SpaceWarpTest/SpaceWarpTest.csproj", "{8DB42693-9177-40B9-AC6A-B6D7A4823FAD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWarp.Patches", "src\SpaceWarp.Patches\SpaceWarp.Patches.csproj", "{88F73A97-3D47-4ED3-8381-177EED4451AC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -98,6 +102,22 @@ Global
{8DB42693-9177-40B9-AC6A-B6D7A4823FAD}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
{8DB42693-9177-40B9-AC6A-B6D7A4823FAD}.DeployAndRun|Any CPU.ActiveCfg = DeployAndRun|Any CPU
{8DB42693-9177-40B9-AC6A-B6D7A4823FAD}.DeployAndRun|Any CPU.Build.0 = DeployAndRun|Any CPU
{4B509D31-4C02-4D6E-8508-8417F0745776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B509D31-4C02-4D6E-8508-8417F0745776}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B509D31-4C02-4D6E-8508-8417F0745776}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B509D31-4C02-4D6E-8508-8417F0745776}.Release|Any CPU.Build.0 = Release|Any CPU
{4B509D31-4C02-4D6E-8508-8417F0745776}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
{4B509D31-4C02-4D6E-8508-8417F0745776}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
{4B509D31-4C02-4D6E-8508-8417F0745776}.DeployAndRun|Any CPU.ActiveCfg = DeployAndRun|Any CPU
{4B509D31-4C02-4D6E-8508-8417F0745776}.DeployAndRun|Any CPU.Build.0 = DeployAndRun|Any CPU
{88F73A97-3D47-4ED3-8381-177EED4451AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{88F73A97-3D47-4ED3-8381-177EED4451AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88F73A97-3D47-4ED3-8381-177EED4451AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{88F73A97-3D47-4ED3-8381-177EED4451AC}.Release|Any CPU.Build.0 = Release|Any CPU
{88F73A97-3D47-4ED3-8381-177EED4451AC}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
{88F73A97-3D47-4ED3-8381-177EED4451AC}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
{88F73A97-3D47-4ED3-8381-177EED4451AC}.DeployAndRun|Any CPU.ActiveCfg = DeployAndRun|Any CPU
{88F73A97-3D47-4ED3-8381-177EED4451AC}.DeployAndRun|Any CPU.Build.0 = DeployAndRun|Any CPU
EndGlobalSection
EndGlobal

Binary file not shown.

This file was deleted.

Loading