Commit graph

841 commits

Author SHA1 Message Date
Daniel Buckmaster d10afa2ba2 VS2008 doesn't have stdint.h 2015-02-10 15:22:35 +11: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
LuisAntonRebollo c78f38fe0b Remove some dead code from OpenGL shadergen. 2015-02-07 22:49:58 +01:00
Luis Anton Rebollo d90baad6fa Merge pull request #1100 from JeffProgrammer/glslShadergenDefineFix
Fixed define bug for OpenGL shadergen.
2015-02-07 22:46:13 +01:00
Luis Anton Rebollo 25a790103e Merge pull request #1116 from Lopuska/patch-16
Intel OpenGL - fix a crash/shader compile error when you activate Vertex...
2015-02-07 22:24:55 +01:00
Luis Anton Rebollo 1097e957a3 Merge pull request #1048 from Lopuska/patch-11
missing texture format.
2015-02-07 18:04:46 +01:00
LuisAntonRebollo 5d49771136 Fix FIELDOFFSET for OSX. 2015-02-07 16:41:55 +01:00
LuisAntonRebollo 6d1ef41c69 Changed some size_t to uintptr_t. 2015-02-07 16:41:54 +01: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 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 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 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
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 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
LuisAntonRebollo 4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
LuisAntonRebollo a7002c0ecc Changes for Linux. 2015-01-24 21:52:46 +01:00
Anis 4ccf89ba8e fix to avoid a missing sampler name declaration 2015-01-21 14:39:05 +01:00
Anis 5d392e373e Update shaderFeatureGLSL.cpp 2015-01-20 19:13:25 +01:00
Anis c9116dd4a4 OpenGL fix - fixed a crash when you activate Alpha Threshold checkbox without a diffuse map 2015-01-20 19:07:29 +01:00
Anis f05b1b5cbd fix #1117 2015-01-20 17:02:56 +01:00
Anis 9d84372dc8 Intel OpenGL - fix a crash/shader compile error when you activate Vertex Lit from Material Editor 2015-01-19 20:56:02 +01:00
Anis 32b2564cd5 Jeff faust fix also on openGL. 2015-01-19 18:04:31 +01:00
LuisAntonRebollo 3336bffad2 Changes for Linux. 2015-01-19 01:44:36 +01:00
LuisAntonRebollo aa35157eef PlatformSDL implementation. 2015-01-19 01:17:37 +01:00
LuisAntonRebollo 21d58bb191 Modified files for SDL2. 2015-01-19 00:33:23 +01:00