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

Merge branch 'development' into ueberengine-dev

Browse source
This commit is contained in:
duion 2015-04-24 23:00:29 +02:00
commit cc50147ebc
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/T3D/vehicles/wheeledVehicle.cpp
View file

@ -1086,6 +1086,9 @@ void WheeledVehicle::updateForces(F32 dt)
if (mJetting) if (mJetting)
mRigid.force += by * mDataBlock->jetForce; mRigid.force += by * mDataBlock->jetForce;
// Add in force from physical zones...
mRigid.force += mAppliedForce;
// Container drag & buoyancy // Container drag & buoyancy
mRigid.force += Point3F(0, 0, -mBuoyancy * sWheeledVehicleGravity * mRigid.mass); mRigid.force += Point3F(0, 0, -mBuoyancy * sWheeledVehicleGravity * mRigid.mass);
mRigid.force -= mRigid.linVelocity * mDrag; mRigid.force -= mRigid.linVelocity * mDrag;

6
Engine/source/gui/controls/guiTextCtrl.cpp
View file

@ -187,8 +187,10 @@ void GuiTextCtrl::setText(const char *txt)
//make sure we don't call this before onAdd(); //make sure we don't call this before onAdd();
if( !mProfile ) if( !mProfile )
return; return;
if (txt) // The txt pointer is sometimes the same as the mText pointer, so make sure
// we don't call strncpy with overlapping src and dest.
if (txt && txt != mText)
dStrncpy(mText, (UTF8*)txt, MAX_STRING_LENGTH); dStrncpy(mText, (UTF8*)txt, MAX_STRING_LENGTH);
mText[MAX_STRING_LENGTH] = '\0'; mText[MAX_STRING_LENGTH] = '\0';

6
Engine/source/platformWin32/winFileio.cpp
View file

@ -1306,8 +1306,10 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve
// Compose our search string - Format : ([path]/[subpath]/*) // Compose our search string - Format : ([path]/[subpath]/*)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
char trail = basePath[ dStrlen(basePath) - 1 ]; dsize_t trLen = basePath ? dStrlen(basePath) : 0;
char subTrail = subPath ? subPath[ dStrlen(subPath) - 1 ] : '\0'; dsize_t subtrLen = subPath ? dStrlen(subPath) : 0;
char trail = trLen > 0 ? basePath[ trLen - 1 ] : '\0';
char subTrail = subtrLen > 0 ? subPath[ subtrLen - 1 ] : '\0';
if( trail == '/' ) if( trail == '/' )
{ {

1
Templates/Full/game/scripts/client/init.cs
View file

@ -72,7 +72,6 @@ function initClient()
configureCanvas(); configureCanvas();
// Load up the Game GUIs // Load up the Game GUIs
exec("art/gui/defaultGameProfiles.cs");
exec("art/gui/playGui.gui"); exec("art/gui/playGui.gui");
exec("art/gui/chatHud.gui"); exec("art/gui/chatHud.gui");
exec("art/gui/playerList.gui"); exec("art/gui/playerList.gui");