Commit graph

763 commits

Author SHA1 Message Date
Robert Beckebans
e22837309b Merged LordHavoc's image compression progress bar
# Conflicts:
#	neo/framework/common_frame.cpp
2017-09-03 10:30:13 +02:00
Robert Beckebans
657b5c02f9 Optimized makeAmbient importance sampling with Hammersley point set 2017-09-03 10:28:23 +02:00
Robert Beckebans
4ba2e107e8 Bugfixes for the JSON .map export script to work with group instances 2017-09-03 10:26:29 +02:00
Robert Beckebans
736ccadcb3 Started to move files so it can be compared to vkdoom3 2017-09-03 10:22:36 +02:00
Robert Beckebans
4daffd67c0 Astyle 2017-09-03 09:45:03 +02:00
Robert Beckebans
72091f73ca Merge branch 'master' into vkdoom3-merge 2017-09-02 14:40:39 +02:00
Robert Beckebans
09f92b95d9 Disable ATL warning with VS2015 2017-09-02 13:58:21 +02:00
Robert Beckebans
6fbaf4e904 Merge remote-tracking branch 'Codes4Fun/HDRMSAAFix' 2017-09-02 13:33:55 +02:00
Robert Beckebans
fab5644a75 Merge pull request #393 from dsalt/compile-warnings
Trivial fixes for some (mostly) string-related compile warnings
2017-08-30 12:39:40 +02:00
Robert Beckebans
176c58fc1e Merge pull request #391 from dsalt/master
Fix detection of Mesa >= 17.2.
2017-08-30 12:39:23 +02:00
Robert Beckebans
579de5008d Merged SWF fixes from vkDoom3 2017-08-29 16:26:03 +02:00
Darren Salt
5791f11a6b Kill a macro redefinition warning. 2017-08-27 23:31:51 +01:00
Darren Salt
c8fae11e7d Constify format string in DisplayRealTimeString (fixes warnings). 2017-08-27 22:26:28 +01:00
Darren Salt
50df362ef8 Fix C++11 literal suffix warnings. 2017-08-27 22:26:28 +01:00
Darren Salt
01be91c9c8 Fix detection of Mesa >= 17.2.
This handles accelerated drivers (vendor == "X.Org") and software rendering (llvmpipe).
2017-08-09 17:02:35 +01:00
Ensiform
29786cf420 Static cvars incorrectly checking against wrong size on 64
On 64-bit arch these checks are incorrect. the 0xFFFFFFFF is effectively UINT32_MAX rather than the pointer size. Changing to the unsigned integral pointer maximum seems like a better idea.

