Commit graph

2903 commits

Author SHA1 Message Date
Areloch
41240cfd38 Merge pull request #2037 from Areloch/BaseGameToDate
Base game to date
2017-07-09 03:44:56 -05:00
Areloch
c570f50bf3 Merge pull request #2035 from Areloch/IF_Cleanup_2017fix
#if cleanup for the VS2017 workaround
2017-07-09 03:41:23 -05:00
Areloch
90c04cb8f4 Merge pull request #2025 from John3/fixWarnMat
Fix load texture warnmat
2017-07-09 03:10:42 -05:00
Areloch
374cd46bf0 Merge pull request #2027 from John3/portalFolder
move portal shape into a folder
2017-07-09 03:09:38 -05:00
Areloch
c2a5b1e9e4 Merge pull request #2026 from John3/nodeFilter
node filter for shape editor
2017-07-09 03:03:52 -05:00
Areloch
1de626e829 * Intel GL Fix 2017-07-08 02:56:50 -05:00
Areloch
d07abe8ad2 * Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy 2017-07-08 02:56:09 -05:00
Areloch
296ab5b532 * Removes Direct3D9 functionality. 2017-07-07 03:13:43 -05:00
Areloch
0946950fa0 #if cleanup for the VS2017 workaround 2017-07-07 02:12:43 -05:00
Areloch
412c0380f4 Merge pull request #2031 from rextimmy/intel_gl_fix
Intel GL Fix
2017-07-05 23:06:13 -05:00
Areloch
94f37daa52 Merge pull request #2030 from Areloch/2017TemplateFix
VS2017 compiler workaround
2017-07-05 22:29:23 -05:00
Areloch
597abec447 Merge pull request #2023 from Areloch/sRGB_Implementation
Implementation of sRGB image support
2017-07-05 22:28:35 -05:00
Areloch
e2f98f2641 Includes the D3D feature level detection. 2017-07-05 22:27:37 -05:00
rextimmy
e2a3bf1d19 Intel GL Fix 2017-07-05 14:45:00 +10:00
Areloch
f1921c26dd Works around the regressive behavior in the VSC++ compiler for VS2017 where the variadic templates would not compile correctly. Issue should be patched in future versions, so for now it'll target the 1910 version specifically. 2017-06-28 23:58:56 -05:00
Johxz
f2fb6c117d node filter for shape editor 2017-06-23 21:35:05 -05:00
Johxz
6f95747311 Fix unable to load texture warnmat 2017-06-23 21:13:30 -05:00
Areloch
25686ed4be Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy 2017-06-23 11:36:20 -05:00
Areloch
8780f83262 Merge pull request #2021 from Azaezel/SDL_Init
expanded debug reporting for SDL_Init
2017-06-19 08:24:49 -05:00
Azaezel
60631cb146 expanded debug reporting for SDL_Init 2017-06-13 20:24:03 -05:00
Areloch
2b8532f679 Merge pull request #2004 from Areloch/PragmaPack
Ups the #pragma pack call from 4 to 8 when using 64bit
2017-06-10 01:40:53 -05:00
Areloch
a864ab793c Merge pull request #2017 from Areloch/D3D9Remove
Removes Direct3D9 functionality.
2017-06-10 01:39:10 -05:00
Areloch
adb875cb54 Conflict resolution with devhead.
Cleaned up a few remaining d3d9 references in the cmake file.
2017-06-01 23:54:44 -05:00
Areloch
d4d78ea5e4 Merge pull request #2008 from Areloch/ConsoleDumpAllocationFix
Console Classes dump allocation fix
2017-05-31 02:30:50 -05:00
Areloch
c0f314101d Use the more stable method of checking the string by using the strlen call. 2017-05-31 02:27:28 -05:00
Areloch
75580a1126 Merge pull request #2009 from Areloch/Prepass_Deferred_Remainder
Catches the remaining prepass to deferred changes on the engine side.
2017-05-30 23:43:09 -05:00
Areloch
edd1e0a270 Removes Direct3D9 functionality. 2017-05-28 16:51:31 -05:00
Areloch
5ac6f6beb3 Merge pull request #2010 from Areloch/Fix1999
Cleans up a redundant include.
2017-05-25 01:35:34 -05:00
Areloch
edae0cf2a3 Merge pull request #2011 from Areloch/Fix1998
Fixes a redundant flag test
2017-05-25 01:35:09 -05:00
Areloch
ae2f670c91 Merge pull request #2014 from RichardsGameStudio/windows10-creator-DesktopRes
Solves issue with getDesktopResolution and Windows 10 Creator update
2017-05-22 01:26:40 -05:00
Richard Marrevee
56d9ebe8eb Update win32WindowMgr.cpp 2017-05-18 20:39:53 +02:00
Areloch
a345c47f92 Fixes a redundant flag test 2017-05-15 01:04:06 -05:00
Areloch
c05d49058f Cleans up a redundant include. 2017-05-15 01:02:15 -05:00
Areloch
5c67c6c846 Merge pull request #1972 from pacomont/Fix_bad_initialization_on_camera
Fix bad initialization on camera
2017-05-15 00:58:36 -05:00
Areloch
67379495ee Merge pull request #2001 from pacomont/Let's_appling_Camera_FX_when_mount_on_driver_position
Why not apply Camera FX on vehicle driver position?
2017-05-15 00:58:11 -05:00
Areloch
c68c1de467 Merge pull request #2002 from OTHGMars/VolFogLeak
VolumetricFog memory leak fix
2017-05-15 00:45:43 -05:00
Areloch
ec3806bb0a Catches the remaining prepass to deferred changes on the engine side. 2017-05-14 18:28:17 -05:00
Areloch
2c5e70b1c9 Console Classes dump fix. It was running aground on having a case where there was a empty value for the 'usage' field in the class header. This would break the allocation because we're allocating nothing. This rejects it if the usage field is an empty string. 2017-05-14 17:51:13 -05:00
Areloch
e1d66d1bb9 Merge pull request #2007 from OTHGMars/DrawTextNFix
BugFix for GFXDrawUtil::drawTextN()
2017-05-14 17:47:29 -05:00
OTHGMars
5349bf226b Prevents GFXDrawUtil::drawTextN() from drawing one character more than requested if in_string has more than n characters. 2017-05-12 18:54:01 -04:00
Areloch
b6ec4437a1 Merge pull request #2003 from Areloch/FullPrepassDeferredRename
Prepass->Deferred rename for full template
2017-05-08 19:13:34 -05:00
Areloch
431f121e35 ups the #pragma pack call from 4 to 8 when using 64bit, as per suggested settings. This shaves off a lot of compatibility warnings. 2017-05-08 19:13:10 -05:00
Areloch
35ddfd53b2 Does the prepass->deferred rename for the full template as well to make it play nice while we prep for the swap over to the BaseGame template. 2017-05-08 18:33:14 -05:00
Areloch
83e18f35fe Merge pull request #1994 from viva64/pvs-studio-fixes
Checking Torque3D with PVS-Studio static analyzer
2017-05-08 18:21:02 -05:00
OTHGMars
84c74ce326 Fixes a memory leak in the VolumetricFog object and corrects an array alloc mismatch. Once objects were being deleted on the client, the SAFE_DELETE(z_buf) needed to be removed from the destructor. This was causing a runtime crash (release only) because z_buf was still registered with the GFX device. 2017-05-06 20:57:10 -04:00
Francisco Montañés García
2707eaf322 Apply Camera FX on vehicle driver position. 2017-05-02 17:17:33 +02:00
Areloch
bb7440ee5a Merge pull request #1982 from aaravamudan2014/development
Added gui functionality for vehicle re-mapping as per #950
2017-04-28 21:48:23 -05:00
Phillip Khandeliants
f5fee65378 Fixed V570: Variable is assigned to itself
The uninitialized variable 'box' is assigned to itself. Judging from the fact that this is a copy constructor, I think that it is necessary to store in the 'box' the value of 'cv.box'
2017-04-27 12:25:01 +03:00
Phillip Khandeliants
1b4f238a25 Fixed V610: Undefined behavior
In an arithmetic expression, all the variables whose values can be represented with type 'int' will be promoted to this type. Therefore, the result of the '~mask' expression is a negative number. By the C++ standard, shifting a negative number to the left leads to an undefined behavior.
2017-04-27 12:13:05 +03:00
Phillip Khandeliants
959701208b Fixed V547: Bad C-string comparsion
This comparison of a string to an empty is meaningless, since in fact two pointers will be compared and the expression will always be false.
2017-04-27 12:03:44 +03:00