Commit graph

1186 commits

Author SHA1 Message Date
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
9f15b740ea stops names showing through statics 2015-02-27 20:14:57 -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
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
Adam Beer
1631f76a47 Update winStackWalker.h 2015-02-15 13:18:12 -05:00
LuisAntonRebollo
2eca491961 Fix Bullet compilation. 2015-02-15 12:33:00 +01:00
Dennis Brakhane
b580b4a542 return the result value of scrollVisible
The console function changed from void to bool, so we
should actually return the value.

Also, the missing return is an error in VS2013.
2015-02-14 17:19:11 +01:00
Daniel Buckmaster
7992865525 Merge pull request #1180 from jamesu/math_control_state
Add math control state functions for intel
2015-02-14 23:57:50 +11:00
Daniel Buckmaster
486a12cb96 Merge pull request #1183 from MusicMonkey5555/documentation
Documentation
2015-02-14 19:52:37 +11:00
Daniel Buckmaster
47626684ce Merge pull request #1159 from GarageGames/navigation-default-on
Include navigation and testing modules by default
2015-02-14 19:28:56 +11:00
Daniel Buckmaster
ec06dd78f9 Fix unit tests. 2015-02-14 14:50:32 +11:00
Nathan Bowhay
0a345674ed Fixed spacing issues
Tabs to 3 spaces.
2015-02-12 14:46:07 -08:00
Nathan Bowhay
dd46e800eb Fixed spelling errors
Fixed spelling errors.
2015-02-12 14:14:10 -08:00
Luis Anton Rebollo
24c11eb51c Merge pull request #1190 from Azaezel/TORQUE_NSIGHT_WORKAROUND
nvidia nsight debugger support.
2015-02-12 22:11:36 +01:00
Azaezel
43e0826308 reordered by request 2015-02-12 14:47:39 -06:00