From: Toni Wilen <twilen@winuae.net>
Date: Thu, 18 Apr 2019 17:19:06 +0000 (+0300)
Subject: 4210b1
X-Git-Tag: 4300~234
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=453f95657233d9ab350620e89b283cab8b16f65e;p=francis%2Fwinuae.git

4210b1
---

diff --git a/include/options.h b/include/options.h
index 035c39f9..ee76df48 100644
--- a/include/options.h
+++ b/include/options.h
@@ -16,7 +16,7 @@
 
 #define UAEMAJOR 4
 #define UAEMINOR 2
-#define UAESUBREV 0
+#define UAESUBREV 1
 
 #define MAX_AMIGADISPLAYS 4
 
diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 3eb44b55..884729f9 100644
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1395,8 +1395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,2,0,0
- PRODUCTVERSION 4,2,0,0
+ FILEVERSION 4,2,1,0
+ PRODUCTVERSION 4,2,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1412,12 +1412,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "4.2.0.0"
+            VALUE "FileVersion", "4.2.1.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2019 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "4.2.0.0"
+            VALUE "ProductVersion", "4.2.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/od-win32/win32.h b/od-win32/win32.h
index cb39d479..30b82bea 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,17 +15,17 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 0
+#define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
-#define LANG_DLL_FULL_VERSION_MATCH 1
+#define LANG_DLL_FULL_VERSION_MATCH 0
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("0")
+#define WINUAEBETA _T("1")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2019, 4, 8)
+#define WINUAEDATE MAKEBD(2019, 4, 18)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 7f6b8549..8322eda6 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,18 @@
 
+
+
+
+- 420b2 "Fixed AGA HAM graphics corruption.." missed one special case. Fixes Alien Breed 3D graphics corruption.
+- Reset/Restart didn't clear uaegfx overlay state.
+- Added uaegfx overlay statefile support.
+- uaegfx statefile restore and hardware sprite mode: mouse cursor image was not restored.
+- Picasso IV and uaegfx YUV422 overlay support fixed (frogger, moovid). Note that scaling is linear, real chip uses interpolation. YUV411 is still untested but I am not sure if it was ever used.
+- New 128k UAE ROM stored statefile didn't restore correctly.
+- Changing accelerator board options (jumpers etc) on the fly didn't do anything.
+- uaedbg chip ram memory allocation fallback to normal chip ram fixed.
+- Updated remaining weird instruction names in disassembler (MOVEP, MOVE USP, MOVE/AND/OR/EOR SR/CCR, memory rotate instructions)
+
+
 4.2.0
 
 Beta 8: