FS-UAE 2.4.0

FrodeSolheim · Feb 16, 2014 · a4b478d · a4b478d
1 parent e3fb5cb
commit a4b478d
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 26 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,25 @@
+Version 2.4.0 / 2.3.99rc2:
+
+* (Launcher) Windows portable version didn't store relative paths.
+* (Launcher) Properly locate A500 kickstart on first startup when it exists.
+
+Version 2.3.99rc1:
+
+* (Launcher) Don't refresh the online database when running the file scanner.
+* (Launcher) Game database changes for better forward compatibility.
+
 Version 2.3.99beta3:
 
 * FS-UAE can use 256 kB chip RAM (and also 128 if you *really* want to).
-* Updated translations: es [albconde].
+* Updated translations: es [albconde], da [tomse], nb.
 * (Launcher) Fixed multiple file selection when using PyQt.
 * (Launcher) Added 256 kB chip RAM to the chip memory selector.
-* (Launcher) Updated translations: de [jbl007], es [albconde].
+* (Launcher) Updated translations: de [jbl007], es [albconde],
+  it [Speedvicio], da [tomse], nb.
+* (Launcher) Fixed bug where the launcher tries to sync with online DB after
+  logging out from OAGD.net.
+* (Arcade) Fixed missing ext rom problem when starting CD32 games.
+* (Arcade) Fixed repeat problem when navigating with joystick hats.
 
 Version 2.3.99beta2:
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.3.99beta2
+2.4.0
diff --git a/libfsemu/src/emu/netplay.c b/libfsemu/src/emu/netplay.c
@@ -76,8 +76,8 @@ int g_fs_emu_netplay_connected = 0;
 
 // FIXME: move to emulator
 static int g_fs_emu_netplay_emulation_version_major = 2;
-static int g_fs_emu_netplay_emulation_version_minor = 3;
-static int g_fs_emu_netplay_emulation_version_revision = 3;
+static int g_fs_emu_netplay_emulation_version_minor = 4;
+static int g_fs_emu_netplay_emulation_version_revision = 0;
 
 #define TCP
 

diff --git a/po/da.po b/po/da.po
@@ -6,17 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fs-uae\n"
-"Report-Msgid-Bugs-To: fs-uae@fengestad.no\n"
-"POT-Creation-Date: 2013-10-26 16:16+0200\n"
-"PO-Revision-Date: 2013-10-26 16:38+0100\n"
+"Report-Msgid-Bugs-To: frode@fs-uae.net\n"
+"POT-Creation-Date: 2014-01-27 23:59+0100\n"
+"PO-Revision-Date: 2014-02-07 11:34+0100\n"
 "Last-Translator: Carsten Jensen <[email protected]>\n"
 "Language-Team: Danish\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.3\n"
 
 msgid "Activated debugger"
 msgstr "Aktiveret debugger"
@@ -138,6 +138,9 @@ msgstr "Tastatur"
 msgid "Load"
 msgstr "Indlæs"
 
+msgid "Load State"
+msgstr "Indlæs tilstand"
+
 msgid "More..."
 msgstr "Mere..."
 
@@ -212,8 +215,8 @@ msgstr "Genoptag"
 msgid "Save"
 msgstr "Gem"
 
-msgid "Savestates"
-msgstr "Gemmestadier"
+msgid "Save State"
+msgstr "Gem tilstand"
 
 #. / TRANSLATORS: Soft reset reboots the computer without a power cycle
 msgid "Soft Reset"
@@ -235,3 +238,6 @@ msgstr "Zoom: %s"
 #, c-format
 msgid "Zoom: %s + Border"
 msgstr "Zoom: %s + skærmkant"
+
+#~ msgid "Savestates"
+#~ msgstr "Gemmestadier"
diff --git a/po/nb.po b/po/nb.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fs-uae\n"
-"Report-Msgid-Bugs-To: fs-uae@fengestad.no\n"
-"POT-Creation-Date: 2013-11-14 19:40+0100\n"
-"PO-Revision-Date: 2013-11-14 19:44+0100\n"
+"Report-Msgid-Bugs-To: frode@fs-uae.net\n"
+"POT-Creation-Date: 2014-02-09 21:54+0100\n"
+"PO-Revision-Date: 2014-02-09 21:55+0100\n"
 "Last-Translator: Frode Solheim <[email protected]>\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb\n"
@@ -138,6 +138,9 @@ msgstr "Tastatur"
 msgid "Load"
 msgstr "Last inn"
 
+msgid "Load State"
+msgstr "Åpne tilstand"
+
 msgid "More..."
 msgstr "Mer..."
 
@@ -212,8 +215,8 @@ msgstr "Fortsett"
 msgid "Save"
 msgstr "Lagre"
 
