Commit graph

69 commits

Author SHA1 Message Date
rextimmy
415f4a046e OpenGL vsync fixes. 2016-12-23 13:59:55 +10:00
RexTimmy
3b1d84fe5c SDL & Win32 platform threads cleanup. 2016-09-28 11:13:25 +10:00
Jeff Hutchinson
fddc00b39b Merge branch 'development-gg' into epoxy 2016-04-17 23:59:42 -04:00
Jeff Hutchinson
6e692ea9cf torque windows integration of epoxy 2016-03-25 13:41:38 -04:00
rextimmy
41e5caf22b Direct3D11 Engine/source changes 2016-03-20 21:52:11 +10:00
Areloch
c2da755dc2 Fix for the directory scan for modules so it doesn't trim off characters in the path.
Resubmitted to clear the excess history entries.
2016-01-08 00:19:11 -06:00
Areloch
7a3b40a86d Initial Implementation of the Taml, Asset and Modules systems.
Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
Areloch
bedc79aacb Merges in Monkey's fixes PR with a resolution for a conflict 2015-09-03 22:58:57 -05:00
Azaezel
a0aa826f16 Adds a verifyCompatibility method to the Win32FileSystem to report case-sensitivity issues
-triggered during debug only
-still need to expand that to handle bad directories.
2015-08-18 06:12:37 -05:00
Daniel Buckmaster
c2e5dc3345 Merge remote-tracking branch 'bpay/clang-cl-build-fixes' into development
Conflicts:
	Engine/source/T3D/shapeBase.h
2015-07-17 16:55:12 +10:00
Daniel Buckmaster
50183c6a2a Merge pull request #901 from Winterleaf/winMath_ASM.cpp
FFP 64bit
2015-07-12 16:18:22 +10:00
Ben Payne
da4078c707 Fix passing of non-primitive types to varargs functions 2015-03-04 19:25:09 -05:00
Ben Payne
eabff49a6a Fix buffer underrun found with address sanitizer
When subpath is the empty string, the code was reading from subPath[-1]
2015-03-04 19:13:49 -05:00
Ben Payne
6040a8d855 Fix macro token pasting errors when compiling with clang-cl 2015-03-04 19:10:53 -05:00
Daniel Buckmaster
6c92ab065e Merge remote-tracking branch 'jamesu/console_stack_fix2' into development
Conflicts:
	Engine/source/console/console.cpp
2015-03-01 20:33:29 +11:00
Daniel Buckmaster
497a15cfd0 Merge pull request #1214 from bpay/cppcheck-cleaning
Fix some issues flagged by cppcheck
2015-03-01 18:27:40 +11:00
Daniel Buckmaster
bddc27c693 Add a temporary local copy of stdint.h for VS2008. 2015-02-22 11:25:19 +11:00
Ben Payne
0ffd7f5620 Fix member vars left uninitialized in constructors 2015-02-20 18:41:51 -05:00
Daniel Buckmaster
3ed6dfb374 Merge pull request #1200 from adambeer/minidumpfix
Fix for minidump support
2015-02-20 13:05:51 +11:00
Luis Anton Rebollo
098fa19abb Merge pull request #1014 from Lopuska/patch-1
vSync on opengl
2015-02-15 23:02:32 +01:00
Adam Beer
1631f76a47 Update winStackWalker.h 2015-02-15 13:18:12 -05:00
Daniel Buckmaster
486a12cb96 Merge pull request #1183 from MusicMonkey5555/documentation
Documentation
2015-02-14 19:52:37 +11:00
Nathan Bowhay
32e3678000 Fixed incorrect file size returned
According to
https://msdn.microsoft.com/en-us/library/windows/desktop/aa365740%28v=vs.85%29.aspx
to return the actual file size you need to use the high and low file
size.
2015-02-11 09:57:36 -08:00
Nathan Bowhay
27fa97f44d shellExecute return documentation
Added documentation to shellExecute about bool that is returned.
2015-02-11 09:52:59 -08: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
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
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
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
475f218bcd Modified files for SDL2. 2015-01-18 22:52:29 +01: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
9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod
Conflicts:
	Engine/source/T3D/missionMarker.cpp
2014-12-21 21:23:55 +11:00
rextimmy
97e7e07607 winTime month fix 2014-12-18 14:25:45 +10:00
Ben Payne
dd297d4dc0 Fix buffer overflow 2014-12-13 16:08:38 -05:00
Ben Payne
a3f4adacc3 Replace obsolete calling convention 2014-12-11 20:08:45 -05:00
Ben Payne
d97d44f66f Fix more misc uninitialized vars 2014-12-11 18:25:29 -05:00
Anis
de82fbe0f9 Intel graphics bugfix
Explicit calls to hide and show menu bar on editing.
That fix the bug on Intel video card in OpenGL mode.
2014-12-10 15:30:36 +01:00
Anis
7455f12343 check extension before use it 2014-12-06 20:55:43 +01:00
LuisAntonRebollo
dd08fd2e7d Add OpenGL support. 2014-11-08 20:21:50 +01:00
Vincent Gee
125901648a 64bit, from @source http://msdn.microsoft.com/en-us/library/c9676k6h.aspx 2014-11-04 07:19:14 -05:00
Vincent Gee
acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05: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
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
LuisAntonRebollo
535f56af6e Merge pull request #801 from eightyeight/gtest-tests
Googletest tests
2014-10-02 01:31:13 +02:00
Daniel Buckmaster
b01e5668b4 Removed dead unit test code from main loop. 2014-09-29 11:38:32 +10:00
Daniel Buckmaster
9f47032522 Allow return status to be specified using quitWithStatus. 2014-09-24 09:24:29 +10:00
LuisAntonRebollo
8ed0f508ca Minimal changes to compile T3D on WIN64. 2014-09-14 21:39:56 +02:00