TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1335 commits 5 branches 33 tags 958 MiB
Commit graph

1335 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Payne
222be2bb72 Remove dead function 2015-02-02 19:11:20 -05: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
Ben Payne
e03c3bb34f Fix TORQUE_UNUSED for recent versions of MSVC 
Since there's now apparently no way to suppress the warning for a
particular variable without adding at least some extra size to the
executable, just turn the warning off in release builds. We leave it on in
debug since it can sometimes help catch bugs, and we don't care about a
little extra code in that configuration.
 2015-02-02 18:33:49 -05: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
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
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
Luis Anton Rebollo
d6beb3594a Merge pull request #1130 from BeamNG/fix_opengl_performance 
Remove a get* OpenGL function causing CPU-GPU sync point.
 2015-01-26 12:11:35 +01:00
LuisAntonRebollo
52d8aa3a97 Remove a get* OpenGL function causing CPU-GPU sync point (bad performance). 2015-01-26 01:56:13 +01:00
Daniel Buckmaster
540e68aadb Undid changes to Point3F. 2015-01-26 00:16:38 +11:00
Luis Anton Rebollo
6492028bb2 Merge pull request #1035 from bpay/memfixes 
Memfixes
 2015-01-25 13:42:32 +01:00
Vincent Gee
c1203c1cea Dev forest wind emitter improvement 
So the problem is that when your inside the sphere it won't render so it might make someone
think that it's not working right.  So what I did was determine if the camera is inside the sphere.
If the camera is inside the sphere, then I find the distance from the center of the sphere to the camera
Round down and use that as the radius to draw the sphere.
That way if someone zooms in or out, their screen is still showing the sphere.
 2015-01-25 22:50:36 +11:00
Luis Anton Rebollo
79df1a1b3a Merge pull request #1089 from eightyeight/profile-stringtable 
Add profiler regions for StringTable functions
 2015-01-25 10:56:20 +01:00
Luis Anton Rebollo
c9a818797a Merge pull request #1123 from BeamNG/fix_linux_ci 
Fix for CI server on gcc Linux.
 2015-01-24 23:44:33 +01:00
LuisAntonRebollo
5583e73ca5 Fix for CI server on gcc Linux. 2015-01-24 23:28:12 +01:00
Luis Anton Rebollo
84d072f25c Merge pull request #1027 from bpay/ambient-normals 
Allow normals on shadowed surfaces
 2015-01-24 23:05:51 +01:00
Luis Anton Rebollo
94f5e6d9dc Merge pull request #1080 from eightyeight/netevent-reference-counting 
Use a strong reference instead of more manual reference counting
 2015-01-24 23:03:33 +01:00
Luis Anton Rebollo
ea0e3fd683 Merge pull request #1096 from bpay/fix-include-guards 
Fix include guards
 2015-01-24 23:02:13 +01:00
Luis Anton Rebollo
be84142502 Merge pull request #1118 from Lopuska/patch-17 
fix #1117
 2015-01-24 22:59:06 +01:00
Luis Anton Rebollo
ca382f56a6 Merge pull request #1119 from Lopuska/patch-18 
OpenGL fix - fixed a crash when you activate Alpha Threshold checkbox wi...
 2015-01-24 22:58:47 +01:00
Luis Anton Rebollo
b3bce32685 Merge pull request #1111 from BeamNG/Linux 
Linux
 2015-01-24 22:26:17 +01:00
LuisAntonRebollo
4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
Luis Anton Rebollo
4e52824a42 Merge pull request #1110 from BeamNG/changesForLinux 
Changes for linux
 2015-01-24 21:53:23 +01:00
LuisAntonRebollo
a7002c0ecc Changes for Linux. 2015-01-24 21:52:46 +01:00