Merge branch 'master' into experimental

experimental
Peter Repukat 6 years ago
commit a9ed7c1db3

@ -1,4 +1,4 @@
version: 2.0.1.{build} version: 2.0.3.{build}
pull_requests: pull_requests:
do_not_increment_build_number: true do_not_increment_build_number: true
branches: branches:

@ -59,7 +59,7 @@ private:
QList<UWPPair> uwp_pairs_; QList<UWPPair> uwp_pairs_;
constexpr static const unsigned int GLOSC_VERSION = 0x00000202; //Version Number in as bytes, just remove the dots. constexpr static const unsigned int GLOSC_VERSION = 0x00000203; //Version Number in as bytes, just remove the dots.
int wide_x_ = 711; int wide_x_ = 711;
int small_x_ = 302; int small_x_ = 302;

Binary file not shown.

Binary file not shown.

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "GloSC" #define MyAppName "GloSC"
#define MyAppVersion "2.0.2" #define MyAppVersion "2.0.3"
#define MyAppPublisher "Peter Repukat - FlatspotSoftware" #define MyAppPublisher "Peter Repukat - FlatspotSoftware"
#define MyAppURL "htpp://github.com/Alia5/GloSC" #define MyAppURL "htpp://github.com/Alia5/GloSC"
#define MyAppExeName "GloSC.exe" #define MyAppExeName "GloSC.exe"

@ -229,7 +229,7 @@ void SteamTarget::launchApplication()
stream << "@Echo off\n" << batchContents; stream << "@Echo off\n" << batchContents;
file.close(); file.close();
const QString launchPath = QDir::toNativeSeparators(applicationDirPath()) + "\\launchApp.bat"; const QString launchPath = QDir::toNativeSeparators(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0)) + "\\launchApp.bat";
QProcess::startDetached("explorer.exe", QStringList() << launchPath); QProcess::startDetached("explorer.exe", QStringList() << launchPath);
if (close_launched_done_) if (close_launched_done_)

Binary file not shown.

@ -6,7 +6,7 @@ bEnableControllers=1
bUseDesktopConfig=0 bUseDesktopConfig=0
bHookSteam=1 bHookSteam=1
iUpdateRate=5000 iUpdateRate=5000
version=514 version=515
[LaunchGame] [LaunchGame]
bLaunchGame=0 bLaunchGame=0

Loading…
Cancel
Save