Commit graph

979 commits

Author SHA1 Message Date
RichardRanft 6c9cff4c68 Update str.cpp
Fixed copy/paste error - now actually checks the parameter passed in....
2015-05-31 20:42:05 -07:00
RichardRanft 38413be513 Update str.cpp
Effectively copied dStrIsEmtpy() into String::isEmpty().
2015-05-24 22:43:27 -07:00
RichardRanft 3ddd9b8a4c Add static String::isEmpty(const char*) method and use it to verify path for Forest::saveDataFile() is not empty. 2015-05-06 15:39:02 -07:00
Areloch b3170bcddf Merge pull request #1286 from Azaezel/NoMRBit
crash out on net stream leaks.
2015-04-28 00:38:33 -05:00
Daniel Buckmaster 2fbf6bdb9d Removed a space. 2015-04-27 21:30:09 +10:00
Daniel Buckmaster 98fa3d02df Merge remote-tracking branch 'Azaezel/decal_rot_mangle' into development 2015-04-27 21:28:42 +10:00
Azaezel 6201e48501 crash out on net stream leaks.
causes a fatal assertion when bitstream is passed an int value it cannot transmit given the provided bit length, and reports what the value and count were, respectively
2015-04-26 20:25:40 -05:00
Areloch 6e681dd82f Merge pull request #1239 from bpay/asan-fixes
Fix errors flagged by address sanitizer
2015-04-16 21:12:21 -05:00
Azaezel 1ce643cbc8 fix for https://github.com/GarageGames/Torque3D/issues/1262 passes along mAppliedForce found 74a05854d5/Engine/source/T3D/shapeBase.cpp (L1600) like the rest of the classes. mGravityMod left as an exercise to someoone actually working on a vehicle game at present. 2015-03-24 22:59:56 -05:00
Luis Anton Rebollo 68efa70d9c Merge pull request #1245 from BeamNG/fix_glsl_include
Fix GLSL include when file is empty.
2015-03-14 13:31:10 +01:00
LuisAntonRebollo 17f08e9f86 Fix bug on DefineConsoleMethod GuiCanvas::setVideoMode. 2015-03-14 13:01:05 +01:00
Azaezel 6fa44a4e92 further insurance that shadow split stay within bounds. 2015-03-10 06:03:40 -05:00
LuisAntonRebollo e6b7cf108b Fix GLSL include when file is empty. 2015-03-08 23:25:23 +01:00
Luis Anton Rebollo 825912e800 Merge pull request #1223 from Azaezel/detailNormalOrderOfOperations
DeferredBumpFeat order of operations corrections
2015-03-08 22:49:27 +01:00
LuisAntonRebollo ae3128b28b DeferredBumpFeat order of operations corrections. Clean. 2015-03-08 22:30:03 +01:00
Luis Anton Rebollo 7e7025d1ca Merge pull request #1238 from Azaezel/defaultNormal
https://github.com/GarageGames/Torque3D/issues/770 resolution
2015-03-08 22:12:24 +01:00
LuisAntonRebollo 1067da284f Add error msg to Shadergen when GBufferConditioner?LSL::processVert don't have normals defined. 2015-03-08 22:10:22 +01:00
Ben Payne 16af2a126e Add a comment 2015-03-06 15:36:22 -05:00
Ben Payne bd49fe3cb0 Don't call strncpy when src == dest
This fixes an error flagged by address sanitizer
2015-03-04 19:13:53 -05:00
Ben Payne eabff49a6a Fix buffer underrun found with address sanitizer
When subpath is the empty string, the code was reading from subPath[-1]
2015-03-04 19:13:49 -05:00
Azaezel bc32da74ca https://github.com/GarageGames/Torque3D/issues/770 resolution suggested by @LuisAntonRebollo 2015-03-03 23:10:47 -06:00
Daniel Buckmaster 84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Azaezel c84051fc60 typofix for void ColladaAppMesh::lockMesh(F32 t, const MatrixF& objOffset) which was preventing level load. 2015-03-02 00:25:40 -06: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
Daniel Buckmaster baf594aee7 Merge pull request #1006 from BeamNG/fix_lighting_with_zero_lights
Fix lighting errors when all lights are disabled.
2015-03-01 21:06:34 +11:00
Daniel Buckmaster 57eed9c8e4 Amend console stack fixes to work with gcc in Ubuntu x64. 2015-03-01 20:34:16 +11:00
Daniel Buckmaster 6c92ab065e Merge remote-tracking branch 'jamesu/console_stack_fix2' into development
Conflicts:
	Engine/source/console/console.cpp
