diff --git a/CMakeLists.txt b/CMakeLists.txt index 02ab8bc8c5..21702beb8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/CMake/cxx_fla set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") project(AGS - VERSION 3.6.0.48 + VERSION 3.6.0.49 LANGUAGES CXX C) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake") diff --git a/Changes.txt b/Changes.txt index a3b7cd5f03..3d770a9200 100644 --- a/Changes.txt +++ b/Changes.txt @@ -1,5 +1,30 @@ REVISION HISTORY ================ +VERSION 3.6.0 - Patch 2, June 2023 + +Common: + - Fixed a TTF font could cause a crash in the Editor or the Engine if the font renderer tries + to draw a letter with higher number than the highest glyph number in the font. + +Editor: + - Added "Restore all sprites..." command to the Sprite Manager's context menu + (this duplicates the "File -> Recreate sprite file" menu command added previously). + - Refresh Sprite Manager after fully recreating a sprite file. + - Sprites will now hide their "Resolution" property if the game settings have "Allow relative + asset resolutions" disabled. This is to avoid user's misuse of this property. + - Fixed a minor memory leak occuring when editing a tree item's label in Project Explorer. + +Engine: + - Engine will now find and load plugins in the game dir when run from a different location. + - Fixed crash occuring if Character was told to FaceLocation while "Turn to face" game + setting is enabled, and character's View does not have enough loops. + - Fixed Character resetting current non-blocking animation if it was ordered to Move, + as soon as it arrives at destination. + - Fixed crash occuring if a GUI button was somehow set a negative NormalImage number. + - Fixed "bad script stack" error could be sometimes displayed if the game was aborted in + the middle of running a script. + + VERSION 3.6.0 - Patch 1, May 2023 Editor: diff --git a/Common/core/def_version.h b/Common/core/def_version.h index f3182a78ac..c0a87e62b1 100644 --- a/Common/core/def_version.h +++ b/Common/core/def_version.h @@ -1,9 +1,9 @@ #ifndef __AGS_CN_CORE__DEFVERSION_H #define __AGS_CN_CORE__DEFVERSION_H -#define ACI_VERSION_STR "3.6.0.48" +#define ACI_VERSION_STR "3.6.0.49" #if defined (RC_INVOKED) // for MSVC resource compiler -#define ACI_VERSION_MSRC_DEF 3,6,0,48 +#define ACI_VERSION_MSRC_DEF 3,6,0,49 #endif #define SPECIAL_VERSION "" diff --git a/Editor/AGS.Editor/app.manifest b/Editor/AGS.Editor/app.manifest index e923fbfc71..f7ae2705f0 100644 --- a/Editor/AGS.Editor/app.manifest +++ b/Editor/AGS.Editor/app.manifest @@ -1,6 +1,6 @@  - + diff --git a/Editor/AGS.Types/Properties/AssemblyInfo.cs b/Editor/AGS.Types/Properties/AssemblyInfo.cs index 8ad3fcb639..8effe4deec 100644 --- a/Editor/AGS.Types/Properties/AssemblyInfo.cs +++ b/Editor/AGS.Types/Properties/AssemblyInfo.cs @@ -22,9 +22,9 @@ namespace AGS.Types public class Version { public static readonly bool IS_BETA_VERSION = false; - public const string AGS_EDITOR_DATE = "May 2023"; + public const string AGS_EDITOR_DATE = "June 2023"; public const string AGS_EDITOR_FRIENDLY_VERSION = "3.6.0"; - public const string AGS_EDITOR_VERSION = "3.6.0.48"; + public const string AGS_EDITOR_VERSION = "3.6.0.49"; public const string AGS_EDITOR_COPYRIGHT = "Copyright © 2006-2011 Chris Jones and 2011-2023 others."; } } diff --git a/version.json b/version.json index 6254073a20..2182753c89 100644 --- a/version.json +++ b/version.json @@ -1,9 +1,9 @@ { - "version": "3.6.0.48", + "version": "3.6.0.49", "versionFriendly": "3.6.0", - "versionSp": "P1", + "versionSp": "P2", "versionYear": "2023", - "versionMonth": "May", + "versionMonth": "June", "versionIsBeta": "false", "appID": "a4d6de0f-18b0-4aae-9338-86a333563b98" } \ No newline at end of file