Commit graph

356 commits

Author SHA1 Message Date
Daniel Buckmaster 3f687d8f43 Make use of PlayerData::swimForce 2014-07-01 18:14:08 +02:00
Daniel Buckmaster feec36731e Merge pull request #594 from LuisAntonRebollo/unit-tests-without-crash
Increased stability Torque3D: unit-tests running without a crash.
2014-06-16 10:57:04 +10:00
LuisAntonRebollo 4fcdc04214 Merge pull request #674 from eightyeight/fix-tsignal-mtriggernext
Fix SignalBase constructor shenanigans
2014-06-15 21:24:38 +02:00
LuisAntonRebollo 4fe6072f03 Merge pull request #681 from BeamNG/fix_cmake_linux_dedicated
Fix CMake linux dedicated on gcc and Clang
2014-06-15 11:32:49 +02:00
LuisAntonRebollo a90be04041 Merge pull request #687 from eightyeight/procedural-terrain-coverage
Add coverage option to procedural terrain generator
2014-06-15 11:31:40 +02:00
bank f3fc84738b Use fixed buffer size var when allocating return buffer from console.
Conflicts:
	Engine/source/T3D/missionArea.cpp
	Engine/source/gui/editor/guiDebugger.cpp
2014-06-11 13:09:55 +04:00
Daniel Buckmaster de6e5e20b7 Fix random number generation. 2014-06-09 22:59:16 +10:00
Daniel Buckmaster 05e6fbf3d6 Merge remote-tracking branch 'JackDavidson/master' into procedural-terrain-coverage 2014-06-09 21:43:57 +10:00
LuisAntonRebollo 1f085a8cd2 Fix error on Clang compiler: 'ival' is a protected member of 'Dictionary::Entry' 2014-06-02 12:37:06 +02:00
LuisAntonRebollo 82bb19e1b5 Fix for error on Clang compiler: reinterpret_cast from 'const void *' to 'FunctionType *' (aka 'void (*)(EngineObject *, const char *, const char *)') casts away qualifiers
return R( reinterpret_cast< FunctionType const* >( /*const_cast<void*>*/(mFn) )( mThis, a, b ) );
2014-06-02 02:18:59 +02:00
LuisAntonRebollo 6450294855 Fixes for dedicated build on linux.
Thx @Bloodknigh for Signal fix.
2014-05-30 12:35:39 +02:00
LuisAntonRebollo ac96ac7568 Fix AssertFatal/TORQUE_UNUSED are not optimized on release build causing performance problems.
http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
> "Both gcc and MSVC are smart enough to optimize out the evaluation of x, but only if they can determine if  there are no side effects associated with the evaluation.  Unfortunately, this can only be done if the body of x is known entirely to the compiler.  If x is a function call to another module MSVC can still make it go away with Link-Time Code Generation (via cross-module inlining), but poor gcc is dead in the water and emits the call.  Either way, we’re relying on compiler and linker optimizations to make this code go away."
2014-05-30 00:16:43 +02:00
Daniel Buckmaster 2a1a412d74 Don't assign NULL to a Vector. 2014-05-29 17:40:57 +10:00
Thomas Fischer 46b213f828 Merge pull request #668 from BeamNG/fix_stringtable_zero_division
Fix for avoid a zero division on _StringTable::resize.
2014-05-26 08:38:19 +02:00
Thomas Fischer 8c00e79ded Merge pull request #669 from BeamNG/fix_ALDeviceList_GetDeviceVersion
Fix ALDeviceList::GetDeviceVersion incorrect check of valid pointer.
2014-05-25 18:42:58 +02:00
Thomas Fischer 353ecb5961 Merge pull request #670 from BeamNG/fix_string_dereference_null_ptr
Fix Dereference of null pointer on String::operator+=
2014-05-25 18:42:23 +02:00
LuisAntonRebollo 18ba0646c0 Increased stability Torqu3D: unit-tests running without a crash. See the console.log after ran unitTest_runTests( "", true ). @signmotion 2014-05-25 16:50:19 +02:00
Thomas Fischer cd978039ac Merge pull request #635 from just-bank/engine-fixes
Various engine fixes
2014-05-23 14:09:00 +02:00
Thomas Fischer 00bec88f39 Merge pull request #617 from BeamNG/ScatterSkyVertex_color_decl
Fix ScatterSkyVertex::color declaration.
2014-05-23 08:11:22 +02:00
Thomas Fischer 4d7ffad284 Merge pull request #619 from BeamNG/gfxshader_init_ordered_samplers
Add GFXShader::init with support for ordered vector of sampler names for shader.
2014-05-23 07:54:24 +02:00
Thomas Fischer c850d60a4f Merge pull request #621 from BeamNG/glsl_shadergen
Update GLSL Shadergen.
2014-05-23 07:52:35 +02:00
LuisAntonRebollo c950ca2c77 Merge pull request #647 from Azaezel/debris_collision
Debris collision
2014-05-16 01:02:59 +02:00
LuisAntonRebollo 6f673e624d Merge pull request #641 from Azaezel/projectile_decal
Projectile decal
2014-05-16 00:27:42 +02:00
Azaezel 4e203f21b3 debris collision mask expanded so that it also hits buildings and the like. 2014-05-13 17:40:25 -05:00
Thomas Fischer 08e6b261a3 Merge pull request #628 from BeamNG/fix_cmake_crash_on_t3d_exit
Fix crash on exit T3D when build with CMake.
2014-05-13 09:12:33 +02:00
Daniel Buckmaster 7a517d3cb1 Merge pull request #613 from lukaspj/T2DColors
T2D style 'Stock colors'
2014-05-13 10:03:26 +10:00
Azaezel a33e500b8d alters projectile decal application so that it picks a random rotAroundNormal when adding it to a scene. (keeps em from always pointing north or up) 2014-05-12 16:37:25 -05:00
Lukas Joergensen 4de9bd4e85 Initialize StockColors
This commit makes sure the StockColors are initialized and destroyed, using
the module system.
2014-05-12 11:01:04 +02:00
LuisAntonRebollo 8e2fca11c3 Fix ALDeviceList::GetDeviceVersion incorrect check of valid pointer. 2014-05-11 19:54:11 +02:00
LuisAntonRebollo 32a73f9eb2 Fix Dereference of null pointer on String::operator+=. 2014-05-11 19:46:43 +02:00
LuisAntonRebollo e6e225e081 Fix for avoid a zero division on _StringTable::resize. 2014-05-11 19:39:50 +02:00
Daniel Buckmaster 47dbce1499 Merge pull request #632 from eightyeight/better-explosion-example
Added a better example of using Explosion in a client/server fashion
2014-05-11 13:22:28 +10:00
Daniel Buckmaster 1702573b78 Merge pull request #612 from GarageGames/platform-type-consistency
Platform type consistency
2014-05-10 11:40:40 +10:00
Daniel Buckmaster f69eccfdb4 Merge pull request #600 from BeamNG/rename_Status
Rename Status enum for avoid conficts on Linux.
2014-05-10 11:01:28 +10:00
Daniel Buckmaster a42c92391a Merge pull request #601 from BeamNG/rename_GFXTextureProfile_None
Rename enum GFXTextureProfile::None for avoid conficts on Linux.
2014-05-10 11:01:18 +10:00
Andrew Mac 704dc47bdb Merge pull request #602 from Azaezel/Simpler_ShapeBase1
removes non-functional shield and invincibility functionality.
2014-05-08 23:39:33 -03:00
bank 5c986f755a Fix: Bit shifting of the 32-bit value with a subsequent expansion to the 64-bit type.
We now shift the 64-bit value, which is now treated correctly.
2014-05-06 15:39:24 +04:00
bank 6275942acb Fix GuiTreeViewCtrl: we should use the member var, removed local decl. 2014-05-06 15:39:22 +04:00
bank 6d176cf8db Rename local variable to prevent confusion with member variable. 2014-05-06 15:39:21 +04:00
bank a7756b5591 Renamed local variable so it doesn't interfere with the provided argument.
String errorStr should be filled in only when ::preload returns false.
2014-05-06 15:35:52 +04:00
bank b0fcc91058 Fix: removed 'virtual' for classes which doesn't have child. 2014-05-06 12:40:47 +04:00
bank e7fb6a54de Fix: Added missing virtual destructors for classes with virtual functions. 2014-05-06 12:40:46 +04:00
bank 68b12981ae Fix: dSprintf should receive size of the buffer, not the size of the pointer.
It was safe, as we are using static console return buffer,
which is large enough to hold enough data (default is 2048).
2014-05-06 12:40:45 +04:00
bank c7a5a12080 Fix wrong check for bits (using '&&' instead of '&'). 2014-05-06 12:40:44 +04:00
bank 15bad30b2c Fix: Underflow of the buffer 'ctx'.
memset function should not receive sizeof of the pointer.
2014-05-06 12:40:43 +04:00
bank 9f2d44966e Fix: Some compilers do not auto-cast String and Path classes to (char *). 2014-05-06 12:40:43 +04:00
bank e6673eaf30 Fix: the string literal is implicitly casted to the bool type. 2014-05-06 12:40:42 +04:00
bank e7eab10ad5 Corrected the use of #pragma warning()
We should use #pragma warning(push/pop) instead of (default: X)
2014-05-06 12:40:41 +04:00
bank ff3d72747e Fix FixedSizeVector() initialization.
mArray[6] was never assigned (ownerless experssion).
2014-05-06 12:40:40 +04:00
bank b2e6895554 Fix: preload() method on datablocks should always set errorStr when returning false.
Otherwise it will dump the previous error message (content of the errorStr).
2014-05-06 12:40:40 +04:00