TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into development

Browse source
This commit is contained in:
marauder2k7 2022-08-16 08:25:32 +01:00
parent d02f5da414 14872eb4b6
commit 16062fb996
8 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/materials/materialDefinition.cpp
View file

@ -207,7 +207,7 @@ Material::Material()
mDoubleSided = false;
mTranslucent = false;
mTranslucentBlendOp = LerpAlpha;
mTranslucentBlendOp = PreMul;
mTranslucentZWrite = false;
mAlphaTest = false;

2
Templates/BaseGame/game/core/gui/scripts/canvas.tscript
View file

@ -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);

BIN
Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkybox.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

8
Templates/BaseGame/game/data/UI/guis/MainMenuButtons.gui
View file

@ -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";

24
Templates/BaseGame/game/data/UI/guis/pauseMenu.gui
View file

@ -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 ---

3
Templates/BaseGame/game/main.tscript.in
View file

@ -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.

14
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript
View file

@ -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 );
}
}

2
Templates/BaseGame/game/tools/worldEditor/scripts/lighting.ed.tscript
View file

@ -23,7 +23,7 @@
function EditorLightingMenu::onAdd( %this )
{
Parent::onAdd( %this );
return;
// Get the light manager names.
%lightManagers = getLightManagerNames();