Commit graph

1652 commits

Author SHA1 Message Date
Daniel Buckmaster
2c0b941b31 Formatting. 2015-02-07 13:20:23 +11:00
Daniel Buckmaster
877aadd68e 64-bit is more common and works fine. 2015-02-07 13:20:10 +11:00
Nathan Bowhay
4f87422392 Added console method docs and removed function
Added a ton of console method documenation and removed
getSelectionCentroidText when you can just use a Point3F as the return
type.
2015-02-02 16:27:03 -08:00
Nathan Bowhay
1ce846d235 add & delete object documentation
added add & delete object console method documentation.
2015-02-02 16:07:15 -08:00
Nathan Bowhay
72a0aed154 Some small console method docs
Added a little documentation to a console method.
2015-02-02 16:04:50 -08:00
Nathan Bowhay
881f9abeb6 Added console method docs
Added more console method documentation and made parameter names more
descriptive.
2015-02-02 15:39:11 -08:00
Nathan Bowhay
dd9b788ab4 More console method docs
More documentation for console methods in doxygen format.
2015-02-02 15:31:38 -08:00
Nathan Bowhay
a6510190bb Added a bit more documentation
Added a little more documentation to some console methods.
2015-02-02 15:30:07 -08:00
Nathan Bowhay
879dbf0b03 Documented console methods
Added more documentation to console methods, changed inconsistent or
confusing parameter names.
2015-02-02 14:59:49 -08:00
Nathan Bowhay
fbc6bcea20 Added better comments to console methods
Improved the comments on two console methods so when using them it is
clearer what to expect.
2015-02-02 12:50:34 -08:00
Luis Anton Rebollo
cc9be50422 Merge pull request #1121 from bpay/fix-buffer-overflows
Fix buffer overflows
2015-02-02 20:15:51 +01:00
Daniel Buckmaster
f01596554a Discovered a new dependency. 2015-02-02 17:07:12 +11:00
Daniel Buckmaster
d6ce1c3601 Does not exist. 2015-02-02 17:07:06 +11:00
Daniel Buckmaster
abea882862 No GUI mode for now. 2015-02-02 17:06:48 +11:00
Daniel Buckmaster
05fba1f110 Reorganised. 2015-02-01 22:01:12 +11:00
Daniel Buckmaster
db06ffec7d Started to work on Vagrant configuration. 2015-02-01 21:22:05 +11:00
Luis Anton Rebollo
9a0247f780 Merge pull request #1147 from BeamNG/templates_frame_allocator_size
Fix torqueConfig.h TORQUE_FRAME_SIZE.
2015-01-31 19:35:25 +01:00
LuisAntonRebollo
1dacf7b04e Fix torqueConfig.h TORQUE_FRAME_SIZE. 2015-01-31 19:34:14 +01:00
Luis Anton Rebollo
c1b137f041 Merge pull request #1145 from BeamNG/dynamic-CMake-modules
Make CMake project load all .cmake files from the module folder Updated.
2015-01-30 18:33:59 +01:00
LuisAntonRebollo
744e7d4745 Merge remote-tracking branch 'GG-Github/development' into dynamic-CMake-modules
Conflicts:
	Tools/CMake/torque3d.cmake
2015-01-30 18:24:38 +01:00
LuisAntonRebollo
41cb63ec0e Fix testimg.ppm 2015-01-30 18:22:42 +01:00
LuisAntonRebollo
e5bb684c0e Update gitattributes with some text files for avoid EOF problems with Git. 2015-01-30 18:20:50 +01:00
Daniel Buckmaster
29c2b98c47 Merge pull request #1092 from eightyeight/walkabout
Walkabout navigation editor
2015-01-30 09:00:11 +11:00
Daniel Buckmaster
0d1f1aeeb9 Base navmesh size 1x1x1. 2015-01-29 22:23:26 +11:00
Daniel Buckmaster
bd437cda1c Merge branch 'development' into walkabout
Conflicts:
	Engine/source/T3D/aiPlayer.cpp
