TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-22 13:44:44 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1550 commits 5 branches 33 tags 958 MiB
Commit graph

125 commits

Author SHA1 Message Date
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
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 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 54e1cceda9 Con::executef trampoline had mismatched argc values for the high end 2015-02-26 14:28:21 -06: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
Ben Payne 591253d5b5 Fix missing va_end's 2015-02-20 18:42:29 -05: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
Daniel Buckmaster 486a12cb96 Merge pull request #1183 from MusicMonkey5555/documentation 
Documentation
 2015-02-14 19:52:37 +11:00
Nathan Bowhay 0007a518bc Corrected filesize units in return comment 
I may be mistaken but at least in windows I think the return will be in
bytes no KB.
 2015-02-11 09:53:45 -08:00
James Urquhart 97ab694af8 Add extra executef by popular demand 2015-02-10 22:36:09 +00:00
Daniel Buckmaster 7d4aeb8779 Merge pull request #1175 from Azaezel/linkNamespacesDebugOutput 
feedback for *which* namespace is already linked.
 2015-02-10 14:55:14 +11:00
Azaezel fb79d1fec7 formatting 2015-02-09 21:53:44 -06:00
James Urquhart 3f97c2cedd Fix building on GCC 2015-02-09 16:14:14 +00:00
James Urquhart 4a97054f02 Workaround for GCC/LLVM 2015-02-08 11:22:17 +00:00
James Urquhart 1449c4df57 Add some tests for engineAPI and console 2015-02-08 00:08:19 +00:00
James Urquhart 94a46d7123 Regenerate engineAPI.h from a template 2015-02-08 00:08:19 +00:00
James Urquhart f44a3f27d6 Fix stack balancing problems by refactoring execution calls 
- Con::executef now uses a template
- All public execution functions now restore the console stack upon return
- Fixed bad parameters on some callbacks
- Reverts get*Arg behavior
 2015-02-08 00:08:18 +00:00
LuisAntonRebollo 5d49771136 Fix FIELDOFFSET for OSX. 2015-02-07 16:41:55 +01:00
Daniel Buckmaster 014b566014 Merge remote-tracking branch 'gg/development-3.6' into development 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
 2015-01-29 21:17:38 +11:00
Luis Anton Rebollo 6492028bb2 Merge pull request #1035 from bpay/memfixes 
Memfixes
 2015-01-25 13:42:32 +01:00
LuisAntonRebollo 4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
LuisAntonRebollo 3336bffad2 Changes for Linux. 2015-01-19 01:44:36 +01:00
Daniel Buckmaster dd9e416b00 Regenerate flex/bison files. 2015-01-01 10:33:50 +11:00
Daniel Buckmaster 5a66f00697 Use a buffer on the stack. 2015-01-01 10:33:35 +11:00
Daniel Buckmaster 170a4ea08f Add anonymous functions before other statements. 2014-12-29 22:44:57 +11:00
Daniel Buckmaster 412247c401 Regenerate lex/bison files. 2014-12-29 21:50:11 +11:00
Daniel Buckmaster 1204b81a78 Added anomymous functions as in Konrad Kiss's resource. 2014-12-29 21:49:52 +11:00
Daniel Buckmaster ae284a89ec Merge branch 'development' into defineconsolemethod 
Conflicts:
	Engine/source/materials/materialDefinition.cpp
 2014-12-26 13:22:16 +11:00
Daniel Buckmaster c85ac03c16 Merge pull request #1020 from eightyeight/simdictionary-improvement 
SimDictionary improvement
 2014-12-24 09:54:54 +11:00
Daniel Buckmaster 859514a792 Guard against null pointers and remove unnecessary include. 2014-12-24 08:34:30 +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
Azaezel 793d7bf856 feedback for *which* namespace is already linked. should probably look into enhancing assertwarn to be able to take a formatted string at some point... 2014-12-22 11:05:00 -06: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
Ben Payne de7101dec2 Fix mismatched free 
Memory was allocated with new on line 304
 2014-12-13 16:08:47 -05:00
Areloch 8518c85e80 PR for issue #748 2014-12-11 22:17:55 -06:00
Ben Payne 81e7dafb94 Fix delete of malloc'ed memory 2014-12-11 17:24:40 -05:00
James Urquhart bfca94da5c Initialize mResetLocked too 2014-12-10 11:37:50 +00:00
Daniel Buckmaster 7004ec627e Use find instead of [] and call StringTable->insert less. 2014-12-10 14:04:26 +11:00
James Urquhart 82fd1794e6 Fix issue where console stack values were getting overwritten inside a C++ function 2014-12-10 00:42:06 +00:00
Daniel Buckmaster 116276a105 Tweaks so I'm happy with it. 
* Change #define usage
 * Fix tabs
 2014-12-08 10:20:38 +11:00
Azaezel 4ea051a939 tabs 2014-11-20 14:38:17 -06:00
Azaezel 1c4cc888f8 fix for issue #953, courtesy of @jamesu. trace buffer was truncating values. 2014-11-20 14:20:54 -06:00
Azaezel 3039f4399d eval(methodWithReturnValue) wasn't passing along it's return value though the stringstack.fix courtessy of @jamesu 2014-11-20 14:17:59 -06:00