TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #884 from GarageGames/development-3.6

Browse source 
Version 3.6.2
This commit is contained in:
Daniel Buckmaster 2014-11-05 20:28:01 +11:00
commit 3082bb3adc
28 changed files with 132 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/Empty/game/core/art/gui/FrameOverlayGui.gui
View file

@ -23,6 +23,8 @@
modal = "True";
helpTag = "0";
expression = "10";
command = "Canvas.popDialog(FrameOverlayGui);";
accelerator = "escape";
};
};
//--- OBJECT WRITE END ---

7
Templates/Empty/game/core/scripts/client/postFx/default.postfxpreset.cs
View file

@ -20,6 +20,11 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
$PostFXManager::Settings::EnableDOF = "0";
$PostFXManager::Settings::EnabledSSAO = "0";
$PostFXManager::Settings::EnableHDR = "0";
$PostFXManager::Settings::EnableLightRays = "0";
$PostFXManager::Settings::EnablePostFX = "0";
$PostFXManager::Settings::DOF::BlurCurveFar = "";
$PostFXManager::Settings::DOF::BlurCurveNear = "";
$PostFXManager::Settings::DOF::BlurMax = "";
@ -59,4 +64,4 @@ $PostFXManager::Settings::SSAO::sNormalPow = "1";
$PostFXManager::Settings::SSAO::sNormalTol = "0";
$PostFXManager::Settings::SSAO::sRadius = "0.1";
$PostFXManager::Settings::SSAO::sStrength = "6";
$PostFXManager::Settings::ColorCorrectionRamp = "core/scripts/client/postFx/null_color_ramp.png";
$PostFXManager::Settings::ColorCorrectionRamp = "core/scripts/client/postFx/null_color_ramp.png";

7
Templates/Empty/game/scripts/client/default.bind.cs
View file

@ -441,7 +441,12 @@ GlobalActionMap.bind(keyboard, "ctrl o", bringUpOptions);
//------------------------------------------------------------------------------
// Debugging Functions
//------------------------------------------------------------------------------
function showMetrics(%val)
{
if(%val)
metrics("fps gfx shadow sfx terrain groundcover forest net");
}
GlobalActionMap.bind(keyboard, "ctrl F2", showMetrics);
//------------------------------------------------------------------------------
//

6
Templates/Empty/game/scripts/gui/startupGui.cs
View file

@ -45,6 +45,12 @@ function loadStartup()
//SFXPlayOnce(AudioGui, "art/sound/gui/startup");//SFXPlay(startsnd);
}
function StartupGui::onWake(%this)
{
$enableDirectInput = "1";
activateDirectInput();
}
function StartupGui::click(%this)
{
%this.done = true;