Commit graph

74 commits

Author SHA1 Message Date
Azaezel fb79d1fec7 formatting 2015-02-09 21:53:44 -06: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
James Urquhart bfca94da5c Initialize mResetLocked too 2014-12-10 11:37:50 +00: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
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
Daniel Buckmaster 3082bb3adc Merge pull request #884 from GarageGames/development-3.6
Version 3.6.2
2014-11-05 20:28:01 +11: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
Andrew Mac b661abaf83 Fix for unexpected behavior described in issue #704 2014-06-23 14:58:06 -03:00
LuisAntonRebollo 4fe6072f03 Merge pull request #681 from BeamNG/fix_cmake_linux_dedicated
Fix CMake linux dedicated on gcc and Clang
2014-06-15 11:32:49 +02:00
bank f3fc84738b Use fixed buffer size var when allocating return buffer from console.
Conflicts:
	Engine/source/T3D/missionArea.cpp
	Engine/source/gui/editor/guiDebugger.cpp
2014-06-11 13:09:55 +04:00
LuisAntonRebollo 1f085a8cd2 Fix error on Clang compiler: 'ival' is a protected member of 'Dictionary::Entry' 2014-06-02 12:37:06 +02:00
LuisAntonRebollo 82bb19e1b5 Fix for error on Clang compiler: reinterpret_cast from 'const void *' to 'FunctionType *' (aka 'void (*)(EngineObject *, const char *, const char *)') casts away qualifiers
return R( reinterpret_cast< FunctionType const* >( /*const_cast<void*>*/(mFn) )( mThis, a, b ) );
2014-06-02 02:18:59 +02:00
Thomas Fischer cd978039ac Merge pull request #635 from just-bank/engine-fixes
Various engine fixes
2014-05-23 14:09:00 +02:00
Daniel Buckmaster 7a517d3cb1 Merge pull request #613 from lukaspj/T2DColors
T2D style 'Stock colors'
2014-05-13 10:03:26 +10:00
Daniel Buckmaster 1702573b78 Merge pull request #612 from GarageGames/platform-type-consistency
Platform type consistency
2014-05-10 11:40:40 +10:00
bank 6d176cf8db Rename local variable to prevent confusion with member variable. 2014-05-06 15:39:21 +04:00
bank b0fcc91058 Fix: removed 'virtual' for classes which doesn't have child. 2014-05-06 12:40:47 +04:00
bank e7eab10ad5 Corrected the use of #pragma warning()
We should use #pragma warning(push/pop) instead of (default: X)
2014-05-06 12:40:41 +04:00
Lukas Jørgensen 9ebfd0f6b3 T2D style 'Stock colors'
This commit implements stock colors as they are implemented in T2D.
It allows for using predefined stock colors e.g.:
``` %object.color = "OrangeRed"; ```
Instead of
``` %object.color = "255 69 0"; ```
2014-05-06 09:26:01 +02:00
Daniel Buckmaster 66a73708ec Merge pull request #614 from lukaspj/UnnecessaryParamter
Removed unnecessary parameter in a simObject getter method
2014-04-18 10:50:45 +10:00
Lukas Jørgensen 9fbdf64bd9 Removed unnecessary parameter in a simObject getter method 2014-04-15 11:50:34 +02:00
Daniel Buckmaster 87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
2014-04-04 13:43:25 +11:00
Thomas Fischer 29d7fe310d Merge pull request #583 from tdev/x64_basics
windows 64 bit basics
2014-03-18 00:51:58 +01:00
Thomas Fischer 7239c791f2 Merge pull request #581 from tdev/vs2012_fixes
Visual Studio 2012 32Bit Level 4 Warning fixes
2014-03-17 10:02:19 +01:00
Thomas Fischer 6d8e0d7e25 refactored platform precompiler variable: TORQUE_OS_WIN{32,64,} 2014-03-15 15:10:14 +01:00