Finally, we have 2.1.1. :-D

diff --git a/Makefile b/Makefile
index f2949a885111519523e26f801d434aae246b00f4..f562c55e98e903767b1fdb12e6d6e1dc3d3daec9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,10 @@ obj:
 
 prepare: obj
        @echo -e "\033[01;33m***\033[00;32m Preparing to compile Virtual Jaguar...\033[00m"
-#      @echo "#define VJ_RELEASE_VERSION \"v2.1.1\"" > src/version.h
-#      @echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h
-       @echo "#define VJ_RELEASE_VERSION \"GIT `git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`\"" > src/version.h
-       @echo "#define VJ_RELEASE_SUBVERSION \"2.1.1 Prerelease\"" >> src/version.h
+       @echo "#define VJ_RELEASE_VERSION \"v2.1.1\"" > src/version.h
+       @echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h
+#      @echo "#define VJ_RELEASE_VERSION \"GIT `git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`\"" > src/version.h
+#      @echo "#define VJ_RELEASE_SUBVERSION \"2.1.1 Prerelease\"" >> src/version.h
 
 virtualjaguar: sources libs makefile-qt
        @echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m"

diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index 879e977ec5e939f06bb2bb1d2f817ede21b3f1b8..0901b0f6e1c04ac3b09ba7f0c466ac4f7799543c 100644 (file)
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -37,7 +37,7 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
                VJ_RELEASE_VERSION " (" VJ_RELEASE_SUBVERSION ")"
                "</td></tr>"
                "<tr><td align='right'><b>Coders: </b></td><td>James Hammons (shamus)<br>Niels Wagenaar (nwagenaar)<br>Carwin Jones (Caz)<br>Adam Green</td></tr>"
-               "<tr><td align='right'><b>Testers: </b></td><td>Cyrano Jones, LinkoVitch, neo-rg, Robert R,<br>TheUMan, Dissection, overridex, geormetal</td></tr>"
+               "<tr><td align='right'><b>Testers: </b></td><td>Cyrano Jones, LinkoVitch, partycle, neo-rg,<br>Robert R, TheUMan, Dissection, overridex,<br>geormetal</td></tr>"
                "<tr><td align='right'><b>Build Team: </b></td><td>shamus (win32)<br>goldenegg (MacOS)</td></tr>"
                "<tr><td align='right'><b>Homepage: </b></td><td>http://icculus.org/virtualjaguar/</td></tr>"
                "</table>"

diff --git a/src/gui/gamepad.cpp b/src/gui/gamepad.cpp
index 873e3b5ad9a81d2efc0f3f7c186a256336fa2d22..a7a949864a4af62d49f070bca0a230e868e0636b 100644 (file)
--- a/src/gui/gamepad.cpp
+++ b/src/gui/gamepad.cpp
@@ -68,8 +68,8 @@ void Gamepad::AllocateJoysticks(void)
                        // Ick, kludges already!!!
                        if (strcmp(padName[i], "Sony PLAYSTATION(R)3 Controller") == 0)
                        {
-                               // We do this because these axes stay stuck on -32000 (buttons)
-                               // or come on and stay on (D-pad). :-P
+                               // We do this because these axes stay stuck on -32767 (buttons)
+                               // or start at 0 and stay stuck at -32767 (D-pad). :-P
                                numAxes[i] = 8;
                                WriteLog("Gamepad: Blacklisting PS3 controller axes 8 on up...\n");
                        }