pcsx2: Bump version number

locale:ja_jp Add missing hotkey notations
NSIS: QoL changes, general cleanup, bug fixes (#3335 )
2026-01-31 01:15:24 +01:00 · 2020-05-07 08:40:04 +01:00 · 2020-05-05 20:07:19 +01:00 · 2020-05-05 20:02:07 +01:00 · 2020-05-04 21:01:27 +02:00 · 2020-05-02 14:56:49 +01:00
5 changed files with 5 additions and 9 deletions
--- a/bin/portable.ini
+++ b/bin/portable.ini
@@ -1 +1 @@
-RunWizard=1
+RunWizard=0
--- a/debian-packager/create_built_tarball.sh
+++ b/debian-packager/create_built_tarball.sh
@@ -31,7 +31,7 @@ EOF

 # Default value
 GIT_SHA1=0;
-BRANCH="1.6.x"
+BRANCH="master"
 while [ -n "$1" ]; do
 case $1 in
    -help|-h   ) help;shift 1;;
--- a/linux_various/generate_pot.sh
+++ b/linux_various/generate_pot.sh
@@ -21,7 +21,7 @@ set -e
 ######################################################################
 # Script configuration
 ######################################################################
-VERSION=1.6.0
+VERSION=1.3.0
 COPYRIGHT="PCSX2 Dev Team"
 BUG_MAIL="https://github.com/PCSX2/pcsx2/issues"

--- a/pcsx2/Config.h
+++ b/pcsx2/Config.h
@@ -17,10 +17,6 @@

 #include "x86emitter/tools.h"

-// Disable TAS on release builds, threading issue maybe? It hangs the emu.
-// Linux always hangs, Windows far less but it's still an issue.
-#define DISABLE_RECORDING
-
 class IniInterface;

 enum PluginsEnum_t
--- a/pcsx2/SysForwardDefs.h
+++ b/pcsx2/SysForwardDefs.h
@@ -16,9 +16,9 @@
 #pragma once

 static const int PCSX2_VersionHi	= 1;
-static const int PCSX2_VersionMid	= 6;
+static const int PCSX2_VersionMid	= 7;
 static const int PCSX2_VersionLo	= 0;
-static const bool PCSX2_isReleaseVersion = 1;
+static const bool PCSX2_isReleaseVersion = 0;

 class SysCoreThread;
Author	SHA1	Message	Date
Jonathan Li	15a9a95284	pcsx2: Bump version number	2020-05-07 08:40:04 +01:00
knight-ryu12	56ea8c4fe6	locale:ja_jp Add missing hotkey notations	2020-05-05 20:07:19 +01:00
Christian Kenny	c4c1b58108	NSIS: QoL changes, general cleanup, bug fixes (#3335 ) Uninstaller: - Removed dependency for AdvUninstallLog, it wasn't really used for anything. - Remove unpacked installer files upon successful installation. Installer: - Remove detection code for versions prior to 1.4. - Fix Unicode path issues. - Fix path issues if install folder already exists. - Remove language option. - Fix redistributable installation issues. - Move redistributable installation to after user proceeds with install.	2020-05-05 20:02:07 +01:00
lightningterror	6fd328611f	onepad: Update to latest controller database.	2020-05-04 21:01:27 +02:00
$refractionpcsx2$ refractionpcsx2	18f772e71c	Debugger: Fix editing of function names	2020-05-02 14:56:49 +01:00
$refractionpcsx2$ refractionpcsx2	97df1dd3b5	Only reload the function symbols in debugger once per game	2020-05-02 14:22:43 +01:00
$refractionpcsx2$ refractionpcsx2	4ce3fdfcb2	Fix up debugger stepping	2020-05-02 04:53:03 +01:00
$refractionpcsx2$ refractionpcsx2	939e576df9	Separate debug pausing from savestates and recording frame advance	2020-05-02 04:29:30 +01:00
lightningterror	1939671e7f	onepad: Add PDP Kingdom Hearts Controller. Close #3342	2020-05-02 05:00:38 +02:00
$refractionpcsx2$ refractionpcsx2	ea52da9428	Move debugger function list reset to when the debugger breaks in to the code. Stops a long freeze when first launching a game	2020-05-02 03:41:42 +01:00
lightningterror	f0d08aa7d0	Revert "Locale:ja_JP:Update Hotkey notation" This reverts commit `a7717b9ff1`. It actually broke hotkeys, we noticed a bit too late.	2020-05-01 00:09:55 +02:00
knight-ryu12	a7717b9ff1	Locale:ja_JP:Update Hotkey notation	2020-04-30 21:58:38 +02:00
lightningterror	ba449a524a	Revert "gsdx-ogl/d3d11: Add a assert when texture is too small or too big." This reverts commit `99f814d376`. The assert gets triggered on Linux and so debug build can't be used properly. Would be nice to investigate why in the first place but until then revert the entire commit. We have checks for texture limits anyway so it shouldn't be an issue.	2020-04-29 19:33:38 +02:00
Shadix Aced	f68bbfba60	Locales: Update translations (fr-FR). (#3326 )	2020-04-28 14:33:52 +02:00
lightningterror	bce30e7388	onepad: Add SZMY-POWER CO. LTD. GAMEPAD to db. Close #3329	2020-04-28 01:28:14 +02:00
Abdullah Hashim	58f5a5b915	Locales: Update Arabic Translations ar_SA. (#3302 )	2020-04-14 18:40:25 +02:00
lightningterror	e53b2585d1	onepad: Add SZMY-POWER CO. LTD. GAMEPAD 3 TURBO controller. Issue: https://github.com/PCSX2/pcsx2/issues/3309	2020-04-14 18:28:16 +02:00
lightningterror	49e316e488	onepad: Update to latest controller database.	2020-04-08 19:31:26 +02:00
lightningterror	56b76b17a0	onepad: Update to latest controller database.	2020-03-27 18:30:28 +01:00