mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 16:44:36 +00:00
Merge remote-tracking branch 'gg/development' into gtest-tests
This commit is contained in:
commit
5a430af051
47 changed files with 674 additions and 66 deletions
|
|
@ -38,7 +38,10 @@ function createCanvas(%windowTitle)
|
|||
}
|
||||
|
||||
// Create the Canvas
|
||||
%foo = new GuiCanvas(Canvas);
|
||||
%foo = new GuiCanvas(Canvas)
|
||||
{
|
||||
displayWindow = false;
|
||||
};
|
||||
|
||||
// Set the window title
|
||||
if (isObject(Canvas))
|
||||
|
|
@ -246,6 +249,15 @@ if ($displayHelp) {
|
|||
else {
|
||||
onStart();
|
||||
echo("Engine initialized...");
|
||||
|
||||
if( !$isDedicated )
|
||||
{
|
||||
// As we know at this point that the initial load is complete,
|
||||
// we can hide any splash screen we have, and show the canvas.
|
||||
// This keeps things looking nice, instead of having a blank window
|
||||
closeSplashWindow();
|
||||
Canvas.showWindow();
|
||||
}
|
||||
|
||||
// Auto-load on the 360
|
||||
if( $platform $= "xenon" )
|
||||
|
|
|
|||
|
|
@ -38,7 +38,10 @@ function createCanvas(%windowTitle)
|
|||
}
|
||||
|
||||
// Create the Canvas
|
||||
%foo = new GuiCanvas(Canvas);
|
||||
%foo = new GuiCanvas(Canvas)
|
||||
{
|
||||
displayWindow = false;
|
||||
};
|
||||
|
||||
// Set the window title
|
||||
if (isObject(Canvas))
|
||||
|
|
@ -246,6 +249,15 @@ if ($displayHelp) {
|
|||
else {
|
||||
onStart();
|
||||
echo("Engine initialized...");
|
||||
|
||||
if( !$isDedicated )
|
||||
{
|
||||
// As we know at this point that the initial load is complete,
|
||||
// we can hide any splash screen we have, and show the canvas.
|
||||
// This keeps things looking nice, instead of having a blank window
|
||||
closeSplashWindow();
|
||||
Canvas.showWindow();
|
||||
}
|
||||
|
||||
// Auto-load on the 360
|
||||
if( $platform $= "xenon" )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue