diff --git a/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj b/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj index 5b71e29d..318071ac 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.6 + 10.6.7 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 e1413235..24858460 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.6 + 10.6.7 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 6d6b6e16..a7e7e43b 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.6 + 10.6.7 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 c0e8a397..abcb1f37 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.14 + 10.6.15 Debug;Release;DebugAndroid diff --git a/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj b/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj index c54010b0..8c59e325 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.6 + 10.6.7 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 32807287..69f337d2 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.17 + 10.6.18 true Debug;Release;DebugAndroid diff --git a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj index 4453050f..028b6897 100644 --- a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj +++ b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj @@ -19,7 +19,7 @@ true - 10.6.6 + 10.6.7 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 547cb12a..4afe0f96 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.6 + 1.6.7 Copyright (C) 2020-2021 by Robert Schneckenhaus Robert Schneckenhaus Robert Schneckenhaus diff --git a/Package/changelog.txt b/Package/changelog.txt index aef2c6cd..c1e7c03c 100644 --- a/Package/changelog.txt +++ b/Package/changelog.txt @@ -1,11 +1,3 @@ -Version 1.7 -=========== - -- Fixed an issue where the "wanna fight" popup occurs after teleporting -- Monsters will now advance if there are more than 1 players and the 4th row is empty -- Fixed some conversation event chains that ended with texts or rewards - - Version 1.6 =========== @@ -17,6 +9,7 @@ Features - Added shortcuts to toggle music (Ctrl+M) and change volume (Ctrl+Comma or Ctrl+Period) - Music is now streamed and there is no music cache needed anymore - External music is now also recognized if the filename only starts with the song number +- The window position and active monitor are now memorized in the config Fixes @@ -39,6 +32,11 @@ Fixes - After game over and loading a new game the music is no longer started twice - Fixed a game freeze when some spells were casted - Fixed broken input after right-clicking some messages in places like the blacksmith +- Fixed an issue where the "wanna fight" popup occurs after teleporting +- Monsters will now advance if there are more than 1 players and the 4th row is empty +- Fixed some conversation event chains that ended with texts or rewards +- Fixed an issue when loading a game on the world map. Sometimes the wrong tile was used as the player tile so that swimming was active on normal tiles, etc. +- Improved map event triggering so that some events are not only triggered once (e.g. the oasis heal effect) - Some minor fixes diff --git a/Package/readme.txt b/Package/readme.txt index 4da49ca0..5a90dfd6 100644 --- a/Package/readme.txt +++ b/Package/readme.txt @@ -7,7 +7,7 @@ ------------------------------------------------------------------ - | Ambermoon rewrite by Pyrdacor - Version 1.6.6 - June 2022 | + | Ambermoon rewrite by Pyrdacor - Version 1.6.7 - June 2022 | ------------------------------------------------------------------ diff --git a/appveyor.yml b/appveyor.yml index 3cc855df..1a2ba9a8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ environment: configuration: Release - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu configuration: Release - - APPVEYOR_BUILD_WORKER_IMAGE: macOS + - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey configuration: Release platform: Any CPU diff --git a/publish.ps1 b/publish.ps1 index 88b7c987..dd135c2d 100644 --- a/publish.ps1 +++ b/publish.ps1 @@ -33,6 +33,7 @@ if ($isWindows) { cp -r ./Package/* ./bundle/Ambermoon.net/Ambermoon.net.app/Contents/MacOS/ 7z a Ambermoon.net-Mac.zip ./bundle/Ambermoon.net/ -mx9 Start-Process -FilePath "./Ambermoon.ConcatFiles/bin/Any CPU/Release/netcoreapp3.1/osx-x64/publish/Ambermoon.ConcatFiles" -Wait -WorkingDirectory . -ArgumentList '"./versions.dat"','"./Ambermoon.net/bin/Any CPU/Release/net6.0/osx-arm64/publish/Ambermoon.net"' + rm ./bundle/Ambermoon.net/Ambermoon.net.app/Contents/MacOS/Ambermoon.net cp "./Ambermoon.net/bin/Any CPU/Release/net6.0/osx-arm64/publish/Ambermoon.net" ./bundle/Ambermoon.net/Ambermoon.net.app/Contents/MacOS/ 7z a Ambermoon.net-Mac-ARM.zip ./bundle/Ambermoon.net/ -mx9 }