diff --git a/Engine/source/materials/materialDefinition.cpp b/Engine/source/materials/materialDefinition.cpp index 351158adf..2b28a0f8e 100644 --- a/Engine/source/materials/materialDefinition.cpp +++ b/Engine/source/materials/materialDefinition.cpp @@ -207,7 +207,7 @@ Material::Material() mDoubleSided = false; mTranslucent = false; - mTranslucentBlendOp = LerpAlpha; + mTranslucentBlendOp = PreMul; mTranslucentZWrite = false; mAlphaTest = false; diff --git a/Templates/BaseGame/game/core/gui/scripts/canvas.tscript b/Templates/BaseGame/game/core/gui/scripts/canvas.tscript index 94dde1d84..6c9e1925b 100644 --- a/Templates/BaseGame/game/core/gui/scripts/canvas.tscript +++ b/Templates/BaseGame/game/core/gui/scripts/canvas.tscript @@ -164,7 +164,7 @@ function GuiCanvas::checkCanvasRes(%this, %mode, %deviceId, %deviceMode, %startu { // Toggle for selecting the borderless window allowed sizes. Set true to allow // borderless windows to be less than the device res. - %allowSmallBorderless = true; + %allowSmallBorderless = false; %resX = getWord(%mode, $WORD::RES_X); %resY = getWord(%mode, $WORD::RES_Y); diff --git a/Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkybox.png b/Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkybox.png index 9a60da1a2..82454f46f 100644 Binary files a/Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkybox.png and b/Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkybox.png differ diff --git a/Templates/BaseGame/game/data/UI/guis/MainMenuButtons.gui b/Templates/BaseGame/game/data/UI/guis/MainMenuButtons.gui index accf22ef6..de086ec19 100644 --- a/Templates/BaseGame/game/data/UI/guis/MainMenuButtons.gui +++ b/Templates/BaseGame/game/data/UI/guis/MainMenuButtons.gui @@ -52,20 +52,24 @@ $guiContent = new GuiControl(MainMenuButtons) { tooltipProfile = "GuiToolTipProfile"; }; new GuiButtonCtrl(MainMenuWorldEditBtn) { - text = "Open World Editor"; + text = "Open World Editor (F11)"; position = "0 280"; extent = "400 55"; profile = "GuiMenuButtonProfile"; command = "openWorldEditorBtn();"; tooltipProfile = "GuiToolTipProfile"; + enabled = (ModuleDatabase.findModule("ToolsModule") !$= ""); + visible = (ModuleDatabase.findModule("ToolsModule") !$= ""); }; new GuiButtonCtrl(MainMenuGuiEditBtn) { - text = "Open GUI Editor"; + text = "Open GUI Editor (F10)"; position = "0 350"; extent = "400 55"; profile = "GuiMenuButtonProfile"; command = "openGUIEditorBtn();"; tooltipProfile = "GuiToolTipProfile"; + enabled = (ModuleDatabase.findModule("ToolsModule") !$= ""); + visible = (ModuleDatabase.findModule("ToolsModule") !$= ""); }; new GuiButtonCtrl(MainMenuExitBtn) { text = "Exit"; diff --git a/Templates/BaseGame/game/data/UI/guis/pauseMenu.gui b/Templates/BaseGame/game/data/UI/guis/pauseMenu.gui index 6e02697d8..59d498e28 100644 --- a/Templates/BaseGame/game/data/UI/guis/pauseMenu.gui +++ b/Templates/BaseGame/game/data/UI/guis/pauseMenu.gui @@ -17,6 +17,18 @@ $guiContent = new GuiControl(PauseMenu) { isContainer = "1"; canSaveDynamicFields = "1"; }; + new GuiInputCtrl(PauseMenuInputHandler) { + sendAxisEvents = "1"; + sendBreakEvents = "1"; + ignoreMouseEvents = "1"; + position = "-50 0"; + extent = "10 10"; + horizSizing = "width"; + vertSizing = "height"; + profile = "GuiInputCtrlProfile"; + tooltipProfile = "GuiToolTipProfile"; + class = "MenuInputHandler"; + }; new GuiControl(PauseMenuButtons) { position = "162 125"; extent = "700 518"; @@ -147,17 +159,5 @@ $guiContent = new GuiControl(PauseMenu) { hidden = "1"; }; }; - new GuiInputCtrl(PauseMenuInputHandler) { - sendAxisEvents = "1"; - sendBreakEvents = "1"; - ignoreMouseEvents = "1"; - position = "-50 0"; - extent = "10 10"; - horizSizing = "width"; - vertSizing = "height"; - profile = "GuiInputCtrlProfile"; - tooltipProfile = "GuiToolTipProfile"; - class = "MenuInputHandler"; - }; }; //--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/main.tscript.in b/Templates/BaseGame/game/main.tscript.in index 800e9625a..0abcb346a 100644 --- a/Templates/BaseGame/game/main.tscript.in +++ b/Templates/BaseGame/game/main.tscript.in @@ -14,7 +14,8 @@ $appName = "@TORQUE_APP_NAME@"; // Load up scripts to initialise subsystems. ModuleDatabase.setModuleExtension("module"); ModuleDatabase.scanModules( "core", false ); -ModuleDatabase.LoadExplicit( "CoreModule" ); +if (!ModuleDatabase.LoadExplicit( "CoreModule" )) + quit(); // Display a splash window immediately to improve app responsiveness before // engine is initialized and main window created. diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript index b124b99f3..0367ae1fd 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript @@ -777,11 +777,13 @@ function GuiEditorResList::init( %this ) // Widescreen formats. %this.add( "1280x720 (WXGA, 16:9)", 720 ); - %this.add( "1600x900 (16:9)", 900 ); - %this.add( "1920x1080 (16:9)", 1080 ); + %this.add( "1600x900 (HD+, 16:9)", 900 ); + %this.add( "1920x1080 (FHD, 16:9)", 1080 ); + %this.add( "2560x1440 (QHD, 16:9)", 1440 ); + %this.add( "3840x2160 (4K UHD, 16:9)", 2160 ); %this.add( "1440x900 (WXGA+, 16:10)", 900 ); %this.add( "1680x1050 (WSXGA+, 16:10)", 1050 ); - %this.add( "1920x1200 (WUXGA, 16:10)", 1200 ); + %this.add( "1920x1200 (WUXGA, 16:10)", 1200 ); } //--------------------------------------------------------------------------------------------- @@ -865,6 +867,12 @@ function GuiEditorResList::onSelect( %this, %id ) case 1200: GuiEditor.setPreviewResolution( 1920, 1200 ); + + case 1440: + GuiEditor.setPreviewResolution( 2560, 1440 ); + + case 2160: + GuiEditor.setPreviewResolution( 3840, 2160 ); } } diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/lighting.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/lighting.ed.tscript index 180504f38..e863f4cb9 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/lighting.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/lighting.ed.tscript @@ -23,7 +23,7 @@ function EditorLightingMenu::onAdd( %this ) { Parent::onAdd( %this ); - + return; // Get the light manager names. %lightManagers = getLightManagerNames();