2015-03-01 20:33:29 +11:00
Daniel Buckmaster 497a15cfd0 Merge pull request #1214 from bpay/cppcheck-cleaning
Fix some issues flagged by cppcheck
2015-03-01 18:27:40 +11:00
Daniel Buckmaster 5118d4bc63 Merge pull request #1230 from Azaezel/notSoShocking
removal of  un-implemented ShockwaveData entries from explosion.
2015-03-01 18:27:21 +11:00
Nathan Bowhay bc31d79da1 Changed type to NetSocket
Changed some S32 types to use the typedef NetSocket since they are a
socket.
2015-03-01 17:20:48 +11:00
Daniel Buckmaster 6822a78fcf Merge pull request #1067 from Lopuska/patch-13
bugfix #1066
2015-03-01 14:17:59 +11:00
Daniel Buckmaster 4aeaad91e7 Merge pull request #1218 from eightyeight/revert-1036
Revert "PR for issue #748"
2015-03-01 14:14:00 +11:00
Daniel Buckmaster 18cc91000e Merge pull request #1220 from eightyeight/fix-#396
Fix #396
2015-03-01 14:13:50 +11:00
Azaezel 0c10ba6833 removal of un-implemented ShockwaveData entries from explosion. 2015-02-27 20:24:47 -06:00
Azaezel 54e1cceda9 Con::executef trampoline had mismatched argc values for the high end 2015-02-26 14:28:21 -06:00
Dennis Brakhane 6d5571e233 Fix preprocessor directive 2015-02-25 21:12:01 +01:00
Azaezel 0325aaf5bb good catch 2015-02-25 12:50:00 -06:00
Azaezel ea29f5203d DeferredBumpFeat order of operations corrections 2015-02-23 15:35:10 -06:00
Ben Payne f67a0353d0 Review fixes 2015-02-23 14:57:37 -05:00
Daniel Buckmaster 02c88201c6 Merge remote-tracking branch 'GuyAllard/aiPlayerTweaks' into development
Conflicts:
	Engine/source/T3D/aiPlayer.cpp
	Engine/source/T3D/aiPlayer.h
2015-02-22 21:51:56 +11:00
Daniel Buckmaster 0bf021280e Regenerate parser. 2015-02-22 14:46:06 +11:00
Daniel Buckmaster 69ffe43b10 Fix docblock parsing rule.
We first require that the first character after a /// not be a newline,
in addition to it not being another /. Then we make the whole contents
of the line optional, so we can handle empty lines.
2015-02-22 14:44:48 +11:00
Daniel Buckmaster ded87c0165 Revert "PR for issue #748"
This reverts commit 8518c85e80.
2015-02-22 12:47:00 +11:00
Daniel Buckmaster 905dd50d36 Merge pull request #980 from Azaezel/gl_debug_callbacks
opengl error reporting formatting
2015-02-22 12:24:30 +11:00
Daniel Buckmaster 61a7342b45 Merge pull request #1216 from eightyeight/fix-vs2008
Fix VS2008 again again
2015-02-22 12:06:43 +11:00
Daniel Buckmaster 686f8d04a5 Merge pull request #1199 from antonyjones67/development
Added NULL check in function findItemByName.
2015-02-22 12:05:06 +11:00
Daniel Buckmaster bddc27c693 Add a temporary local copy of stdint.h for VS2008. 2015-02-22 11:25:19 +11:00
Daniel Buckmaster e9a0975208 Merge pull request #1204 from John3/development
little typo
2015-02-22 10:49:00 +11:00
Ben Payne 3205fea936 Add a comment about an incorrect condition that I'm not sure how to fix 2015-02-20 18:42:34 -05:00
Ben Payne 71a57db507 Fix copy paste error in conditional 2015-02-20 18:42:33 -05:00