Commit graph

961 commits

Author SHA1 Message Date
Ben Payne
01471c9ef3 Fix member function visibility 2015-03-04 19:25:10 -05:00
Ben Payne
da4078c707 Fix passing of non-primitive types to varargs functions 2015-03-04 19:25:09 -05:00
Ben Payne
7d809a0d28 Fix ill-formed sizeof's 2015-03-04 19:25:08 -05:00
Ben Payne
27e6649413 Fix ill-formed #else 2015-03-04 19:24:55 -05:00
Ben Payne
62fa40380b Fixes for "incomplete type" errors when compiling with clang-cl 2015-03-04 19:10:56 -05:00
Ben Payne
6040a8d855 Fix macro token pasting errors when compiling with clang-cl 2015-03-04 19:10:53 -05: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
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
Ben Payne
8862bc2f3a Pass by const reference 2015-02-20 18:42:32 -05:00
Ben Payne
be0b9728e5 Don't self-assign 2015-02-20 18:42:32 -05:00
Ben Payne
b721288d6b Use the wonderful empty() member instead of abusing size() 2015-02-20 18:42:31 -05:00
Ben Payne
364dd3634d Remove dead code that contains a delete of an uninitialized pointer 2015-02-20 18:42:30 -05:00
Ben Payne
55ac3dca70 Fix assignment operator 2015-02-20 18:42:30 -05:00
Ben Payne
591253d5b5 Fix missing va_end's 2015-02-20 18:42:29 -05:00
Ben Payne
0ffd7f5620 Fix member vars left uninitialized in constructors 2015-02-20 18:41:51 -05:00
Areloch
3fe0fe1b92 Merge pull request #1000 from Winterleaf/FMod-64bit-fix
FMod switching DLLS if 64 bit.
2015-02-20 00:42:05 -06:00
John3
2b00231c74 Merge branch 'development' of https://github.com/GarageGames/Torque3D into development 2015-02-19 21:04:48 -06:00
Daniel Buckmaster
3ed6dfb374 Merge pull request #1200 from adambeer/minidumpfix
Fix for minidump support
2015-02-20 13:05:51 +11:00
James Urquhart
942c7a48f4 Fix corruption issue with string iterator was using an absolute pointer. Also adds a special relative pointer type for constructed strings on the stack. 2015-02-16 21:23:42 +00:00
John3
50e2221a40 little typo 2015-02-15 16:15:45 -06:00
Luis Anton Rebollo
098fa19abb Merge pull request #1014 from Lopuska/patch-1
vSync on opengl
2015-02-15 23:02:32 +01:00
Luis Anton Rebollo
8da9b7461f Merge pull request #1085 from Azaezel/DX9CubemapMips
cubemap Mip retrieval-DX
2015-02-15 22:55:11 +01:00
Azaezel
da706ccb61 proper fix for https://github.com/GarageGames/Torque3D/issues/1197
courtesy @LuisAntonRebollo
2015-02-15 15:20:32 -06:00
LuisAntonRebollo
1f8dc19fbe Fix non OpenGL builds with old projects. 2015-02-15 20:27:46 +01:00
Antony Jones
d2d1f6086e Added NULL check in function findItemByName.
(cherry picked from commit adb2513a2461092486e00b5550bf57fb83d0ccac)
2015-02-15 11:15:10 -08:00