TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'gg/development' into gtest-tests

Browse source
This commit is contained in:
Daniel Buckmaster 2014-08-30 17:51:41 +10:00
commit 5a430af051
47 changed files with 674 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Templates/Empty/game/main.cs
View file

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

14
Templates/Empty/game/main.cs.in
View file

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

7
Templates/Empty/source/torqueConfig.h
View file

@ -148,13 +148,6 @@
/// texture manager.
#define TORQUE_FRAME_SIZE 16 << 20
// Default keyboard layout for launching the game. It's fixed crash when a
// game running with the extend unicode keyboard (cyrillic, for example).
// Windows only.
// @see For choice language >
// http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693%28v=vs.85%29.aspx
#define TORQUE_DEFAULT_KEYBOARD_LAYOUT LANG_ENGLISH
// Finally, we define some dependent #defines. This enables some subsidiary
// functionality to get automatically turned on in certain configurations.

14
Templates/Full/game/main.cs
View file

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

14
Templates/Full/game/main.cs.in
View file

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

7
Templates/Full/source/torqueConfig.h
View file

@ -169,13 +169,6 @@
/// texture manager.
#define TORQUE_FRAME_SIZE 16 << 20
// Default keyboard layout for launching the game. It's fixed crash when a
// game running with the extend unicode keyboard (cyrillic, for example).
// Windows only.
// @see For choice language >
// http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693%28v=vs.85%29.aspx
#define TORQUE_DEFAULT_KEYBOARD_LAYOUT LANG_ENGLISH
// Finally, we define some dependent #defines. This enables some subsidiary
// functionality to get automatically turned on in certain configurations.