2015-01-29 21:38:20 +11:00
Daniel Buckmaster
d7111bc851 Fix missing scripts and incorrect variable. 2015-01-29 21:23:16 +11: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
Daniel Buckmaster
cb047bd7f0 Rename all instances of Walkabout. 2015-01-29 21:09:32 +11:00
Daniel Buckmaster
7b75a528fd Delete settings.xml 2015-01-29 21:07:32 +11:00
Daniel Buckmaster
75bb3303d4 Merge pull request #1137 from eightyeight/moveselection
Fix changes to moveSelection API
2015-01-29 19:56:09 +11:00
Daniel Buckmaster
1467fa4e55 Merge pull request #1133 from GarageGames/nettest-conflict
Rename netTest.cpp to netExamples.cpp
2015-01-29 19:41:58 +11:00
Anis
40edb6b7d4 Update vectorLightP.glsl 2015-01-28 23:48:20 +01:00
Anis
bfbfed6d66 Update vectorLightP.glsl 2015-01-28 23:47:44 +01:00
Anis
1c5ab1371e Update lighting.glsl 2015-01-28 23:47:02 +01:00
Anis
3937afdc19 Update vectorLightP.glsl 2015-01-28 23:43:29 +01:00
Anis
9e090a2ef7 Update lighting.glsl 2015-01-28 23:36:43 +01:00
Daniel Buckmaster
0605f056e3 Fix changes to moveSelection API. 2015-01-28 21:25:15 +11:00
Daniel Buckmaster
68d3e84c08 Merge pull request #1115 from Lopuska/patch-14
Jeff Faust's terrain fix also in OpenGL
2015-01-28 21:04:33 +11:00
Daniel Buckmaster
bc12f13e9a Rename netTest.cpp to netExamples.cpp 2015-01-28 09:53:04 +11:00
Daniel Buckmaster
70d2ec6718 Merge pull request #1124 from eightyeight/forest-wind-emitter
Forest wind emitter rendering improvement
2015-01-27 08:58:12 +11:00
Ben Payne
47950382f7 ...and update the profiler strings 2015-01-26 16:52:07 -05:00
Ben Payne
ae94fc4e46 Fix mem leak discovered during previous commit 2015-01-26 16:52:07 -05:00
Ben Payne
fcf52fb5e0 Rename the memory allocating versions to make prev error less likely
The behavior is different enough that these shouldn't be overloaded
with the non-allocating verions. Also makes it more obvious what is
going on to the caller.
2015-01-26 16:52:06 -05:00
Ben Payne
d669eb6ee7 Fix unintentionally deleted param 2015-01-26 16:52:05 -05:00
Ben Payne
6e45643b28 Add descriptions 2015-01-26 16:52:04 -05:00
Ben Payne
4694b0a8ed Fix buffer size larger than necessary 2015-01-26 16:52:04 -05:00
Ben Payne
2cc4801974 Remove a dead function 2015-01-26 16:52:03 -05:00
Ben Payne
7613fa0375 Remove unnecessary null termination
UTF16Cache::copyToBuffer() is already adding a null terminator
2015-01-26 16:52:02 -05:00
Ben Payne
e3bbc42925 Provide a safer version of convertUTF16toUTF8 2015-01-26 16:52:01 -05:00
Ben Payne
a88339c219 Fix buffer overflows due to incorrect use of sizeof
A snippet of example code:

UTF16 pszFilter[1024];
...
convertUTF8toUTF16((UTF8 *)mData.mFilters, pszFilter, sizeof(pszFilter));

Since the conversion function is expecting the third parameter to be the
length in 16-bit characters, *not* bytes, this results in the function
writing outside the bounds of the output array.

To make this less likely to happen in the future (I hope), I've provided a
template function that infers the correct size of a static array, so it's
no longer necessary to pass the size in most cases. The sized function has
been renamed with an "N" suffix to hopefully encourage this use.

This bug was caught due to a warning from MSVC about stack corruption
occurring in codeBlock::exec(), after opening a file open dialog twice in
succession. After some hunting, I found that this was due to
FileDialog::Execute() passing incorrect buffer sizes to the conversion
function, which resulted in the function writing a null terminator into
some memory that happened to be in the stack frame of codeBlock::exec()!
2015-01-26 16:52:01 -05:00