From 50da366d94f6ac0c04104290d9a153103beef87d Mon Sep 17 00:00:00 2001 From: Ivan Mogilko Date: Tue, 14 Jan 2025 17:36:14 +0300 Subject: [PATCH] Updated build version (3.6.1.31 P9) --- CMakeLists.txt | 2 +- Changes.txt | 16 ++++++++++++++++ Common/core/def_version.h | 6 +++--- Compiler/script/cs_parser.cpp | 2 +- Copyright.txt | 2 +- Editor/AGS.Editor/app.manifest | 2 +- Editor/AGS.Types/Properties/AssemblyInfo.cs | 6 +++--- Engine/CMakeLists.txt | 2 +- Windows/Installer/License.txt | 2 +- version.json | 4 ++-- 10 files changed, 30 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bab98e1b38..674b487858f 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.1.30 + VERSION 3.6.1.31 LANGUAGES CXX C) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake") diff --git a/Changes.txt b/Changes.txt index 9bb5c46a161..c43fe8e0105 100644 --- a/Changes.txt +++ b/Changes.txt @@ -1,5 +1,21 @@ REVISION HISTORY ================ +VERSION 3.6.1 - Patch 9, January 2025 + +Editor: + - Fixed dragging an item to a folder in Project Explorer might cause that item to visibly appear + in a wrong folder, if there are folders which name differ only in letter case. + +Engine: + - Fixed Character.Animate() could cause game to error reporting "invalid loop" if this character + was idling at the time, and Character.LockView() was not called prior to Animate(). + - Fixed inventory cursor hotspot (crosshair) not drawn properly over item sprites with alpha. + +OSX: + - Fixed location of global config file: was in game installation directory, now in + "Library/Application Support/uk.co.adventuregamestudio". + + VERSION 3.6.1 - Patch 8, November 2024 Editor: diff --git a/Common/core/def_version.h b/Common/core/def_version.h index 7730074951d..2d9ed148cd2 100644 --- a/Common/core/def_version.h +++ b/Common/core/def_version.h @@ -1,13 +1,13 @@ #ifndef __AGS_CN_CORE__DEFVERSION_H #define __AGS_CN_CORE__DEFVERSION_H -#define ACI_VERSION_STR "3.6.1.30" +#define ACI_VERSION_STR "3.6.1.31" #if defined (RC_INVOKED) // for MSVC resource compiler -#define ACI_VERSION_MSRC_DEF 3,6,1,30 +#define ACI_VERSION_MSRC_DEF 3,6,1,31 #endif #define SPECIAL_VERSION "" -#define ACI_COPYRIGHT_YEARS "2011-2024" +#define ACI_COPYRIGHT_YEARS "2011-2025" #endif // __AGS_CN_CORE__DEFVERSION_H diff --git a/Compiler/script/cs_parser.cpp b/Compiler/script/cs_parser.cpp index 7fc99be2309..ae5fd7b3c96 100644 --- a/Compiler/script/cs_parser.cpp +++ b/Compiler/script/cs_parser.cpp @@ -29,7 +29,7 @@ extern int currentline; -char ccCopyright[]="ScriptCompiler32 v" SCOM_VERSIONSTR " (c) 2000-2007 Chris Jones and 2011-2024 others"; +char ccCopyright[]="ScriptCompiler32 v" SCOM_VERSIONSTR " (c) 2000-2007 Chris Jones and 2011-2025 others"; static char scriptNameBuffer[256]; int evaluate_expression(ccInternalList*,ccCompiledScript*,int,bool insideBracketedDeclaration); diff --git a/Copyright.txt b/Copyright.txt index c64a3651b75..3941cb80fd3 100644 --- a/Copyright.txt +++ b/Copyright.txt @@ -1,5 +1,5 @@ Adventure Game Studio (AGS) -Copyright (c) 1999-2011 Chris Jones and 2011-2024 various contributors. +Copyright (c) 1999-2011 Chris Jones and 2011-2025 various contributors. Adventure Game Studio was created by Chris Jones. Original Linux port by berolinux (http://gitorious.org/ags); additional code by Bernhard Rosenkraenzer and Christian Morales Vega. diff --git a/Editor/AGS.Editor/app.manifest b/Editor/AGS.Editor/app.manifest index a48be5cd636..d6503121a7f 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 523854776db..2a13f612bb2 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 = "November 2024"; + public const string AGS_EDITOR_DATE = "January 2025"; public const string AGS_EDITOR_FRIENDLY_VERSION = "3.6.1"; - public const string AGS_EDITOR_VERSION = "3.6.1.30"; - public const string AGS_EDITOR_COPYRIGHT = "Copyright © 2006-2011 Chris Jones and 2011-2024 others."; + public const string AGS_EDITOR_VERSION = "3.6.1.31"; + public const string AGS_EDITOR_COPYRIGHT = "Copyright © 2006-2011 Chris Jones and 2011-2025 others."; } } diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt index dedb5f93a72..e49a1c93ffc 100644 --- a/Engine/CMakeLists.txt +++ b/Engine/CMakeLists.txt @@ -709,7 +709,7 @@ if (MACOS) MACOSX_BUNDLE_SHORT_VERSION_STRING # CFBundleShortVersionString 1.0.0 MACOSX_BUNDLE_COPYRIGHT # NSHumanReadableCopyright - "Copyright (C) 1999-2011 Chris Jones and 2011-2024 others" + "Copyright (C) 1999-2011 Chris Jones and 2011-2025 others" MACOSX_BUNDLE_INFO_STRING # CFBundleGetInfoString "Created by Adventure Game Studio" ) diff --git a/Windows/Installer/License.txt b/Windows/Installer/License.txt index c132f4f8fa9..e4ba85f603c 100644 --- a/Windows/Installer/License.txt +++ b/Windows/Installer/License.txt @@ -1,5 +1,5 @@ Adventure Game Studio Engine and Tools -Copyright (c) 1999-2011 Chris Jones and 2011-2024 various contributors. +Copyright (c) 1999-2011 Chris Jones and 2011-2025 various contributors. It is recommended that you do not install this to the same folder as any previous versions of AGS, in case you need to go back for some reason. diff --git a/version.json b/version.json index 320081f958d..7b1b9ee4579 100644 --- a/version.json +++ b/version.json @@ -1,7 +1,7 @@ { - "version": "3.6.1.30", + "version": "3.6.1.31", "versionFriendly": "3.6.1", - "versionSp": "P8", + "versionSp": "P9", "versionYear": "2025", "versionMonth": "January", "versionIsBeta": "false",