diff --git a/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj b/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj index de27e0f0..3c485dd2 100644 --- a/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj +++ b/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj @@ -2,7 +2,7 @@ netstandard2.1 - 10.6.10 + 10.7.0 Robert Schneckenhaus OpenAL audio interface implementation for Ambermoon https://github.com/Pyrdacor/Ambermoon.net diff --git a/Ambermoon.Common/Ambermoon.Common.csproj b/Ambermoon.Common/Ambermoon.Common.csproj index 0fb7d8d4..82e53831 100644 --- a/Ambermoon.Common/Ambermoon.Common.csproj +++ b/Ambermoon.Common/Ambermoon.Common.csproj @@ -8,7 +8,7 @@ Github Library that contains basic stuff for other Ambermoon libraries. true - 10.6.12 + 10.7.0 https://github.com/Pyrdacor/Ambermoon.net Ambermoon Debug;Release;DebugAndroid diff --git a/Ambermoon.Core/Ambermoon.Core.csproj b/Ambermoon.Core/Ambermoon.Core.csproj index d0252717..23a1970a 100644 --- a/Ambermoon.Core/Ambermoon.Core.csproj +++ b/Ambermoon.Core/Ambermoon.Core.csproj @@ -4,7 +4,7 @@ 8 Ambermoon 5ff861f6-0255-427a-978a-7a8030ee8731 - 10.6.10 + 10.7.0 Robert Schneckenhaus https://github.com/Pyrdacor/Ambermoon.net https://github.com/Pyrdacor/Ambermoon.net diff --git a/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj b/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj index 15a979ac..161edf1c 100644 --- a/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj +++ b/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj @@ -10,7 +10,7 @@ Github Ambermoon Amiga true - 10.6.21 + 10.7.0 Debug;Release;DebugAndroid diff --git a/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj b/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj index 24fab8d6..a12a050f 100644 --- a/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj +++ b/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj @@ -10,7 +10,7 @@ Github Ambermoon true - 10.6.10 + 10.7.0 485e4790-32fd-45f1-b729-c5ca93ba0fad Debug;Release;DebugAndroid diff --git a/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj b/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj index 9aaeec2d..0dab14f5 100644 --- a/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj +++ b/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj @@ -10,7 +10,7 @@ Github Ambermoon Legacy Amiga Game Data true - 10.6.24 + 10.7.0 true Debug;Release;DebugAndroid diff --git a/Ambermoon.Data.Pyrdacor/Ambermoon.Data.Pyrdacor.csproj b/Ambermoon.Data.Pyrdacor/Ambermoon.Data.Pyrdacor.csproj index 81bd78bb..68802625 100644 --- a/Ambermoon.Data.Pyrdacor/Ambermoon.Data.Pyrdacor.csproj +++ b/Ambermoon.Data.Pyrdacor/Ambermoon.Data.Pyrdacor.csproj @@ -6,7 +6,7 @@ enable True Debug;Release;DebugAndroid - 10.6.10 + 10.7.0 diff --git a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj index 6cb6cf3a..6325a6ca 100644 --- a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj +++ b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj @@ -19,7 +19,7 @@ true - 10.6.10 + 10.7.0 Robert Schneckenhaus OpenGL render interface implementation for Ambermoon https://github.com/Pyrdacor/Ambermoon.net diff --git a/Ambermoon.net/Ambermoon.net.csproj b/Ambermoon.net/Ambermoon.net.csproj index 9c3e7c51..c26dd5af 100644 --- a/Ambermoon.net/Ambermoon.net.csproj +++ b/Ambermoon.net/Ambermoon.net.csproj @@ -5,7 +5,7 @@ net6.0 Ambermoon win-x86;win-x64;linux-x64;linux-arm64;osx-x64;osx-arm64 - 1.6.10 + 1.7.0 Copyright (C) 2020-2021 by Robert Schneckenhaus Robert Schneckenhaus Robert Schneckenhaus diff --git a/Ambermoon.net/Mac/Ambermoon.net.app/Contents/Info.plist b/Ambermoon.net/Mac/Ambermoon.net.app/Contents/Info.plist index 05f7494d..2613dd62 100644 --- a/Ambermoon.net/Mac/Ambermoon.net.app/Contents/Info.plist +++ b/Ambermoon.net/Mac/Ambermoon.net.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleName Ambermoon.net CFBundleVersion - 1.6.10 + 1.7.0 CFBundleIconFile Ambermoon.icns CFBundleIdentifier diff --git a/AmbermoonAdditionalDataLoader/AmbermoonAdditionalDataLoader.csproj b/AmbermoonAdditionalDataLoader/AmbermoonAdditionalDataLoader.csproj index 28bf8b6a..33f3c211 100644 --- a/AmbermoonAdditionalDataLoader/AmbermoonAdditionalDataLoader.csproj +++ b/AmbermoonAdditionalDataLoader/AmbermoonAdditionalDataLoader.csproj @@ -2,7 +2,7 @@ net6.0 - 10.6.10 + 10.7.0 enable enable diff --git a/AmbermoonPatcher/AmbermoonPatcher.csproj b/AmbermoonPatcher/AmbermoonPatcher.csproj index 3453b190..e989c184 100644 --- a/AmbermoonPatcher/AmbermoonPatcher.csproj +++ b/AmbermoonPatcher/AmbermoonPatcher.csproj @@ -7,7 +7,7 @@ enable enable true - 10.6.10 + 1.7.0 diff --git a/Package/changelog.txt b/Package/changelog.txt index e79e7ef4..fd9a3c94 100644 --- a/Package/changelog.txt +++ b/Package/changelog.txt @@ -1,3 +1,21 @@ +Version 1.7 +=========== + +- Fixed loading of game data from ADFs with new game format (1.14+ English, 1.13+ German) +- Status symbols are now instantly removed when a spell is cast which removes the condition +- Added the implementation for the spell Stone to Flesh +- Added healing animation for spells Heal Aging and Stop Aging +- Fixed a crash when unequipping some items in combat +- Fixed monster damage/defense display for spell "Monster Knowledge" +- Fixed a bug where the num pad and esc keys could be used during scroll texts in doors or chests +- Fixed a bug when moving with keys and using the speak function (infinite turning) +- When fleeing a fight but the last player in battle dies, the 'pick leader' popup shows now up after leaving the battle (no more occasions where no party member is selected and lead to other issues) +- Improved initial resolution to fit on the screen (especially for 16:9 monitors) +- Check resolution on each startup to fit on screen if the monitor configuration was changed +- Ensure window is visible on the monitor and the title bar is visible (on startup or leaving fullscreen) +- Integrated original version 1.16 + + Version 1.6 =========== diff --git a/Package/readme.txt b/Package/readme.txt index b771dc1b..3e7699b3 100644 --- a/Package/readme.txt +++ b/Package/readme.txt @@ -7,7 +7,7 @@ ------------------------------------------------------------------ - | Ambermoon rewrite by Pyrdacor - Version 1.6.10 - June 2022 | + | Ambermoon rewrite by Pyrdacor - Version 1.7.0 - July 2022 | ------------------------------------------------------------------ diff --git a/build-arm64.sh b/build-arm64.sh index 73b8becb..17d07f69 100644 --- a/build-arm64.sh +++ b/build-arm64.sh @@ -1,8 +1,9 @@ mkdir publish-arm64 -cp versions.dat publish-arm64 -dotnet publish -c Release ./Ambermoon.net/Ambermoon.net.csproj -p:PublishSingleFile=true -r linux-arm64 --nologo --self-contained -o ./publish-arm64 -dotnet publish -c Release ./Ambermoon.ConcatFiles/Ambermoon.ConcatFiles.csproj -p:PublishSingleFile=true -r linux-arm64 -o ./publish-arm64 -cd publish-arm64 -./Ambermoon.ConcatFiles ./versions.dat ./Ambermoon.net +copy versions.dat publish-arm64 +dotnet publish -c Debug ./Ambermoon.ConcatFiles/Ambermoon.ConcatFiles.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r linux-x64 --nologo --self-contained -o ./publish-arm64 +dotnet publish -c Debug ./Ambermoon.net/Ambermoon.net.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r linux-arm64 --nologo --self-contained -o ./publish-arm64 +dotnet publish -c Debug ./AmbermoonPatcher/AmbermoonPatcher.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r linux-arm64 --nologo --self-contained -o ./publish-arm64 +cd publish-v +Ambermoon.ConcatFiles versions versions.dat patcher AmbermoonPatcher Ambermoon.net rm ./versions.dat rm ./Ambermoon.ConcatFiles \ No newline at end of file diff --git a/build-linux.sh b/build-linux.sh new file mode 100644 index 00000000..57ca3d90 --- /dev/null +++ b/build-linux.sh @@ -0,0 +1,9 @@ +mkdir publish-linux +copy versions.dat publish-linux +dotnet publish -c Debug ./Ambermoon.ConcatFiles/Ambermoon.ConcatFiles.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r linux-x64 --nologo --self-contained -o ./publish-linux +dotnet publish -c Debug ./Ambermoon.net/Ambermoon.net.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r linux-x64 --nologo --self-contained -o ./publish-linux +dotnet publish -c Debug ./AmbermoonPatcher/AmbermoonPatcher.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r linux-x64 --nologo --self-contained -o ./publish-linux +cd publish-v +Ambermoon.ConcatFiles versions versions.dat patcher AmbermoonPatcher Ambermoon.net +rm ./versions.dat +rm ./Ambermoon.ConcatFiles \ No newline at end of file diff --git a/build-win64.cmd b/build-win64.cmd index 90208cd9..7e86e67f 100644 --- a/build-win64.cmd +++ b/build-win64.cmd @@ -6,3 +6,4 @@ dotnet publish -c Debug ./AmbermoonPatcher/AmbermoonPatcher.csproj -p:PublishSin cd publish-win64 Ambermoon.ConcatFiles.exe versions versions.dat patcher AmbermoonPatcher.exe Ambermoon.net.exe rm ./versions.dat +rm ./Ambermoon.ConcatFiles.exe diff --git a/versions.dat b/versions.dat index 9fcb7961..65bc8571 100644 Binary files a/versions.dat and b/versions.dat differ