Commit graph

1922 commits

Author SHA1 Message Date
Azaezel 0b9dd9bb7e forgot one 2017-07-09 15:41:54 -05:00
Azaezel 5fcb90cafd kills off the last vestiges of xenon support 2017-07-09 15:05:56 -05:00
Areloch 94f37daa52 Merge pull request #2030 from Areloch/2017TemplateFix
VS2017 compiler workaround
2017-07-05 22:29:23 -05:00
Areloch e2f98f2641 Includes the D3D feature level detection. 2017-07-05 22:27:37 -05: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
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
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 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
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 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
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
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
Phillip Khandeliants 20e63ad763 Fixed V547: Expression is always false
'ov_read' function returns a signed long, that is stored in an unsigned integer 'bytesRead'. Comparsion 'bytesRead < 0' doesn't make sense, since an unsigned number >= 0.
2017-04-27 11:29:03 +03:00
Phillip Khandeliants cf776cf8b0 Fixed V591: Non-void function should return a value
If there is needed to prevent the copying of the object, then there is no need to provide the definition of the copy constructor and the assignment operator, because the member functions and friendly functions can still call them. If the code is compiled by a compiler with support for the C++11 standard, you can delete them using the keyword 'delete'
2017-04-27 10:33:31 +03:00
Areloch f2733d79f8 Merge branch 'development' into AITurretClearIgnoreList 2017-04-26 23:56:33 -05:00
Areloch 6fb33411e2 Merge pull request #1988 from DTFuchs/Redundant-Check-GetTrailingNumber
Better bug fix for #1738 (str.cpp)
2017-04-26 23:27:17 -05:00
Areloch 0042d112be Merge pull request #1991 from AlexBarys/AITurretIgnoreListFunctions
Ai turret ignore list functions
2017-04-26 01:21:56 -05:00
Areloch 124ecb2fe0 Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
2017-04-26 01:11:51 -05:00
Areloch 0f2819049b Merge pull request #1979 from Azaezel/purdyPitureProfiler
adds profiling to the various gbitmap loaders*
2017-04-26 01:01:54 -05:00
AlexBarys 65de396b85 Function definitions for new functions
Added header file definitions for the two new functions created to implement the features requested in issue #1272
2017-04-23 19:01:31 -04:00
AlexBarys 3639d5b048 Implementation for two new features
Added implementation to expose two new functionalities from the c++ to Torquescript as requested in issue #1272.  Added both a DefineEngineMethod function for getting the count of the number of objects on the turret ignore list and a DefineEngineMethod function for returning a reference to the object on the ignore list at a given index on the ignore list.  Also added functions that do each of those things and are then encapsulated by those DefineEngineMethod functions.
2017-04-23 18:58:40 -04:00
AlexBarys ff034d5cff Added clearIgnoreList() definition
Added the definition for the new function created to implement the feature request in issue #1271 to clear the entire ai turret ignore list with one function call.
2017-04-23 18:49:26 -04:00
DTFuchs f79c688596 Update str.cpp 2017-04-23 18:49:08 -04:00
AlexBarys 5ec93c4a09 Implementation to clear entire turret ignore list
Implementing the feature request made in issue #1271 to expose the functionality to clear the entire ai turret ignore list to Torquescript.
2017-04-23 18:46:17 -04:00
Masquara 15f67015d3 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Areloch dba8b5b327 Merge branch 'development' into Xenon_Removal 2017-04-18 20:47:43 -05:00
Areloch 464a113c6a Merge pull request #1980 from Areloch/PrepassToDeferredRename
Replaces uses of 'Prepass' with 'Deferred'
2017-04-18 20:46:21 -05:00
Areloch 6423ab50b1 Merge pull request #1983 from klaus95/patch-1
Fix for bug #1738
2017-04-17 20:27:56 -05:00
Areloch 5be2497b69 Merge branch 'development' into Fix_Issue_#1951_TCPObject_is_broken_3.10 2017-04-17 20:19:20 -05:00
klaus95 d6fd1a49ca Fix for bug #1738
getTrailingNumber("string") and stripTrailingNumber("string") will now work for single letter cases. For example, getTrailingNumber() will return "11" if the input is "a11" or "t11", and stripTrailingNumber() will return "a" if the input is "a11".
2017-04-17 15:46:44 -07:00
Chris Millsap f421a50e5a Comment formatting
Removed incorrect comments to be more inline with windows and linux. Put
comment on line 812 on top of code.
2017-04-12 18:54:59 -04:00