Skip to content

Merge master #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 2, 2019
Merged

Merge master #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ca518f4
Revert latest wine version to 4.0 and 4.7 (#949)
ImperatorS79 May 20, 2019
3be2c50
Update JSDoc
May 20, 2019
9399e0e
Update Magic The Gathering Arena: fix the script (#950)
ImperatorS79 May 20, 2019
4a09dfd
Update translations
May 20, 2019
e646a99
Update Wine LATEST_DEVELOPMENT_VERSION and LATEST_STAGING_VERSION to …
plata May 25, 2019
fce9150
Update Wine LATEST_STABLE_VERSION to 4.0.1 (#951)
plata May 25, 2019
2691752
Update JSDoc
May 25, 2019
beed414
Add nocrashdialog plugin(#954)
Zemogiter May 28, 2019
861bc2b
Update translations
May 28, 2019
c8344eb
Update Wine LATEST_DEVELOPMENT_VERSION and LATEST_STAGING_VERSION to …
plata Jun 1, 2019
26bda82
Update JSDoc
Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...s/MagicTheGatheringArena/Online/script.js → ...agic The Gathering Arena/Online/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = {
Expand All @@ -17,7 +17,7 @@ var installerImplementation = {
wine.DXVK();
wine.UseTakeFocus("N");
})
.executable("MTGAInstaller.exe")
.executable("MtgaLauncher.exe")
.go();
}
};
Expand Down
0 ...MagicTheGatheringArena/Online/script.json → ...ic The Gathering Arena/Online/script.json
View file
Open in desktop
File renamed without changes.
0 ...s/MagicTheGatheringArena/application.json → ...agic The Gathering Arena/application.json
View file
Open in desktop
File renamed without changes.
0 ...agicTheGatheringArena/miniatures/main.png → ...c The Gathering Arena/miniatures/main.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions Engines/Wine/Engine/Object/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
15 changes: 15 additions & 0 deletions Engines/Wine/Plugins/nocrashdialog/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};
11 changes: 11 additions & 0 deletions Engines/Wine/Plugins/nocrashdialog/script.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"scriptName" : "nocrashdialog",
"id" : "engines.wine.plugins.nocrashdialog",
"compatibleOperatingSystems" : [
"MACOSX",
"LINUX"
],
"testingOperatingSystems" : [],
"free" : true,
"requiresPatch" : false
}
4 changes: 2 additions & 2 deletions docs/jsdoc/Engines_Wine_Engine_Object_script.js.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ <h1 class="page-title">Source: Engines/Wine/Engine/Object/script.js</h1>
/* 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";

Expand Down
11 changes: 7 additions & 4 deletions i18n/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,10 +734,10 @@ Lock,\ Load,\ &\ Face\ the\ Madness<br><br>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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down