From c88baec69f4b4436bcc376d2dfdc7654e81834ff Mon Sep 17 00:00:00 2001 From: Dirk Hoffmann Date: Fri, 19 Jan 2024 14:35:22 +0100 Subject: [PATCH] This is vAmiga 2.5b1 --- Emulator/Misc/RegressionTester/RegressionTester.h | 3 +-- Emulator/config.h | 8 ++++---- Resources/Credits.rtf | 14 ++------------ Resources/Info.plist | 2 +- vAmiga.xcodeproj/project.pbxproj | 8 ++++---- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/Emulator/Misc/RegressionTester/RegressionTester.h b/Emulator/Misc/RegressionTester/RegressionTester.h index 39286cd30..cb1eddbcc 100644 --- a/Emulator/Misc/RegressionTester/RegressionTester.h +++ b/Emulator/Misc/RegressionTester/RegressionTester.h @@ -17,7 +17,6 @@ namespace vamiga { class RegressionTester : public SubComponent { - // Pixel area ritten to the test image static constexpr isize X1 = 4 * 0x31; static constexpr isize Y1 = VBLANK_MAX + 1; static constexpr isize X2 = HPIXELS; @@ -28,7 +27,7 @@ class RegressionTester : public SubComponent { // Filename of the test image string dumpTexturePath = "texture"; - // Pixel ares observed by this regression test + // Pixel area which is written to the test image isize x1 = X1; isize y1 = Y1; isize x2 = X2; diff --git a/Emulator/config.h b/Emulator/config.h index f6f1baa64..42fbb4daa 100644 --- a/Emulator/config.h +++ b/Emulator/config.h @@ -15,15 +15,15 @@ // Version number #define VER_MAJOR 2 -#define VER_MINOR 4 +#define VER_MINOR 5 #define VER_SUBMINOR 0 -#define VER_BETA 0 +#define VER_BETA 1 // Snapshot version number #define SNP_MAJOR 2 -#define SNP_MINOR 4 +#define SNP_MINOR 5 #define SNP_SUBMINOR 0 -#define SNP_BETA 0 +#define SNP_BETA 1 // Uncomment this setting in a release build // #define RELEASEBUILD diff --git a/Resources/Credits.rtf b/Resources/Credits.rtf index a6d4168d1..5296c2119 100755 --- a/Resources/Credits.rtf +++ b/Resources/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2580 +{\rtf1\ansi\ansicpg1252\cocoartf2759 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\froman\fcharset0 Times-Roman;\f1\froman\fcharset0 Times-Bold;} {\colortbl;\red255\green255\blue255;\red128\green128\blue128;} {\*\expandedcolortbl;;\csgenericrgb\c50196\c50196\c50196;} @@ -22,18 +22,8 @@ \f0\b0 \cf2 \ WWW: {\field{\*\fldinst{HYPERLINK "https://dirkwhoffmann.github.io/vAmiga"}}{\fldrslt dirkwhoffmann.github.io/vAmiga}} \f1\b \cf0 \ +\pard\tqr\tx2040\tx2235\pardirnatural\partightenfactor0 \f0\b0 \cf2 \ -\pard\tqr\tx880\tx1135\pardirnatural\partightenfactor0 -\cf2 \ -\pard\tqr\tx2040\tx2235\pardirnatural\partightenfactor0 -\cf2 License for the vAmiga base code:\ -\ -This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.\ -\ -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ -\ -Only our own original work is licensed under the terms of the GNU General Public License. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the GNU General Public License. Users and redistributors are hereby requested to verify these conditions and agree upon them.\ -\ \ } \ No newline at end of file diff --git a/Resources/Info.plist b/Resources/Info.plist index 01a1e93a8..a425d31c7 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -156,7 +156,7 @@ NSAppleEventsUsageDescription NSHumanReadableCopyright - Copyright © 2023 Dirk Hoffmann. All rights reserved. + Copyright © 2024 Dirk Hoffmann. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj index bb63b97dc..543034ad8 100644 --- a/vAmiga.xcodeproj/project.pbxproj +++ b/vAmiga.xcodeproj/project.pbxproj @@ -2689,7 +2689,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 230425; + CURRENT_PROJECT_VERSION = 240119; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_APP_SANDBOX = NO; @@ -2709,7 +2709,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5b1; PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2736,7 +2736,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 230425; + CURRENT_PROJECT_VERSION = 240119; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_APP_SANDBOX = NO; @@ -2754,7 +2754,7 @@ ); LLVM_LTO = YES_THIN; MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5b1; PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "";