Commit Graph

2540 Commits

Author SHA1 Message Date
Magnus Norddahl ddd1b629c3 - Calculate globvis/r_visibility in r_utility and use it in GL and poly renderers 2017-07-09 19:01:34 +02:00
Magnus Norddahl 00893763ed Merge branch 'custom_postprocess' into qzdoom 2017-07-08 14:44:30 +02:00
Magnus Norddahl a38de996e7 - Move uniform declarations to the GLDEFS lump to make it Vulkan safe (a vulkan implementation can then declare them in an uniform block)
- Change SetUniform functions to be clearscope as they can be safely called from both play and ui
- Add PlayerInfo argument to SetUniform functions to force the modder to take network play into account
- Add enabled flag on custom postprocess shaders
- Removed custom texture support until a more clean implementation is written
2017-07-08 14:44:07 +02:00
Rachael Alexanderson a63a7b9b29 Merge remote-tracking branch 'gzdoom/master' 2017-07-03 17:17:47 -04:00
Rachael Alexanderson 2bfd7859e4 Merge remote-tracking branch 'origin/custom_postprocess' 2017-07-03 17:17:17 -04:00
Magnus Norddahl e161bba146 - Specify shader uniforms from ZScript 2017-07-03 22:30:49 +02:00
Christoph Oelckers 60cb457c4c - fixed incorrect MinMissileChance of SpiderMastermind. 2017-07-03 09:58:40 +02:00
Rachael Alexanderson 72517244be - set bluramount to 0 by default 2017-07-02 17:08:01 -04:00
Rachael Alexanderson b4915d624d - removed 'cooling' component of the shader since it technically wasn't really functional (guess we have to use a separate shader to do that)
- changed the math to use the 'mix' formula
2017-07-02 16:59:15 -04:00
Rachael Alexanderson 0d8b7c55ef - added a grayscale formula selector 2017-07-02 16:45:06 -04:00
Rachael Alexanderson a2c9cb8156 - increased menu readability 2017-07-02 16:45:06 -04:00
Rachael Alexanderson bd02893ce7 - expanded hard limits for saturation to -15.0/15.0
- added menu option for saturation
- tried to get the new saturation shader to consume less GPU power by turning it off when it is 1.0
2017-07-02 16:45:06 -04:00
Rachael Alexanderson 63da6e70c0 - added a vid_saturation control - works in postprocessing, only. 2017-07-02 16:45:06 -04:00
Rachael Alexanderson cf400ba2db Merge https://github.com/coelckers/gzdoom 2017-06-25 23:44:33 -04:00
Rachael Alexanderson 1562d64580 - fixed: in the availability of gl_fogmode == 0, default to having square fog instead of radial fog in gl_lightmode == 8 2017-06-25 09:37:14 -04:00
Magnus Norddahl b6e035e796 - Implemented radial fog support in software light mode 2017-06-25 15:02:34 +02:00
Rachael Alexanderson 7592e6d5de Merge https://github.com/coelckers/gzdoom 2017-06-25 00:18:19 -04:00
Magnus Norddahl f34ededdef - Improved fuzz rendering in software renderer by scaling it relative to 320x200 2017-06-25 00:35:15 +02:00
Rachael Alexanderson 9001009fcf Merge https://github.com/coelckers/gzdoom 2017-06-22 01:42:33 -04:00
Rachael Alexanderson 4229389680 - fixed: banded sw light was broken in a recent commit. Added back the 32 light levels and also made it prefer darker shades. 2017-06-21 19:10:39 -04:00
Magnus Norddahl 28acf2ad06 - Fix OpenGL software diminishing light to be identical to truecolor swrenderer and softpoly
All there is left is to make globVis an uniform and move the LightVisibility::SetVisibility calculations out of the software renderer.
That will make it 100% correct for all r_visiblity values and aspect ratios.
2017-06-22 00:01:57 +02:00
Christoph Oelckers a6b7ce00c2 - made DropItem fully read-only by changing the two places which messed around with DropItem.Amount to use a local variable instead.
The pointers themselves should have been declared read-only from the start but for that it is too late, so now all its members are.
2017-06-21 11:39:59 +02:00
Rachael Alexanderson ff257fcfd7 Merge https://github.com/coelckers/gzdoom 2017-06-20 09:39:12 -04:00
Rachael Alexanderson f65c651ffd - applied Maulotaur obituary text from https://forum.zdoom.org/viewtopic.php?f=2&t=56959 2017-06-19 04:16:09 -04:00
Rachael Alexanderson d454fafc9e Merge https://github.com/coelckers/gzdoom 2017-06-19 03:22:23 -04:00
alexey.lysiuk 9b446e41fc Fixed applying of flags on fullscreen inventory bar
DI_ALWAYSSHOWCOUNTERS and DI_DRAWCURSORFIRST flags are no longer ignored in BaseStatusBar.DrawInventoryBar() function
https://forum.zdoom.org/viewtopic.php?t=56798
2017-06-18 16:57:05 +03:00
Christoph Oelckers 3b024c347b - use a dedicated flag word for the dynamic light flags instead of piggybacking on some flags4 bits. 2017-06-18 10:15:31 +02:00
alexey.lysiuk 9ac7aaf7d5 Fixed possibility to stuck in MAP14 of Hellbound
https://forum.zdoom.org/viewtopic.php?t=56925
2017-06-18 09:24:19 +03:00
Rachael Alexanderson 4149cdb343 Merge https://github.com/coelckers/gzdoom 2017-06-17 20:18:22 -04:00
jplebreton 4ec6326daa - Final Doom fixes: two progression blockers and a few bugs in maps that prevented getting 100% kills and/or items. 2017-06-17 09:09:55 +02:00
Rachael Alexanderson c70dac2d7f Merge https://github.com/coelckers/gzdoom 2017-06-16 13:27:03 -04:00
alexey.lysiuk 478d72b37b Fixed resetting of activation failed flag on pickup
https://forum.zdoom.org/viewtopic.php?t=56896
2017-06-14 22:13:40 +03:00
alexey.lysiuk c22017f981 Made two Hexen maps compatibility options data driven 2017-06-14 16:10:01 +03:00
Rachael Alexanderson c239ca3262 Merge https://github.com/coelckers/gzdoom 2017-06-13 00:50:50 -04:00
jplebreton 29ca258cb9 Fixes for two Master Levels: progression blocker in catwalk.wad, unattainable secret in nessus.wad. 2017-06-12 12:16:06 +02:00
Rachael Alexanderson a148212215 Merge commit 'f1ad42c' 2017-06-12 00:22:59 -04:00
Christoph Oelckers ee3d73478a - added blanket protection to all submenus of OptionsMenu, except the player menu.
Sadly, some mods are truly careless enough to modify the engine internal menus to add their own things, which should have no business whatsoever in there.
As an example, in a D4D version released in May, the Display Options menu is showing quite a bit of outdated content and missing important settings.
2017-06-11 09:57:10 +02:00
Rachael Alexanderson 5405625219 - added Blade of Agony (Chapter 2) as an IWAD 2017-06-10 10:57:45 -04:00
Rachael Alexanderson c6b68df51d - moved Rise of the Wall ball down in the detection list as far as it would safely go - since that was a directive when WadSmoosh was added. 2017-06-10 10:35:48 -04:00
alexey.lysiuk e0ece283aa Added support for Rise Of The Wool Ball as IWAD 2017-06-10 16:05:57 +03:00
alexey.lysiuk 8a300b99e9 Fixed interpolation points chaining
Ambush flag cannot be used for marking visited points because HandleSpawnFlags() is no longer virtual
See E1M4 from Rise Of The Wool Ball v1.1 as example of broken chain
2017-06-10 15:50:44 +03:00
jplebreton c1e39ca06a fix erroneous 8th secret sector in nerve.wad aka No Rest For The Living map04 (called level04 in the wad) 2017-06-10 08:39:37 +02:00
Rachael Alexanderson a48203ef1d Merge https://github.com/coelckers/gzdoom 2017-06-10 01:00:38 -04:00
alexey.lysiuk 99d89f0730 Fixed position of Targeter's markers during wearing out
https://forum.zdoom.org/viewtopic.php?t=56811
2017-06-09 15:08:01 +03:00
Rachael Alexanderson f8ba5c7b1f - fixed: Updating your sigil (Strife) should not override the number of 'deselect' pieces you have when swapping to another weapon. 2017-06-09 06:22:31 -04:00
Rachael Alexanderson 63d9148604 Merge https://github.com/coelckers/gzdoom 2017-06-09 05:57:10 -04:00
Christoph Oelckers 6b3093d7ad Another sound with wrong attenuation 2017-06-08 17:13:36 +02:00
Christoph Oelckers 68e17eb0c6 Create alienspectres.txt
fixed attenuation for Strife's 'killed a spectre' message.
2017-06-08 16:23:35 +02:00
Rachael Alexanderson 077cd09d8d Merge https://github.com/coelckers/gzdoom 2017-06-06 16:40:21 -04:00
Rachael Alexanderson 33a58a3ada - fixed: corrected language entries for Classic Transparency - the 'auto' options were reversed. 2017-06-06 10:19:14 -04:00
Christoph Oelckers a210aaea3e - fixed: All melee functions calling TraceBleed after DamageMobj must first copy the target member to a local variable.
DamageMobj can destroy the damaged actor if the death state sequence has zero duration. But Actor.target is a garbage collected member variable, i.e. it will be null, once the actor it points to gets destroyed.
This was originally done correctly in the C++ code but during the scriptification all those 'AActor *target = self->target' lines were removed because they looked redundant, but were not.
2017-06-06 09:12:58 +02:00
Rachael Alexanderson 5d40b2c36c Merge https://github.com/coelckers/gzdoom 2017-06-04 21:04:33 -04:00
alexey.lysiuk a797db74da Silenced scripting warning from main .pk3
Script warning, "gzdoom.pk3:zscript/menu/playercontrols.txt" line 526:
Truncation of floating point value
2017-06-04 16:21:10 +03:00
Rachael Alexanderson 5eaf085d58 - fixed minor menudef mistake 2017-06-04 12:30:35 +02:00
Rachael Alexanderson 68b6f922f7 - Added auto-detection scheme for r_vanillatrans
It now works the following way:
(0) - Force off (ZDoom defaults)
(1) - Force on (Doom defaults)
(2) - Auto off (Prefer ZDoom defaults - if DEHACKED is detected with no ZSCRIPT it will turn on) (default)
(3) - Auto on (Prefer Doom defaults - if DECORATE is detected with no ZSCRIPT it will turn off)
2017-06-04 12:30:35 +02:00
Rachael Alexanderson 11741846c6 - fixed: missed the teleport fog 2017-06-04 12:30:35 +02:00
Rachael Alexanderson e1bb44a9ed - added menu option for r_vanillatrans 2017-06-04 12:30:35 +02:00
Rachael Alexanderson 10a9d087f1 - fixed: missed the golden wand puff for the +ZDOOMTRANS flag 2017-06-04 12:30:35 +02:00
Rachael Alexanderson 2997f31f9f - removed ZDOOMADD and updated actors in question with ZDOOMTRANS 2017-06-04 12:30:35 +02:00
Rachael Alexanderson a937f709aa - Added +ZDOOMADD to all Heretic, Hexen, and Strife actors that needed it (that I know of...)
- this developer's insanity level increased another 21%
2017-06-04 12:30:35 +02:00
Rachael Alexanderson 89b372cb01 - Changed MF7_SPRITEFLIP, MF8_ZDOOMTRANS to RenderFlags
- Added RF_ZDOOMADD
- renamed r_canontrans to r_vanillatrans
- this developer's insanity level has increased by 231%.
2017-06-04 12:30:35 +02:00
Rachael Alexanderson c252b5d753 - fixed: forgot to assign +ZDOOMTRANS to rockets 2017-06-04 12:30:35 +02:00
Rachael Alexanderson 01f88cfb16 - Added 'canonical transparency' cvar r_canontrans - this simply turns off transparency for Doom objects that were marked as transparent sometime in ZDoom's development cycle 2017-06-04 12:30:35 +02:00
Rachael Alexanderson e5eb173165 - fixed minor menudef mistake 2017-06-04 05:33:37 -04:00
Rachael Alexanderson 64b22f6cb3 Merge https://github.com/coelckers/gzdoom 2017-06-03 22:34:13 -04:00
Rachael Alexanderson deb62ee156 Merge commit 'refs/pull/340/head' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/gl/scene/gl_sprite.cpp
#	src/polyrenderer/scene/poly_sprite.cpp
#	src/swrenderer/things/r_sprite.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
2017-06-03 20:06:28 -04:00
Rachael Alexanderson 9af370f51e - Added auto-detection scheme for r_vanillatrans
It now works the following way:
(0) - Force off (ZDoom defaults)
(1) - Force on (Doom defaults)
(2) - Auto off (Prefer ZDoom defaults - if DEHACKED is detected with no ZSCRIPT it will turn on) (default)
(3) - Auto on (Prefer Doom defaults - if DECORATE is detected with no ZSCRIPT it will turn off)
2017-06-03 20:00:53 -04:00
Magnus Norddahl 7acb492852 - Add gl_shadowmap_quality cvar that controls the resolution of the 1D shadow map texture 2017-06-04 00:44:49 +02:00
Magnus Norddahl 265df4b797 - Change shadowmap resolution from 1024 to 128 2017-06-03 21:19:34 +02:00
jplebreton 2c7a0c87c8 add FloatBobStrength Actor property, a multiplier on Z offset created by FloatBob behavior. default of 1.0 is current behavior, set higher/lower for more/less extreme bobbing. 2017-06-03 18:02:27 +02:00
Rachael Alexanderson cdc0bf1cd5 - condense all of unloved/2.pk3's compatibility entries together since they are all the same 2017-06-02 16:58:22 -04:00
Rachael Alexanderson 28821e5eca - condense all of unloved/2.pk3's compatibility entries together since they are all the same 2017-06-02 16:57:37 -04:00
Rachael Alexanderson 9b3d11ae19 - fixed: missed the teleport fog 2017-06-02 12:41:25 -04:00
Rachael Alexanderson 9871117f56 - fixed: missed the teleport fog 2017-06-02 12:41:03 -04:00
Rachael Alexanderson 9abf866241 - added menu option for r_vanillatrans 2017-06-02 12:37:54 -04:00
Rachael Alexanderson 579febb6f8 - added menu option for r_vanillatrans 2017-06-02 12:36:29 -04:00
Rachael Alexanderson ede15da98c - fixed: missed the golden wand puff for the +ZDOOMTRANS flag 2017-06-02 12:24:03 -04:00
Rachael Alexanderson b240ad0814 - removed ZDOOMADD and updated actors in question with ZDOOMTRANS 2017-06-02 12:24:03 -04:00
Rachael Alexanderson 91e3b19264 - Added +ZDOOMADD to all Heretic, Hexen, and Strife actors that needed it (that I know of...)
- this developer's insanity level increased another 21%
2017-06-02 12:24:03 -04:00
Rachael Alexanderson 00bfee8b1e - Changed MF7_SPRITEFLIP, MF8_ZDOOMTRANS to RenderFlags
- Added RF_ZDOOMADD
- renamed r_canontrans to r_vanillatrans
- this developer's insanity level has increased by 231%.
2017-06-02 12:24:03 -04:00
Rachael Alexanderson eeaf6214f7 - fixed: forgot to assign +ZDOOMTRANS to rockets 2017-06-02 12:24:03 -04:00
Rachael Alexanderson daad76547d - Added 'canonical transparency' cvar r_canontrans - this simply turns off transparency for Doom objects that were marked as transparent sometime in ZDoom's development cycle 2017-06-02 12:24:03 -04:00
Rachael Alexanderson 7d7b1b3b97 - fixed: missed the golden wand puff for the +ZDOOMTRANS flag 2017-06-02 01:10:46 -04:00
Rachael Alexanderson bf12d38afd - removed ZDOOMADD and updated actors in question with ZDOOMTRANS 2017-06-02 01:10:46 -04:00
Rachael Alexanderson b4dea12a4f - Added +ZDOOMADD to all Heretic, Hexen, and Strife actors that needed it (that I know of...)
- this developer's insanity level increased another 21%
2017-06-02 01:10:46 -04:00
Rachael Alexanderson aa93990d3b - Changed MF7_SPRITEFLIP, MF8_ZDOOMTRANS to RenderFlags
- Added RF_ZDOOMADD
- renamed r_canontrans to r_vanillatrans
- this developer's insanity level has increased by 231%.
2017-06-02 01:10:46 -04:00
Rachael Alexanderson 45d7401885 - fixed: forgot to assign +ZDOOMTRANS to rockets 2017-06-02 01:10:46 -04:00
Rachael Alexanderson 813b321c45 - Added 'canonical transparency' cvar r_canontrans - this simply turns off transparency for Doom objects that were marked as transparent sometime in ZDoom's development cycle 2017-06-02 01:10:45 -04:00
Rachael Alexanderson b78cb6c693 Merge https://github.com/coelckers/gzdoom 2017-06-01 01:02:17 -04:00
Rachael Alexanderson 9e2d44e9c8 - Added a number of missing textures for all 4 episodes of Ultimate Doom 2017-05-31 21:29:25 +02:00
Rachael Alexanderson 68b32d1fe8 Merge https://github.com/coelckers/gzdoom 2017-05-31 12:01:47 -04:00
Rachael Alexanderson f753a8bfbc - Two more compat fixes for Doom2 - this at least covers all the HOM errors mentioned in the Doom Wiki. 2017-05-31 11:28:27 -04:00
Rachael Alexanderson e72ae3f266 Merge ../gzdoom
# Conflicts:
#	src/version.h
#	wadsrc/static/compatibility.txt
2017-05-31 09:08:13 -04:00
Rachael Alexanderson 907d1e0056 - Several compatibility fixes for Doom2's first map cluster. Fixes missing textures as well as incorrect sector tagging causing glitches when opening doors or triggering an ambush. 2017-05-31 08:46:29 -04:00
Rachael Alexanderson 2f7d512acf Merge commit 'refs/pull/335/head' of https://github.com/coelckers/gzdoom 2017-05-29 04:53:39 -04:00
Rachael Alexanderson 7c33554a2d - fixed a spelling error 2017-05-28 20:16:07 -04:00
Rachael Alexanderson a9fdaf3827 - Added numerous compatibility fixes for Doom2: Maps 02 to 11. These fixes mark previously unmarked secrets, and texture fixes in several locations that had HOMs. 2017-05-28 20:16:07 -04:00
Rachael Alexanderson 61660bf147 Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-05-28 10:50:06 -04:00
alexey.lysiuk f759e1155a Damage factor on armor is no longer ignored
https://forum.zdoom.org/viewtopic.php?t=56632
2017-05-28 17:41:44 +03:00
Rachael Alexanderson 65bb8a5185 Merge commit 'refs/pull/338/head' of https://github.com/coelckers/gzdoom 2017-05-28 07:13:27 -04:00