From ca518f4175812a40f0b0fc00c958a88cfa8df296 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Mon, 20 May 2019 10:07:04 +0200 Subject: [PATCH 01/11] Revert latest wine version to 4.0 and 4.7 (#949) Others have not been build yet @qparis --- Engines/Wine/Engine/Object/script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js index aa86da4c8a..1ff508edd5 100644 --- a/Engines/Wine/Engine/Object/script.js +++ b/Engines/Wine/Engine/Object/script.js @@ -5,11 +5,11 @@ include("utils.functions.net.download"); include("utils.functions.net.resource"); /* exported LATEST_STABLE_VERSION */ -var LATEST_STABLE_VERSION = "4.0.1"; +var LATEST_STABLE_VERSION = "4.0"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.8"; +var LATEST_DEVELOPMENT_VERSION = "4.7"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.8"; +var LATEST_STAGING_VERSION = "4.7"; /* exported LATEST_DOS_SUPPORT_VERSION */ var LATEST_DOS_SUPPORT_VERSION = "4.0"; From 3be2c50220a1f9ffa22dbf612d957d2fe4db3964 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 20 May 2019 08:09:48 +0000 Subject: [PATCH 02/11] Update JSDoc --- docs/jsdoc/Engines_Wine_Engine_Object_script.js.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html index d4b6ede8ec..ca01ab5a37 100644 --- a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html +++ b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html @@ -33,11 +33,11 @@

Source: Engines/Wine/Engine/Object/script.js

include("utils.functions.net.resource"); /* exported LATEST_STABLE_VERSION */ -var LATEST_STABLE_VERSION = "4.0.1"; +var LATEST_STABLE_VERSION = "4.0"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.8"; +var LATEST_DEVELOPMENT_VERSION = "4.7"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.8"; +var LATEST_STAGING_VERSION = "4.7"; /* exported LATEST_DOS_SUPPORT_VERSION */ var LATEST_DOS_SUPPORT_VERSION = "4.0"; From 9399e0e5e068c1ebe97b5c51c5cc8cdbfe6930cf Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Mon, 20 May 2019 20:25:34 +0200 Subject: [PATCH 03/11] Update Magic The Gathering Arena: fix the script (#950) --- .../Online/script.js | 6 +++--- .../Online/script.json | 0 .../application.json | 0 .../miniatures/main.png | Bin 4 files changed, 3 insertions(+), 3 deletions(-) rename Applications/Games/{MagicTheGatheringArena => Magic The Gathering Arena}/Online/script.js (83%) rename Applications/Games/{MagicTheGatheringArena => Magic The Gathering Arena}/Online/script.json (100%) rename Applications/Games/{MagicTheGatheringArena => Magic The Gathering Arena}/application.json (100%) rename Applications/Games/{MagicTheGatheringArena => Magic The Gathering Arena}/miniatures/main.png (100%) diff --git a/Applications/Games/MagicTheGatheringArena/Online/script.js b/Applications/Games/Magic The Gathering Arena/Online/script.js similarity index 83% rename from Applications/Games/MagicTheGatheringArena/Online/script.js rename to Applications/Games/Magic The Gathering Arena/Online/script.js index f04846991c..6557e66381 100644 --- a/Applications/Games/MagicTheGatheringArena/Online/script.js +++ b/Applications/Games/Magic The Gathering Arena/Online/script.js @@ -1,6 +1,6 @@ -include("engines.wine.quick_script.custom_installer_script"); +include("engines.wine.quick_script.online_installer_script"); include("engines.wine.verbs.dxvk"); -include("engines.wine.plugins.UseTakeFocus") +include("engines.wine.plugins.usetakefocus") var installerImplementation = { @@ -17,7 +17,7 @@ var installerImplementation = { wine.DXVK(); wine.UseTakeFocus("N"); }) - .executable("MTGAInstaller.exe") + .executable("MtgaLauncher.exe") .go(); } }; diff --git a/Applications/Games/MagicTheGatheringArena/Online/script.json b/Applications/Games/Magic The Gathering Arena/Online/script.json similarity index 100% rename from Applications/Games/MagicTheGatheringArena/Online/script.json rename to Applications/Games/Magic The Gathering Arena/Online/script.json diff --git a/Applications/Games/MagicTheGatheringArena/application.json b/Applications/Games/Magic The Gathering Arena/application.json similarity index 100% rename from Applications/Games/MagicTheGatheringArena/application.json rename to Applications/Games/Magic The Gathering Arena/application.json diff --git a/Applications/Games/MagicTheGatheringArena/miniatures/main.png b/Applications/Games/Magic The Gathering Arena/miniatures/main.png similarity index 100% rename from Applications/Games/MagicTheGatheringArena/miniatures/main.png rename to Applications/Games/Magic The Gathering Arena/miniatures/main.png From 4a09dfd3834c999cc4e7242454afbddafb873f86 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 20 May 2019 18:44:03 +0000 Subject: [PATCH 04/11] Update translations --- i18n/Messages.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n/Messages.properties b/i18n/Messages.properties index 3ad4f18ad0..2605742efb 100644 --- a/i18n/Messages.properties +++ b/i18n/Messages.properties @@ -734,10 +734,10 @@ Lock,\ Load,\ &\ Face\ the\ Madness

Get\ ready\ for\ the\ mind\ blowing\ #: i18n/tmp/Applications/Games/Mafia II/application.js:1 Mafia\ II=Mafia II -#: i18n/tmp/Applications/Games/MagicTheGatheringArena/application.js:1 +#: i18n/tmp/Applications/Games/Magic The Gathering Arena/application.js:1 Magic\:\ The\ Gathering\ Arena=Magic\: The Gathering Arena -#: i18n/tmp/Applications/Games/MagicTheGatheringArena/application.js:2 +#: i18n/tmp/Applications/Games/Magic The Gathering Arena/application.js:2 Magic\:\ The\ Gathering\ Arena\ is\ a\ free-to-play\ digital\ collectible\ card\ game\ developed\ by\ Wizards\ of\ the\ Coast's\ internal\ development\ studio,\ Wizards\ Digital\ Games\ Studio.(Wikipedia)=Magic\: The Gathering Arena is a free-to-play digital collectible card game developed by Wizards of the Coast's internal development studio, Wizards Digital Games Studio.(Wikipedia) #: i18n/tmp/Applications/Games/Mass Effect/application.js:1 @@ -818,6 +818,7 @@ On\ first\ run\ the\ game\ might\ not\ go\ into\ full\ screen.\ If\ that\ happen #: i18n/tmp/Applications/Custom/OnlineInstaller/Online/script.js:1 #: i18n/tmp/Applications/Games/The Elder Scrolls I: Arena/Online/script.js:1 #: i18n/tmp/Applications/Games/Druid Soccer/Online/script.js:1 +#: i18n/tmp/Applications/Games/Magic The Gathering #: i18n/tmp/Applications/Games/Prehistorik/Online/script.js:1 #: i18n/tmp/Applications/Games/Guild Wars 2/Online/script.js:1 #: i18n/tmp/Applications/Games/Xenon @@ -829,8 +830,7 @@ On\ first\ run\ the\ game\ might\ not\ go\ into\ full\ screen.\ If\ that\ happen #: i18n/tmp/Applications/Games/Steam/Online/script.js:1 #: i18n/tmp/Applications/Games/DC Universe Online/Online/script.js:1 #: i18n/tmp/Applications/Games/Epic Games Launcher/Online/script.js:1 -#: i18n/tmp/Applications/Games/STAR WARS: The Old Republic/Online/script.js:1 -#: i18n/tmp/Applications/Games/MagicTheGatheringArena/Online/script.js:1 +#: i18n/tmp/Applications/Games/STAR WARS: Old Republic/Online/script.js:1 #: i18n/tmp/Applications/Games/Overwatch/Online/script.js:1 #: i18n/tmp/Applications/Games/Prince Of Persia: Original/Online/script.js:1 #: i18n/tmp/Applications/Games/Earth Eternal - Valkal's From e646a99e99722ff7991e293543b9577b62d77b27 Mon Sep 17 00:00:00 2001 From: plata Date: Sat, 25 May 2019 10:41:34 +0200 Subject: [PATCH 05/11] Update Wine LATEST_DEVELOPMENT_VERSION and LATEST_STAGING_VERSION to 4.8 (#952) --- Engines/Wine/Engine/Object/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js index 1ff508edd5..c8e8393500 100644 --- a/Engines/Wine/Engine/Object/script.js +++ b/Engines/Wine/Engine/Object/script.js @@ -7,9 +7,9 @@ include("utils.functions.net.resource"); /* exported LATEST_STABLE_VERSION */ var LATEST_STABLE_VERSION = "4.0"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.7"; +var LATEST_DEVELOPMENT_VERSION = "4.8"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.7"; +var LATEST_STAGING_VERSION = "4.8"; /* exported LATEST_DOS_SUPPORT_VERSION */ var LATEST_DOS_SUPPORT_VERSION = "4.0"; From fce9150b53be8dc4e3930193e7cc9be713162ff2 Mon Sep 17 00:00:00 2001 From: plata Date: Sat, 25 May 2019 10:41:58 +0200 Subject: [PATCH 06/11] Update Wine LATEST_STABLE_VERSION to 4.0.1 (#951) --- Engines/Wine/Engine/Object/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js index c8e8393500..aa86da4c8a 100644 --- a/Engines/Wine/Engine/Object/script.js +++ b/Engines/Wine/Engine/Object/script.js @@ -5,7 +5,7 @@ include("utils.functions.net.download"); include("utils.functions.net.resource"); /* exported LATEST_STABLE_VERSION */ -var LATEST_STABLE_VERSION = "4.0"; +var LATEST_STABLE_VERSION = "4.0.1"; /* exported LATEST_DEVELOPMENT_VERSION */ var LATEST_DEVELOPMENT_VERSION = "4.8"; /* exported LATEST_STAGING_VERSION */ From 26917526afb2a3506b94561e98538ee4376c71e0 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 25 May 2019 08:44:41 +0000 Subject: [PATCH 07/11] Update JSDoc --- docs/jsdoc/Engines_Wine_Engine_Object_script.js.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html index ca01ab5a37..d4b6ede8ec 100644 --- a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html +++ b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html @@ -33,11 +33,11 @@

Source: Engines/Wine/Engine/Object/script.js

include("utils.functions.net.resource"); /* exported LATEST_STABLE_VERSION */ -var LATEST_STABLE_VERSION = "4.0"; +var LATEST_STABLE_VERSION = "4.0.1"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.7"; +var LATEST_DEVELOPMENT_VERSION = "4.8"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.7"; +var LATEST_STAGING_VERSION = "4.8"; /* exported LATEST_DOS_SUPPORT_VERSION */ var LATEST_DOS_SUPPORT_VERSION = "4.0"; From beed4145fd93d2a6c63af1777982a8623b5d77a3 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 28 May 2019 10:49:44 +0200 Subject: [PATCH 08/11] Add nocrashdialog plugin(#954) --- Engines/Wine/Plugins/nocrashdialog/script.js | 15 +++++++++++++++ Engines/Wine/Plugins/nocrashdialog/script.json | 11 +++++++++++ 2 files changed, 26 insertions(+) create mode 100644 Engines/Wine/Plugins/nocrashdialog/script.js create mode 100644 Engines/Wine/Plugins/nocrashdialog/script.json diff --git a/Engines/Wine/Plugins/nocrashdialog/script.js b/Engines/Wine/Plugins/nocrashdialog/script.js new file mode 100644 index 0000000000..04cb1ee147 --- /dev/null +++ b/Engines/Wine/Plugins/nocrashdialog/script.js @@ -0,0 +1,15 @@ +include("engines.wine.engine.object"); + +/** + * disables the crashdialog + * @returns {Wine} Wine object + */ +Wine.prototype.nocrashdialog = function () { + var regeditFileContent = + "REGEDIT4\n" + + "\n" + + "[HKEY_CURRENT_USER\\Software\\Wine\\WineDbg]\n" + + "\"ShowCrashDialog\"=\""00000000"\"" + this.regedit().patch(regeditFileContent); + return this; +}; diff --git a/Engines/Wine/Plugins/nocrashdialog/script.json b/Engines/Wine/Plugins/nocrashdialog/script.json new file mode 100644 index 0000000000..230caf2c9f --- /dev/null +++ b/Engines/Wine/Plugins/nocrashdialog/script.json @@ -0,0 +1,11 @@ +{ + "scriptName" : "nocrashdialog", + "id" : "engines.wine.plugins.nocrashdialog", + "compatibleOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : true, + "requiresPatch" : false +} From 861bc2b4d5f635ecc255d2dc5d05b5e0c55351a8 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 28 May 2019 08:51:43 +0000 Subject: [PATCH 09/11] Update translations --- i18n/Messages.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/i18n/Messages.properties b/i18n/Messages.properties index 2605742efb..5de2584979 100644 --- a/i18n/Messages.properties +++ b/i18n/Messages.properties @@ -1890,6 +1890,9 @@ multisampling=multisampling #: i18n/tmp/Engines/Wine/Plugins/native application/script.js:1 native\ application=native application +#: i18n/tmp/Engines/Wine/Plugins/nocrashdialog/script.js:1 +nocrashdialog=nocrashdialog + #: i18n/tmp/Engines/Wine/Settings/offscreen rendering mode/script.js:1 offscreen\ rendering\ mode=offscreen rendering mode From c8344eb265a7578ea21058930c0cbe89494a4e2e Mon Sep 17 00:00:00 2001 From: plata Date: Sat, 1 Jun 2019 18:21:06 +0200 Subject: [PATCH 10/11] Update Wine LATEST_DEVELOPMENT_VERSION and LATEST_STAGING_VERSION to 4.9 (#953) --- Engines/Wine/Engine/Object/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js index aa86da4c8a..c56e3b1218 100644 --- a/Engines/Wine/Engine/Object/script.js +++ b/Engines/Wine/Engine/Object/script.js @@ -7,9 +7,9 @@ include("utils.functions.net.resource"); /* exported LATEST_STABLE_VERSION */ var LATEST_STABLE_VERSION = "4.0.1"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.8"; +var LATEST_DEVELOPMENT_VERSION = "4.9"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.8"; +var LATEST_STAGING_VERSION = "4.9"; /* exported LATEST_DOS_SUPPORT_VERSION */ var LATEST_DOS_SUPPORT_VERSION = "4.0"; From 26bda82d004c21d15f20c0702f2efc017cf7697d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 1 Jun 2019 16:23:47 +0000 Subject: [PATCH 11/11] Update JSDoc --- docs/jsdoc/Engines_Wine_Engine_Object_script.js.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html index d4b6ede8ec..350289cf54 100644 --- a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html +++ b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html @@ -35,9 +35,9 @@

Source: Engines/Wine/Engine/Object/script.js

/* exported LATEST_STABLE_VERSION */ var LATEST_STABLE_VERSION = "4.0.1"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.8"; +var LATEST_DEVELOPMENT_VERSION = "4.9"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.8"; +var LATEST_STAGING_VERSION = "4.9"; /* exported LATEST_DOS_SUPPORT_VERSION */ var LATEST_DOS_SUPPORT_VERSION = "4.0";