Commit graph

36 commits

Author SHA1 Message Date
Daniel Buckmaster 4721181d44 Merge pull request #1361 from Azaezel/BulletBreak1
adds minimum displacement check prior to convexSweepTest to avoid NaNs
2015-07-27 12:20:33 +10:00
Azaezel edce2cc566 adds minimum displacement check prior to convexSweepTest to avoid NaNs 2015-07-17 14:28:30 -05:00
Azaezel e9a1d2158b BulletCrashfix2
Removes fatal assertion on duplicated object collisions (meshroads, primarily)
2015-07-17 14:25:01 -05:00
Daniel Buckmaster 84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Daniel Buckmaster 33fcc59543 Merge remote-tracking branch 'origin/style-cleanup' into development
Conflicts:
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/tsMesh.cpp
	Engine/source/ts/tsShape.cpp
2015-03-01 22:30:22 +11:00
LuisAntonRebollo 2eca491961 Fix Bullet compilation. 2015-02-15 12:33:00 +01:00
Daniel Buckmaster e9308e40ed Merge pull request #998 from rextimmy/physx3_cpu_dispatcher_fix
Fixed issue where physx3 cpu dispatcher was created multiple times
2014-12-29 14:14:05 +11:00
Daniel Buckmaster 3ab048c5b0 Fixes after feedback from Luis.
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
2014-12-23 18:48:02 +11:00
Daniel Buckmaster 9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod
Conflicts:
	Engine/source/T3D/missionMarker.cpp
2014-12-21 21:23:55 +11:00
Daniel Buckmaster 33ff180593 Merge branch 'development' into style-cleanup
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
2014-12-15 12:15:55 +11:00
rextimmy 880642060e Fixed issue where physx3 cpu dispatcher was created multiple times 2014-12-01 12:39:46 +10:00
Daniel Buckmaster a0e1fca057 Merge pull request #685 from rextimmy/physx3_basic
Physx3 Physics Plugin
2014-11-29 20:05:08 +11:00
rextimmy 664595ef9e - Fixed memory leak when creating terrain with physx 3
- Fixed terrain tessellation with physx 3
2014-11-08 14:08:59 +10:00
Vincent Gee acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster b507dc9555 Merge branch 'master' into console-func-refactor
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
2014-10-14 15:09:11 +11:00
LuisAntonRebollo 4a6384486c Merge pull request #689 from rextimmy/forest_physx2_fix
Physx 2.8 actor release fix
2014-10-02 01:05:11 +02:00
rextimmy 8f550d5f8c Changed method of releasing a physics body with physx 2.8 2014-06-10 21:27:17 +10:00
rextimmy 1ca3190994 Removed old px3Cast 2014-06-07 12:23:12 +10:00
rextimmy 87ba9a7084 code cleanup 2014-06-07 12:11:44 +10:00
rextimmy d58a69e76c Merge remote-tracking branch 'GarageGames/development' into physx3_basic 2014-06-06 22:40:14 +10: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
bank 69dbaf5b85 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSShape 2014-05-13 14:08:42 +04:00
Thomas Fischer 29d7fe310d Merge pull request #583 from tdev/x64_basics
windows 64 bit basics
2014-03-18 00:51:58 +01:00
Thomas Fischer 022b15720b Merge pull request #548 from asmaloney/more_fixes
More fixes
2014-03-15 15:14:11 +01:00
Thomas Fischer 6d8e0d7e25 refactored platform precompiler variable: TORQUE_OS_WIN{32,64,} 2014-03-15 15:10:14 +01:00
rextimmy d4b189e175 PhysX3 basic plugin. 2014-02-28 12:11:26 +10:00
DavidWyand-GG cff2ab046a Bullet physics applyImpulse() fix
Bullet physics requires a local origin be passed into it's
applyImpulse() rather than a world origin.
2014-02-09 18:10:53 -05:00
Andy Maloney d63b820e35 More fixes
- check for an empty shapName, not just a NULL one twice
 - fix "&s" in printf
 - fix potential memory leak
 - GFXCopyPixels wasn't checking the height properly which could result in some meory corruption unpleasantness
2013-12-04 16:56:26 -05:00
DavidWyand-GG ca57db1e23 Fix for Bullet frustum reference
Update to Bullet physics to account for latest SceneRenderState frustum
changes.
2013-11-13 11:41:22 -05:00
Robert Pierce 44b5b85b2c Update pxMultiActor.cpp
Fixed PhysX compile issue on VS2010 ("'FS' : is not a class or namespace name")

In reference to http://www.garagegames.com/community/forums/viewthread/135499
2013-11-01 11:36:26 -04:00
Robert Fritzen 171a24459f Remove namespace from header
Removing the "using namespace Torque" from header file to prevent issues
with certain engine addons conflicting with ::UUID defined by windows
and Torque::UUID defined by T3D.
2013-07-28 12:55:52 -05:00
DavidWyand-GG 59aaaf1892 Merge branch 'consolefuncrefactor' of https://github.com/jamesu/Torque3D into consolefuncrefactor 2013-01-07 12:09:22 -05:00
DavidWyand-GG 89ad23a925 Fix for Issue #96 for DAE updating crash 2012-10-17 14:45:13 -04:00
jamesu 08d4f6ebc0 Improvements to console refactor code
- Prevent stack corruption in a few places
- Use correct type in printfs
- Reduce type conversions in EngineApi & dAto*
- Fix compilation on GCC
- Tidy up code
2012-10-12 19:12:06 +01:00
bank d2700f881c Source changes needed for Linux build. 2012-09-23 15:31:56 +04:00
DavidWyand-GG 7dbfe6994d Engine directory for ticket #1 2012-09-19 11:15:01 -04:00