Commit Graph

9646 Commits

Author SHA1 Message Date
Magnus Norddahl 1f8b2ebd9f Merge remote-tracking branch 'origin/ssao' into qzdoom 2016-10-22 21:26:30 +02:00
Magnus Norddahl a3e19bf337 Fixed gl_ssao_portals not having effect 2016-10-22 21:25:29 +02:00
Rachael Alexanderson 02659fab95 Merge http://github.com/rheit/zdoom 2016-10-22 09:06:08 -04:00
Christoph Oelckers 853e49a077 - fixed: R_InitSkyMap must check for the null texture which cannot be used as a sky because it has no bitmap and will cause an access violation in the sky cap color calculation. 2016-10-22 09:58:56 +02:00
Rachael Alexanderson fb301d5996 Merge http://github.com/rheit/zdoom 2016-10-22 01:36:32 -04:00
Marisa Heit 5c596d3797 Change VM to increment PC after each instruction rather than before
- VC++ generated horribly stupid code for x64 when incrementing pc at the
  beginning of each instruction by storing hundreds of copies of it for
  every opcode executed. Incrementing pc at the end avoids this madness.
- It is possible I messed something up with this change. Hopefully not.
2016-10-21 22:11:23 -05:00
Rachael Alexanderson 9ee34254c8 - fixed: Crashing when using the "restart" ccmd 2016-10-21 19:26:05 -04:00
Rachael Alexanderson f178043b81 Merge branch 'master' of https://github.com/raa-eruanna/QZDoom 2016-10-21 18:19:44 -04:00
Rachael Alexanderson 11a98bec7e - fixed: Compiler error in hardware.cpp (vid_forceddraw) 2016-10-21 18:18:48 -04:00
Magnus Norddahl 2ba7915d1a Merge remote-tracking branch 'origin/ssao' into qzdoom 2016-10-22 00:14:35 +02:00
Magnus Norddahl e891911a99 Fix broken SSAO portal rendering and let FRenderState do the glDrawBuffers calls 2016-10-22 00:09:06 +02:00
Rachael Alexanderson 16fded31e1 - Show current renderer on startup. This is for diagnostic purposes when we ask people for their startup logs so we know what key settings are being used when there is a problem. 2016-10-21 17:53:21 -04:00
Magnus Norddahl be2c50f11c Merge remote-tracking branch 'gzdoom/master' into ssao 2016-10-21 23:48:30 +02:00
raa-eruanna 9cf9cc1318 Merge http://github.com/rheit/zdoom
# Conflicts:
#	wadsrc/static/language.enu
2016-10-21 13:37:12 -04:00
Christoph Oelckers b1289fa783 - fixed: The serialiter functionfor FDoorAnimation accessed the invalid destination pointer when loading a savegame. 2016-10-21 19:24:40 +02:00
nashmuhandes 21b690a3c7 Fixed: Player.ViewBob should be multiplying the bobbing height in P_CalcHeight, not the velocity of the bobbing.
This mimics the act of the user altering their movebob CVar to compensate for non-standard player movement speeds.
2016-10-21 19:24:39 +02:00
raa-eruanna e0efdd97b3 - Added: PlayerPawn property "Player.ViewBob" which acts as a MoveBob/StillBob multiplier. 2016-10-21 19:24:39 +02:00
raa-eruanna 513f8312b3 - Renamed menu option for r_fullbrightignoresectorcolor 2016-10-21 08:36:20 -04:00
raa-eruanna ec9dd3f5af - Fixed compiler errors with r_fullbrightignoresectorcolor merge 2016-10-21 07:53:32 -04:00
raa-eruanna 1ae478aacd Merge commit '8678baf6f589a68635939a1063a28231a0aa01a1'
# Conflicts:
#	src/r_data/colormaps.cpp
#	src/r_main.cpp
#	src/r_segs.cpp
#	src/r_things.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
2016-10-21 07:42:28 -04:00
raa-eruanna 8678baf6f5 - Fullbright fixes 2016-10-21 07:32:18 -04:00
raa-eruanna df6214b142 - Fixes 2016-10-21 07:21:56 -04:00
raa-eruanna c76431414a - Implemented r_fullbrightignoresectorcolor from QZDoom 2016-10-21 07:06:24 -04:00
raa-eruanna b327a3312e - Fully Implemented GZDoom fullbright emulation 2016-10-21 06:08:25 -04:00
Magnus Norddahl 1cd27ca98a Change how the LLVM execution engine to constructed and printf which target triple and CPU is being used 2016-10-20 21:57:45 +02:00
Magnus Norddahl 1c2dcad36e Fix linear skies 2016-10-20 15:16:02 +02:00
raa-eruanna c62ee28726 Merge http://github.com/coelckers/gzdoom 2016-10-20 04:54:44 -04:00
raa-eruanna f2fdeaec8a Merge http://github.com/rheit/zdoom 2016-10-20 04:53:49 -04:00
Christoph Oelckers 96437d95fa - use the new ZDoom code for retrieving a sky's cap color to avoid redundancies. 2016-10-20 10:36:23 +02:00
Christoph Oelckers ce80d8157b Merge branch 'master' of https://github.com/rheit/zdoom 2016-10-20 10:24:37 +02:00
Christoph Oelckers 4b956a2f2b - added support for the skyoffset property that had been settable in ANIMDEFS for GZDoom. This will only have an effect in sky mode 2. 2016-10-20 09:56:45 +02:00
raa-eruanna a4393d352f Merge http://github.com/rheit/zdoom 2016-10-20 03:30:51 -04:00
Christoph Oelckers 19d070c9bd - fixed: averageColor swapped red and blue.
- renamed some stuff
2016-10-20 09:08:07 +02:00
Magnus Norddahl aa199a91c5 Merge remote-tracking branch 'origin/capsky' into qzdoom
# Conflicts:
#	src/r_plane.cpp
#	src/r_sky.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
2016-10-20 01:05:05 +02:00
Magnus Norddahl 2fe545a4fd Merge r_stretchsky and r_capsky into r_skymode 2016-10-20 00:59:51 +02:00
Magnus Norddahl 0888fc0cde Merge remote-tracking branch 'origin/capsky' into qzdoom 2016-10-20 00:13:58 +02:00
Magnus Norddahl 5de8112578 Add support for capping sky with a solid color 2016-10-19 23:52:09 +02:00
Magnus Norddahl 4ccb69fa61 Palette version of sky drawers 2016-10-19 23:21:09 +02:00
Magnus Norddahl d5865a46a0 Move triangle drawer into a command and change the sky code to use it if r_cubesky is enabled 2016-10-19 17:44:50 +02:00
Magnus Norddahl ea72152c31 Add doom style column clipping to triangle drawer 2016-10-19 15:43:10 +02:00
Magnus Norddahl 6a7bb43ce1 Fix clipping bug 2016-10-19 14:32:28 +02:00
Magnus Norddahl ef70ba0985 More triangle rendering 2016-10-19 03:49:42 +02:00
raa-eruanna 68efdf5cef - Fixed: Added linker flags for Linux to prevent crashes using LLVM. Using fix found by dpJudas. 2016-10-18 18:21:22 -04:00
raa-eruanna 226287875b Creating 0.2pre tag 2016-10-18 14:07:44 -04:00
Magnus Norddahl 694cae054c Add some experimental draw triangle code 2016-10-18 18:23:56 +02:00
raa-eruanna 79b14bbc08 - Updated version.h for beta tag 2016-10-18 11:38:35 -04:00
raa-eruanna 7df28f14a3 Merge http://github.com/rheit/zdoom 2016-10-18 11:34:12 -04:00
Marisa Heit d2a9f7ac6f Fix Raise definition for DoomImp 2016-10-17 21:45:06 -05:00
Magnus Norddahl 49b4860426 Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-10-18 01:16:45 +02:00
Magnus Norddahl df3f5ae882 Use OpenGL to allocate the canvas buffer to avoid a costly memcpy 2016-10-18 01:16:36 +02:00