Commit graph

3993 commits

Author SHA1 Message Date
Nathan Bowhay
fe544597e3 onScroll not always called
onScroll callback wasn't always being called, fixed that.
2015-01-29 15:52:10 -08:00
Nathan Bowhay
1903413a54 Removed unused variables
Removed unused variables.
2015-01-29 15:48:11 -08:00
Nathan Bowhay
ac0ba27753 Fixed degree symbol not displaying
Fixed bug with degree symbol not displaying correctly in torque thanks
to the forums:
http://www.garagegames.com/community/forums/viewthread/125190/1#comment-804996
2015-01-29 15:18:00 -08:00
Nathan Bowhay
c98e95e6ff Forgot supporting method
Added string manipulation functions upload, requires these changes to
compile.
2015-01-29 15:09:41 -08: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
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
LuisAntonRebollo
19afd0c22b . 2015-01-25 02:01:11 +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