From dc2b5ea2786687316224f5c29a4b7bdebddc71b5 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Wed, 8 Oct 2014 17:01:57 -0500 Subject: [PATCH] Finally, we have 2.1.1. :-D --- Makefile | 8 ++++---- src/gui/about.cpp | 2 +- src/gui/gamepad.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f2949a8..f562c55 100644 --- 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 879e977..0901b0f 100644 --- 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 ")" "" "Coders: James Hammons (shamus)
Niels Wagenaar (nwagenaar)
Carwin Jones (Caz)
Adam Green" - "Testers: Cyrano Jones, LinkoVitch, neo-rg, Robert R,
TheUMan, Dissection, overridex, geormetal" + "Testers: Cyrano Jones, LinkoVitch, partycle, neo-rg,
Robert R, TheUMan, Dissection, overridex,
geormetal" "Build Team: shamus (win32)
goldenegg (MacOS)" "Homepage: http://icculus.org/virtualjaguar/" "" diff --git a/src/gui/gamepad.cpp b/src/gui/gamepad.cpp index 873e3b5..a7a9498 100644 --- 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"); } -- 2.37.2