Commit graph

343 commits

Author SHA1 Message Date
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
Vincent Gee
ee55d302d8 Fix for 64 bit. 2014-11-30 19:14:20 -05: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
Vincent Gee
2f48f31a6f Fixed String comparisons. 2014-11-05 23:29:08 -05:00
Vincent Gee
26c5451593 fixed capital T 2014-11-05 17:41:31 -05:00
Vincent Gee
f0a16bb9e3 More comments added, move #include 2014-11-05 16:47:07 -05:00
Vincent Gee
d6570e3533 fixed capitalization in include 2014-11-05 10:29:29 -05:00
Daniel Buckmaster
3082bb3adc Merge pull request #884 from GarageGames/development-3.6
Version 3.6.2
2014-11-05 20:28:01 +11:00
Vincent Gee
d3aaabc976 Made fixes 2014-11-04 20:05:39 -05:00
Vincent Gee
a91e5a2590 Improvements to SimDictionary for when you have a large number of objects in the game. Under light load (i.e. under 5000 objects) this code actually runs slower that the stock simdictionary. When you exceed 5000 objects, the template class actually runs faster and more consistently. 2014-11-04 06:30:35 -05:00
Vincent Gee
acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster
b88d3fde1f Merge pull request #829 from jamesu/namespace_link
Add console function to link namespaces
2014-10-28 14:12:46 +11:00
Daniel Buckmaster
a4f7182de5 Fix omissions in astNodes.cpp. 2014-10-28 08:55:17 +11:00
Daniel Buckmaster
81a385094f Merge pull request #842 from eightyeight/console-func-refactor
jamesu's console function refactor
2014-10-24 00:42:58 +11:00
Daniel Buckmaster
2f416290ab Merge pull request #788 from eightyeight/return-status-code
Allow return status to be specified using quitWithStatus
2014-10-24 00:31:05 +11:00
Daniel Buckmaster
4c07c55121 Merge branch 'development' into console-func-refactor
Conflicts:
	Engine/source/console/compiledEval.cpp
2014-10-20 09:29:44 +11:00
Daniel Buckmaster
376db9e097 Merge pull request #705 from andr3wmac/ConsoleReturnFix
Fix for unexpected behavior described in issue #704
2014-10-19 19:45:15 +11:00
bank
c23f3fbd9f Fix initializing return buffer.
Use "bufSize", not the "buf" itself.
2014-10-19 14:30:37 +11:00
James Urquhart
a22254ad0a Add console function to link namespaces 2014-10-14 18:52:02 +01: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
Daniel Buckmaster
0fb7266dbe Merge pull request #148 from eightyeight/simfindobject
Prevented looking up incorrect object handles
2014-10-14 13:56:33 +11:00
LuisAntonRebollo
535f56af6e Merge pull request #801 from eightyeight/gtest-tests
Googletest tests
2014-10-02 01:31:13 +02:00
LuisAntonRebollo
df37afac34 Fix Torque 64 define. 2014-09-26 00:10:14 +02:00
Daniel Buckmaster
9f47032522 Allow return status to be specified using quitWithStatus. 2014-09-24 09:24:29 +10:00
Daniel Buckmaster
6fdebd16f6 Merge remote-tracking branch 'jamesu/simplify_compiler_ast' into x64
Conflicts:
	Engine/source/console/compiler.cpp
	Engine/source/console/compiler.h
2014-09-15 11:50:32 +10:00
LuisAntonRebollo
fcf7bee64a Fix x64 problems for WIN64. 2014-09-14 21:42:51 +02:00
James Urquhart
1e3db968ac Update console.h
Fix typo in version command
2014-09-13 09:02:57 +01:00
James Urquhart
057f91d373 Add vector include in compiler header for CodeStream 2014-09-08 11:27:01 +01:00
James Urquhart
06b463399b Function Call optimization is now optional
(Can cause a problem with package lookups)
2014-09-07 22:49:45 +01:00
James Urquhart
e6ccc26a87 Remove debug instruction dump 2014-09-07 22:07:22 +01:00
James Urquhart
73c51e5d1a Fix leak when freeing compiler stream 2014-09-07 21:49:05 +01:00
James Urquhart
1e44586606 Refactor TS compiler to not use the precompile step & also 64bit support
- Reduces headaches
- Expands STE entry size to allow for 64bit values
- Bonus: Adds in function lookup optimization from T2D
2014-09-07 21:43:56 +01:00
Daniel Buckmaster
5a430af051 Merge remote-tracking branch 'gg/development' into gtest-tests 2014-08-30 17:51:41 +10:00
Areloch
c2da67d473 Fixes the splash screen so that it displays until the game has actually done initial setup and can display GUI elements. This prevents the ugly blank window just sitting there while the GUI loads. 2014-07-15 17:44:19 -05:00
Daniel Buckmaster
523adea85d Ported runtime class rep test. 2014-07-13 10:14:41 +02:00