Fixes the warning, and corrects the code.
2017-07-30 22:30:25 -05:00
Robert Beckebans
e5b3c697d2 Merge pull request #376 from ensiform/vs2017-cmake-batchfiles
Add cmake files for VS 2017 support
2017-07-29 11:27:15 +02:00
Ensiform
df08e21e0d Add cmake files for VS 2017 support
Win10 solutions are likely needed to be used if you don't want to depend on the DXSDK same as 2015.
2017-07-15 21:28:05 -05:00
Caffeine Code
41f1014ed5 read core count correctly 2017-07-09 22:39:20 +01:00
Caffeine Code
8a1ce622a3 Fix sprintf overflows in various locations (gcc 7) 2017-07-09 19:22:33 +01:00
Robert Beckebans
81dc65119d Merge pull request #341 from boscorillium/glew2.0
update to glew 2.0
2017-04-21 10:55:32 +02:00
Robert Beckebans
bc8d5f1995 Merge pull request #356 from Codes4Fun/StereoscopicFix
Fix for Stereoscopic 3D modes with HDR and SMAA.
2017-04-20 15:26:01 +02:00
Codes4Fun
de899cdbda Automatic reload of shaders after changing r_useHDR and r_useHalfLambertLighting. 2016-10-24 16:08:27 -07:00
Codes4Fun
2ce3f660bd Fixed resolution changing bug with MSAA and HDR.
After a resolution change the hdrNonMSAAFBO needed to be reattached
after Resize, not doing that resulted in a black screen (being attached
to the old deleted texture).
2016-10-24 16:07:17 -07:00
Codes4Fun
d53b9cafda Update to use glConfig.multisamples.
code under USE_HDR_MSAA was stil using r_multiSamples, so switched it to
use glConfig.multiSamples.
2016-10-24 16:06:21 -07:00
Codes4Fun
3241d08740 Added UpdateStereo3DMode function.
This is to consolidate how we update the glConfig.stereo3Dmode, and to
update it before initializing the framebuffers so that they are
initially allocated correctly and avoid framebuffers getting reallocated
later.
2016-10-24 15:58:43 -07:00
Codes4Fun
e83aa52d4f Fix for Stereoscopic 3D modes.
A lot of places using glConfig.nativeScreenWidth, when they should be
calling renderSystem->GetWidth() (and height equivalent) which take into
account stereoscopic 3d modes.
2016-10-23 18:55:16 -07:00
Robert Beckebans
80df3182f1 Merge pull request #353 from shaneutt/master
Regenerate RenderProgs_embedded.h
2016-10-18 11:52:41 +02:00
Shane Utt
8226e25886 Regenerate RenderProgs_embedded.h 2016-10-14 21:32:57 -04:00
Tim Howard
fc3fd70409 update to glew 2.0 2016-08-13 21:05:14 -04:00
Robert Beckebans
ce3ceefa1b Merge pull request #336 from TheLonerD/patch-1
Fix crash when launching doom classic game
2016-08-06 12:02:05 +02:00
Lightwave
65a44fe5ad Fix crash when launching doom classic game
Nulling XAUDIO2_VOICE_STATE struct before using, so it's eliminate "uninitializing variable" crash when pMusicSourceVoice is NULL.
2016-07-18 22:32:09 +03:00
Robert Beckebans
259d71da41 Merge pull request #335 from jpcy/se2-renderdemo
Merged Storm Engine 2 demo fixes.
2016-07-17 11:02:16 +02:00
Jonathan Young
5368af9ad8 Fix playDemo running as fast as possible (like timeDemo). 2016-07-16 11:24:06 +10:00
Jonathan Young
ca0527f9a6 Merged Storm Engine 2 demo fixes. 2016-07-15 16:36:34 +10:00
Robert Beckebans
05bb9da500 Merge pull request #332 from jpcy/cmd-arg-completion-fixes
Misc. command argument completion fixes
2016-07-04 23:20:41 +02:00
Jonathan Young
42f93f5b0e Include json maps in command argument auto-complete. 2016-07-04 19:14:16 +10:00
Jonathan Young
9325c3672c Fix debug assert when auto-completing some command arguments. 2016-07-04 19:12:58 +10:00
Robert Beckebans
3d75dbcb4a GCC compile fixes under Kubuntu 15.10 2016-07-03 22:56:29 +02:00
Robert Beckebans
8a99249cfd Astyle 2016-07-03 15:40:03 +02:00
Robert Beckebans
9a340f3914 Renamed Flash GUI development cvars to postLoadFlash* 2016-07-03 15:33:01 +02:00
Robert Beckebans
e6f75d3336 Merge branch 'flash-tools' 2016-07-03 15:11:43 +02:00
Robert Beckebans
d3b9d238ec Merge branch 'collada-support' 2016-07-03 14:59:45 +02:00
Robert Beckebans
7296fd83b5 Added COLLADA model support to get rid of ancient LWO/ASE formats 2016-07-03 13:47:52 +02:00
Robert Beckebans
3e1d21ef34 Merged some SS2 shadow mapping performance improvements 2016-07-02 11:24:22 +02:00
Robert Beckebans
081c848f87 envShot cleanup 2016-07-02 11:24:22 +02:00
Robert Beckebans
30f85f5b46 Merged Steel Storm 2 envShot bugfix by LordHavoc 2016-07-02 11:24:22 +02:00
Robert Beckebans
3bac15f585 Merged some SS2 shadow mapping performance improvements 2016-07-02 11:22:04 +02:00
Robert Beckebans
86d881d046 Blender export script Bugfix 2016-07-02 11:21:05 +02:00
Robert Beckebans
1bfe4682af Merge pull request #326 from y2keeth/master
increase max_decals and deffered decals, shotgun now has full impacts
2016-06-30 22:07:29 +02:00