Commit graph

656 commits

Author SHA1 Message Date
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
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
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
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
Daniel Buckmaster 79d896c0f4 Merge pull request #636 from LuisAntonRebollo/fix_cmake_mayor
Fix cmake mayor
2014-05-07 07:54:34 +10:00
LuisAntonRebollo b8b77ef488 Rename CMake "TORQUE_APP_VERSION_MAYOR" to "TORQUE_APP_VERSION_MAJOR" 2014-05-06 17:44:12 +02: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