-msgid "Savestates"
-msgstr "Lagrede tilstander"
+msgid "Save State"
+msgstr "Lagre tilstand"
 
 #. / TRANSLATORS: Soft reset reboots the computer without a power cycle
 msgid "Soft Reset"
@@ -256,3 +259,6 @@ msgstr "Zoom: %s + ramme"
 
 #~ msgid "Save States"
 #~ msgstr "Lagrede tilstander"
+
+#~ msgid "Savestates"
+#~ msgstr "Lagrede tilstander"
diff --git a/share/fs-uae/shaders/hard-light-bloom-gamma.shader b/share/fs-uae/shaders/hard-light-bloom-gamma.shader
@@ -69,10 +69,10 @@ void main(void) {
 
     for (int i = 0; i < 3; i++) {
         if (rgb3[i] > 0.5) {
-            rgb4[i] = 1.0 - 2 * (1.0 - rgb3[i]) * (1.0 - rgb3[i]);
+            rgb4[i] = 1.0 - 2.0 * (1.0 - rgb3[i]) * (1.0 - rgb3[i]);
         }
         else {
-            rgb4[i] = 2 * rgb3[i] * rgb3[i];
+            rgb4[i] = 2.0 * rgb3[i] * rgb3[i];
         }
 
         //rgb4[i] = pow(rgb4[i], 1.0 / 1.13);

diff --git a/share/fs-uae/shaders/hard-light-bloom.shader b/share/fs-uae/shaders/hard-light-bloom.shader
@@ -69,10 +69,10 @@ void main(void) {
 
     for (int i = 0; i < 3; i++) {
         if (rgb3[i] > 0.5) {
-            rgb4[i] = 1.0 - 2 * (1.0 - rgb3[i]) * (1.0 - rgb3[i]);
+            rgb4[i] = 1.0 - 2.0 * (1.0 - rgb3[i]) * (1.0 - rgb3[i]);
         }
         else {
-            rgb4[i] = 2 * rgb3[i] * rgb3[i];
+            rgb4[i] = 2.0 * rgb3[i] * rgb3[i];
         }
 
         //rgb4[i] = pow(rgb4[i], 1.0 / 1.13);

diff --git a/share/fs-uae/shaders/hard-light.shader b/share/fs-uae/shaders/hard-light.shader
@@ -34,10 +34,10 @@ void main(void) {
 
     for (int i = 0; i < 3; i++) {
         if (rgb3[i] > 0.5) {
-            rgb4[i] = 1.0 - 2 * (1.0 - rgb3[i]) * (1.0 - rgb3[i]);
+            rgb4[i] = 1.0 - 2.0 * (1.0 - rgb3[i]) * (1.0 - rgb3[i]);
         }
         else {
-            rgb4[i] = 2 * rgb3[i] * rgb3[i];
+            rgb4[i] = 2.0 * rgb3[i] * rgb3[i];
         }
 
         //rgb4[i] = pow(rgb4[i], 1.0 / 1.13);

diff --git a/share/fs-uae/shaders/screenlines-nonlinear.shader b/share/fs-uae/shaders/screenlines-nonlinear.shader
@@ -11,7 +11,7 @@ void main(void) {
     float line = float(int(gl_FragCoord.y));
 
 	float strength = 0.0;
-	if (rubyOutputSize.y >= 960) {
+	if (rubyOutputSize.y >= 960.0) {
         int step = int(mod(line, 5.0));
 
 		if (step == 0) strength = 0.25;
@@ -27,8 +27,10 @@ void main(void) {
 		else if (step == 1) strength = 0.35;
 	    // else if (step == 3) strength = 0.0;
 	}
-
-	color.rgb = pow(color.rgb * (1.0 - strength * 0.1), 1.0 / (1.0 - strength));
+
+	color.r = pow(color.r * (1.0 - strength * 0.1), 1.0 / (1.0 - strength));
+	color.g = pow(color.g * (1.0 - strength * 0.1), 1.0 / (1.0 - strength));
+	color.b = pow(color.b * (1.0 - strength * 0.1), 1.0 / (1.0 - strength));	
 
 	gl_FragColor = color;
 }

diff --git a/share/fs-uae/shaders/test-gamma.shader b/share/fs-uae/shaders/test-gamma.shader
@@ -8,7 +8,9 @@ const float GAMMA = 0.85;
 
 void main(void) {   
     vec4 rgb = texture2D(rubyTexture, gl_TexCoord[0].xy);
-    rgb.rgb = pow(rgb.rgb, 1.0 / GAMMA);
+    rgb.r = pow(rgb.r, 1.0 / GAMMA);
+    rgb.g = pow(rgb.g, 1.0 / GAMMA);
+    rgb.b = pow(rgb.b, 1.0 / GAMMA);
     gl_FragColor = rgb;
 }