TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-23 06:04:44 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
676 commits 5 branches 33 tags 958 MiB
Commit graph

676 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Buckmaster f78ea9e057 Merge pull request #711 from eightyeight/use-playerdata-swimforce 
Make use of PlayerData::swimForce
 2014-07-08 14:07:24 +02:00
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
Daniel Buckmaster aa6571330b Merge pull request #688 from rextimmy/vehicle_gamepad_fix 
Vehicle gamepad fix for full template.
 2014-06-12 12:26:09 +10:00
Daniel Buckmaster 8142a3e964 Merge pull request #652 from just-bank/fixed-buf-size 
Use fixed buffer size variable for allocating return buffer
 2014-06-11 21:34:49 +10: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
rextimmy 709bd99ed4 Vehicle gamepad fix for full template. 2014-06-10 09:06:21 +10: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
Thomas Fischer d0a64026b0 removed build status icon 
this is a very bad idea for forks.
 2014-06-02 13:41:00 +02: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 17bd69e659 CMake changes for dedicated builds. 2014-06-02 02:15:55 +02:00
LuisAntonRebollo 8a50895062 Clean CMake files. 2014-06-02 01:35:06 +02:00
LuisAntonRebollo 492f217330 Move CMake library's files to libraries dir. 2014-06-02 01:26:39 +02:00
LuisAntonRebollo bea23eb814 Merge pull request #676 from BeamNG/fix_dedicated_linux 
Fix dedicated Linux build.
 2014-05-30 13:50:45 +02:00
LuisAntonRebollo 6450294855 Fixes for dedicated build on linux. 
Thx @Bloodknigh for Signal fix.
 2014-05-30 12:35:39 +02:00
Thomas Fischer ef4e7ec975 Merge pull request #675 from BeamNG/fix_assertfatal_release_performance 
Fix assertfatal/TORQUE_UNUSED release performance
 2014-05-30 00:22:33 +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 437d968cb2 Merge pull request #672 from BeamNG/cmake_improvements 
Cmake improvements
 2014-05-28 19:46:38 +02:00
LuisAntonRebollo efa3c02291 CMake: Remove unsused variable, and revert a small change. 2014-05-28 19:21:12 +02:00
LuisAntonRebollo 808dcb653c Remove TABs on CMake files. 2014-05-28 17:55:05 +02:00
LuisAntonRebollo 1e06fd2e60 Improvements on CMake generator. 
* Suppress selected warnings on VC.
* Configurable directories (for CI server).
 2014-05-28 13:17:32 +02: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
Daniel Buckmaster 849e8efeae Merge pull request #661 from Azaezel/grenade_decal 
Grenade decal
 2014-05-26 11:57:18 +10: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 5e50d72678 Merge pull request #666 from tdev/cmake_linux_fixes 
CMake linux fixes
 2014-05-24 15:03:37 +02:00
Thomas Fischer b07b971f0f fixed cmake compilation on linux 2014-05-24 15:01:46 +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 2434a82b67 Merge pull request #609 from BeamNG/templates_case_sensitive 
Case-sensitive fixes on template script files for Linux.
 2014-05-23 08:05:14 +02:00
Thomas Fischer a665ac5d2b Merge pull request #610 from BeamNG/templates_glsl_files 
Changes to Templates GLSL files for OpenGL
 2014-05-23 07:56:55 +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
Thomas Fischer 76b70365e7 Merge pull request #662 from LuisAntonRebollo/cmake_missing_modules 
Fixes #625 - Cmake missing modules
 2014-05-23 07:46:28 +02:00
LuisAntonRebollo 62fc2a7e02 Small fixes for CMake modules/libraries. 2014-05-20 23:24:08 +02:00
LuisAntonRebollo 7240c121fc Fix CMake Navigation module. 2014-05-20 00:14:24 +02:00
LuisAntonRebollo 2f7e5bfb73 CMake Razor Hydra module. 2014-05-19 22:55:38 +02:00
LuisAntonRebollo 80f31c0068 CMake Oculus VR module. 2014-05-19 22:43:48 +02:00
LuisAntonRebollo 9ba72e13d4 CMake Navigation module. 2014-05-19 22:17:43 +02:00
LuisAntonRebollo dca11afded Add support for CMake "required definitions" to modules and libraries. 2014-05-19 22:15:22 +02:00
LuisAntonRebollo 82a36d8a32 Add support for modules and libraries to CMake. 2014-05-19 21:44:01 +02:00
Azaezel 10abee5e67 Fix for issue #660 with stated preferred decal. (The more complex example of the two possible.) 2014-05-19 10:18:46 -05:00
LuisAntonRebollo c950ca2c77 Merge pull request #647 from Azaezel/debris_collision 
Debris collision
 2014-05-16 01:02:59 +02:00