TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-26 07:34:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4572 commits 5 branches 33 tags 958 MiB
Commit graph

375 commits

Author SHA1 Message Date
Daniel Buckmaster 486a12cb96 Merge pull request #1183 from MusicMonkey5555/documentation 
Documentation
 2015-02-14 19:52:37 +11:00
Nathan Bowhay 02f859c150 Fixed spacing to fit GG standards. 
Fixed tabs to 3 spaces.
 2015-02-11 10:53:34 -08: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
Ben Payne c19a70814c Tidy up and fix the various Assert macros 
Rephrase the macros so that they can be used in expressions, and
properly require semicolons. And add the semicolons where missing.
 2015-02-02 18:37:48 -05:00
Nathan Bowhay 42126937e6 Fixed warning 
Fixed a compile warning about casting.
 2015-01-29 14:53:20 -08:00
Nathan Bowhay d5a6e15cfe Fixed comment 
fixed an incomplete comment/documentation for displaySplashWindow.
 2015-01-29 14:43:02 -08:00
Nathan Bowhay 62b5c9fcfd Fixed issue with string replace 
String replace doesn't always work correctly this fixes it.
 2015-01-29 14:42:28 -08:00
Nathan Bowhay df2ca75b13 get max dynamic verts in script 
you can now get the max dynamic vertices in script.
 2015-01-29 12:02:40 -08:00
Nathan Bowhay 5cfcb0cd45 fixed comment 
added path param documentation to display splash window.
 2015-01-29 11:59:06 -08:00
Nathan Bowhay 55b91606e6 Added more token functions 
Added a bunch more token functions and added comments to word
equivalents to let you know about the token version.
 2015-01-29 11:54:44 -08:00
Nathan Bowhay 6a5fd4eceb date number to string 
added month and week number to string console functions.
 2015-01-29 11:53:25 -08:00
Nathan Bowhay 2d7472d160 add case sensitive strings 
Added case sensitive strings function to add them to the string table.
 2015-01-29 11:51:05 -08:00
Nathan Bowhay 14037a742a Added string manipulation functions 
added some string manipulation functions, some are slightly different
versions of existing functions.
 2015-01-29 11:48:15 -08:00
Nathan Bowhay 39d5563a8c Added type checking functions 
added some type checking functions to TorqueScript.
 2015-01-29 11:40:45 -08: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
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
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
bank cf3eb26e6f Rename all member variables to follow the style guidelines (prefixed with the 'm') - class CodeBlock 2014-05-12 17:52:19 +04: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
Thomas Fischer 8c25dc8b18 reverted fileno change, MSVS specific API changes follow in another PR 2014-03-15 12:57:47 +01:00
Thomas Fischer 489106ae5e replaced UNUSED and assert combination by a fixed up assert macro - thanks luis! :) 2014-03-15 12:50:38 +01:00
Thomas Fischer 2844ab6912 more VS2012 L4 warning fixes 2014-03-15 11:51:36 +01:00
Thomas Fischer 502e346eb6 visual studio 2012 Level 4 warning fixes 2014-03-15 11:38:53 +01:00
Andrey Syrokomsky e718420226 - Corrected docs for scripts in the group FileSystem: fileBase() and fileName(). 2013-12-26 09:24:17 +02:00
DavidWyand-GG 4717f22916 Fix for ArrayObject sorting 
- This is a fix for issue
https://github.com/GarageGames/Torque3D/issues/228
- This fixes sortna() and sortnd() as outlined in the issue.
- This also fixes sortnka() and sortnkd(), as well as the sorting method
that take a console function as a parameter.
 2013-11-11 18:51:53 -05:00
cpusci 79c9a21e32 Just making sure the error output is consistent with the other errors. 2013-08-05 06:20:44 -05:00
cpusci 4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
cpusci 21ff1e26bb If you name a torque script object the same name as a Torque script class, you will get heap corruption with no warning at all. Changed original fix to cause a script error and reject object creation, instead of just renaming the object and moving along. 2013-08-04 08:50:56 -05:00
bank 9f2b0bcaf4 Fix engine API copy/paste errors (typo). 2013-02-28 23:50:57 +04:00
DavidWyand-GG 2824bcf649 Remove hard coded paths pass 1 
- displaySplashWindow() now takes an optional path to a bitmap file.
- Missing, unavailable and warning texture paths now come from
GFXTextureManager static methods.
 2013-01-30 14:09:23 -05:00
DavidWyand-GG 539efcb1e1 Input event changes 
- New InputEventManager class.  It will be used by 3rd party input
devices to generate Torque 3D input events.
- Expanded the input event signal to include three new floats and a new
integer.
- Expanded the number of joystick buttons to 48.
- The input virtual map is now extendable rather than hard coded.
- The input devices types are now extendable rather than hard coded.
- New SI_POS, SI_ROT, SI_INT, and SI_FLOAT input event types.
- New SI_VALUE input action type.
- ActionMap has been updated to work with these changes.
- Removed unnecessary references to platform/event.h
 2013-01-22 18:17:41 -05:00
DavidWyand-GG b56f8674cd New ScriptTickObject 
ScriptTickObject is a ScriptObject that adds callbacks for tick and
frame events.  Use setProcessTicks() to enable or disable the
onInterpolateTick() and onProcessTick() callbacks.  The
callOnAdvanceTime property determines if the onAdvanceTime() callback is
called.
 2013-01-22 17:09:14 -05:00
DavidWyand-GG 59aaaf1892 Merge branch 'consolefuncrefactor' of https://github.com/jamesu/Torque3D into consolefuncrefactor 2013-01-07 12:09:22 -05:00
Tim Newell 0d3a0f88e6 Bug fix for loading compiled dsos 2012-12-15 15:48:24 -05:00
Daniel Buckmaster 46f140710a Prevented looking up incorrect object handles. 
Previously, dAtoi would be called on arbitrary strings delimited
only by the / character. Now, Sim::findObject actually checks that
object handles (strings starting with a digit) actually only contain
digits or slashes.
 2012-11-20 08:18:14 +11:00
jamesu 98b92360f9 Signed values now set/get from the float value. Also add a bool helper. 2012-11-09 23:00:46 +00:00
DavidWyand-GG deba1b3728 Fix for Issue #120 for Inverted ArrayObject Sort 2012-11-07 19:45:40 -05:00
jamesu 8a15133a61 Add new instructions to the instruction dumper 2012-10-19 23:44:59 +01:00
jamesu 08d4f6ebc0 Improvements to console refactor code 
- Prevent stack corruption in a few places
- Use correct type in printfs
- Reduce type conversions in EngineApi & dAto*
- Fix compilation on GCC
- Tidy up code
 2012-10-12 19:12:06 +01:00
James Urquhart e99eadd61f Optimize variable-to-variable assignment 2012-10-12 18:57:28 +01:00
James Urquhart 38c8e52c1d Beginnings of the "pass everything using a native type wrapper" console code. 
- ConsoleValue class is now the base value class.
- ConsoleValueRef is now used to supply function parameters. Values are disposable.
- Script functions return values instead of just strings where possible.
- Variables can be disposable strings
- Bytecode changed

Fix the issues with console method parameters and fields which prevented missions from loading.
 2012-10-12 18:56:17 +01:00
bank d2700f881c Source changes needed for Linux build. 2012-09-23 15:31:56 +04:00
DavidWyand-GG 7dbfe6994d Engine directory for ticket #1 2012-09-19 11:15:01 -04:00