Commit graph

9648 commits

Author SHA1 Message Date
Rachael Alexanderson
8de11ee81a - Begin reimplementing rgb555 again. 2016-12-24 03:52:18 -05:00
Rachael Alexanderson
4755d56bbe Merge https://github.com/rheit/zdoom 2016-12-24 02:31:38 -05:00
Rachael Alexanderson
fa622710f1 Merge https://github.com/coelckers/gzdoom 2016-12-24 02:31:36 -05:00
Magnus Norddahl
52892cb7ef Move particle drawing to a command to prevent pipeline stalls 2016-12-24 01:50:54 +01:00
Magnus Norddahl
2bb2395569 Add menu option to enable dynamic lights (independent of the OpenGL setting so that you can have it on in OpenGL and off in Software) 2016-12-23 23:44:52 +01:00
Magnus Norddahl
8cc4c8a192 Merge remote-tracking branch 'upstream/master' into zdoom-rgb666-take2
# Conflicts:
#	src/r_draw_pal.cpp
2016-12-23 21:27:50 +01:00
Rachael Alexanderson
821b10a254 - Implementing RGB666 colormatching to replace less precise RGB555 in some parts of the code. 2016-12-23 11:41:10 -05:00
Christoph Oelckers
78737f9bc7 - fixed: The cycler for a pulse light needs to be reinitialized when new light properties get applied.
- do not clamp the cycler's output to a byte.
2016-12-23 15:25:39 +01:00
alexey.lysiuk
2327359d74 Fixed sector floor offset compatibility parameter after floatification
See https://forum.zdoom.org/viewtopic.php?t=54690
2016-12-23 10:21:53 +01:00
Magnus Norddahl
175701ac5d Fix lights not being copied when a visplane is duplicated 2016-12-23 03:54:57 +01:00
Magnus Norddahl
b0a96af220 Improve dynamic light performance by only including lights if they touch a column or span 2016-12-22 21:34:03 +01:00
Christoph Oelckers
a825d1d92f Merge branch 'ssao' of https://github.com/dpjudas/dpDoom 2016-12-22 12:40:57 +01:00
Rachael Alexanderson
fa66ca214e Merge https://github.com/coelckers/gzdoom
# Conflicts:
#	src/win32/zdoom.rc
2016-12-22 06:24:47 -05:00
Christoph Oelckers
3b823fa3eb Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	wadsrc/static/compatibility.txt
2016-12-22 11:29:44 +01:00
Rachael Alexanderson
3810328193 - More options for the IWAD picker.
- Rearranged some options around a bit.
- Disable auto load is now an archived cvar.

# Conflicts:
#	src/win32/zdoom.rc
2016-12-22 11:26:23 +01:00
Rachael Alexanderson
cb2c1e591a - Added Zandronum-specific copyright notices for IWAD picker. 2016-12-22 11:26:23 +01:00
Rachael Alexanderson
5fa6094e4f - Changed QZDoom messages to GZDoom. 2016-12-22 11:26:23 +01:00
Rachael Alexanderson
240f973f0c - Implemented Gez's suggestion for disable autoload checkbox on the IWAD selection box.
(cherry picked from commit 578e3270e2)
2016-12-22 11:26:23 +01:00
Rachael Alexanderson
8a9ea2eda8 - Mostly implemented Zandronum's IWAD selection box. Currently, this change only affects Windows.
(cherry picked from commit b3bed807de)
2016-12-22 11:26:23 +01:00
Christoph Oelckers
36f87b7135 - removed gl_light_ambient.
This really serves no use anymore and is mostly a remnant of old times with dark CRT monitors. The default ambient level was set at 20, meaning a sector light level of 40. This is a value actual levels rarely get to, except when using some lighting effects - but it's for those that the ambient clamping did the most damage.
2016-12-22 11:14:13 +01:00
alexey.lysiuk
7dd51d6d1c Fixed infinite execution of error CCMD
https://forum.zdoom.org/viewtopic.php?t=54659
2016-12-22 10:33:21 +01:00
Rachael Alexanderson
ea1aeb3cdc - reversed sub and revsub in LLVM drawers 2016-12-22 03:35:59 -05:00
Magnus Norddahl
4f7c1dfdf5 Dynamic lights on flats 2016-12-22 08:42:21 +01:00
Magnus Norddahl
fcbacf8cac Plane dynlight setup 2016-12-22 07:06:18 +01:00
Magnus Norddahl
5cfe0cc955 Remove some whitespace 2016-12-22 05:20:53 +01:00
Magnus Norddahl
4551052174 Fix dynamic light calculations to be unaffected by wall clipping 2016-12-22 03:02:58 +01:00
Magnus Norddahl
22f07b06cd Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-12-21 18:38:09 +01:00
Magnus Norddahl
62716c3d91 Fix drawing dormant lights 2016-12-21 18:38:01 +01:00
Rachael Alexanderson
cd3fc2d6b8 - More options for the IWAD picker.
- Rearranged some options around a bit.
- Disable auto load is now an archived cvar.
2016-12-21 05:11:29 -05:00
Rachael Alexanderson
dcd0ab98cc - Added Zandronum-specific copyright notices for IWAD picker. 2016-12-21 02:18:49 -05:00
Magnus Norddahl
4e56c9a41a Hooked up dynamic light on walls 2016-12-21 07:33:28 +01:00
Rachael Alexanderson
578e3270e2 - Implemented Gez's suggestion for disable autoload checkbox on the IWAD selection box. 2016-12-20 23:03:06 -05:00
Rachael Alexanderson
da0f2b47b1 Merge https://github.com/rheit/zdoom 2016-12-20 22:29:02 -05:00
Magnus Norddahl
8a3db6c003 Dynamic lights? Did anyone say DYNAMIC LIGHTS? 2016-12-20 23:21:34 +01:00
Rachael Alexanderson
b3bed807de - Mostly implemented Zandronum's IWAD selection box. Currently, this change only affects Windows. 2016-12-20 13:31:38 -05:00
Christoph Oelckers
b15e620ea8 - fixed: Phased light setup did not check if a sector had been already visited and could cause infinite recursion. 2016-12-20 18:27:24 +01:00
Rachael Alexanderson
8a1ac909b4 Merge https://github.com/rheit/zdoom 2016-12-20 06:57:53 -05:00
alexey.lysiuk
9f6d8d2ba7 Set goal values in decal stretcher to zeros even if they are not used
See https://forum.zdoom.org/viewtopic.php?t=54592
2016-12-20 12:19:12 +01:00
alexey.lysiuk
a0595f17e8 Serializer now writes floating point zero if special value is encountered
See https://forum.zdoom.org/viewtopic.php?t=54592
2016-12-20 12:19:12 +01:00
Magnus Norddahl
452e0dcfc9 Merge remote-tracking branch 'zdoom/master' into qzdoom
# Conflicts:
#	src/r_draw.cpp
#	src/r_draw.h
#	src/r_plane.cpp
2016-12-20 02:10:10 +01:00
Magnus Norddahl
2676ca1284 Rename wall drawer args and functions to closer match the general naming convention 2016-12-19 21:39:16 +01:00
Rachael Alexanderson
5ffee5231f - Hooking the new RGB256k drawer to triangle drawer in place of RGB32k. 2016-12-19 11:35:43 -05:00
Rachael Alexanderson
978152f483 Merge https://github.com/rheit/zdoom
# Conflicts:
#	wadsrc/static/compatibility.txt
2016-12-19 08:16:41 -05:00
Rachael Alexanderson
5d85990d5f - Implementing RGB666-to-Palette colormatching for textures. 2016-12-19 13:46:08 +01:00
alexey.lysiuk
94f7bef2ff Added compatibility parameter to set sector special 2016-12-19 12:18:43 +01:00
Rachael Alexanderson
a4944067e8 - fixed: whoops, fixed quite a merge faux pas there. 2016-12-18 20:57:27 -05:00
Rachael Alexanderson
bedf4bccea Merge commit '1fa37aaeb79d3ab1e5d4aa2b4376130e9f4826fb' 2016-12-18 20:55:45 -05:00
Rachael Alexanderson
134825a8c8 Merge commit '2fea46a719b2084bde7d9e9e37f9a26a5a59c1ab' 2016-12-18 20:55:00 -05:00
Christoph Oelckers
1fa37aaeb7 - fixed code generation for if statements with empty 'true' part. For those the jump statement backpatching was not done correctly. 2016-12-18 14:09:16 +01:00
Christoph Oelckers
8dd91f7129 - added a missing null pointer check to FxIfStatement::Emit. 2016-12-18 12:18:03 +01:00
Major Cooke
1bcebb091a Added option to check the location for resizing, changing the return into a bool. 2016-12-18 11:59:24 +01:00
Major Cooke
3023af8223 - Added A_SetSize(double newradius, double newheight = -1).
- Changes the calling actor's radius and height.
2016-12-18 11:59:24 +01:00
Magnus Norddahl
2fea46a719 Removed leftovers from QZDoom 2016-12-18 11:58:32 +01:00
Magnus Norddahl
9ac7a07be6 - Set colormap light info using R_SetColorMapLight and R_SetDSColorMapLight rather than manually calculating it
- Move texture and span management into R_DrawMaskedColumn
2016-12-18 11:58:32 +01:00
Christoph Oelckers
98e549246d Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-17 17:39:57 +01:00
Magnus Norddahl
6e8174d9b4 More psprite stuff 2016-12-16 23:02:34 +01:00
Magnus Norddahl
ecebeed296 Fix player sprites disappearing when a texture camera is visible 2016-12-16 22:16:24 +01:00
Magnus Norddahl
b5f3f63b93 Minor bug fixes 2016-12-16 20:52:56 +01:00
Rachael Alexanderson
ace380d5fc Merge https://github.com/rheit/zdoom 2016-12-16 06:39:16 -05:00
Christoph Oelckers
7ca5851f78 - fixed a second spot in RapidJSON where a bad NaN check was done. 2016-12-16 08:05:29 +01:00
Magnus Norddahl
6d295a25c2 Minor tweaking 2016-12-16 06:21:17 +01:00
Magnus Norddahl
9b98c4d512 Fix out of bounds bug 2016-12-16 05:01:49 +01:00
Rachael Alexanderson
0b4fd6c766 Merge https://github.com/rheit/zdoom 2016-12-15 20:07:10 -05:00
Magnus Norddahl
adb65ce72a Remove TriDrawVariant 2016-12-16 00:35:45 +01:00
Christoph Oelckers
9ef551b84a - fixed: Start items for players were never actually checked for their type and could cause crashes if non-inventories were given. 2016-12-16 00:28:16 +01:00
Magnus Norddahl
99435f5018 Remove TriDrawVariant from LLVM codegen 2016-12-15 23:29:31 +01:00
Rachael Alexanderson
8fede44c3d - fixed: Some RenderStyles would crash ZDoom. 2016-12-15 18:55:20 +01:00
Rachael Alexanderson
e556fb16bd Merge https://github.com/rheit/zdoom 2016-12-15 03:42:58 -05:00
Magnus Norddahl
c3cb9d20fb Fix uncleared buffer when upscaling the cursor 2016-12-15 09:30:45 +01:00
Magnus Norddahl
c643238b86 Rewrote the LLVM triangle drawer to use the data from the triangle setup function 2016-12-15 01:33:26 +01:00
Magnus Norddahl
145c0a6d9e Prepare triangle setup to be used by LLVM drawers 2016-12-13 19:26:13 +01:00
Magnus Norddahl
be357e1c98 Triangle setup function for subsector based drawing 2016-12-13 12:57:04 +01:00
Rachael Alexanderson
dfc43bcb83 Merge https://github.com/rheit/zdoom 2016-12-12 20:22:55 -05:00
Magnus Norddahl
c1e2c25907 Stencil close 2016-12-13 02:13:48 +01:00
Magnus Norddahl
022368d349 Stencil write 2016-12-13 00:55:29 +01:00
Magnus Norddahl
5277d4ae28 Diminishing light test 2016-12-12 22:42:42 +01:00
Magnus Norddahl
9cfee05102 Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-12-12 21:34:29 +01:00
Magnus Norddahl
afb946d586 Added texturing 2016-12-12 21:34:22 +01:00
Rachael Alexanderson
5e171824ac - "myinfo" - executes info on oneself
- "targetinv" - executes "printinv" at current crosshair target
2016-12-12 15:22:56 +01:00
Rachael Alexanderson
b50ff986a6 Merge https://github.com/rheit/zdoom 2016-12-12 08:26:19 -05:00
Magnus Norddahl
79ad5d2a2a Write out subsector info 2016-12-12 12:39:25 +01:00
Magnus Norddahl
e016a96efe Use less triangles for the sky 2016-12-12 12:38:46 +01:00
Christoph Oelckers
56a42a26b2 - fixed: DPSprite's constructor did not initialize the 'Sprite' member variable. This can cause problems if some weapon starts with a placeholder sprite in the first state. 2016-12-12 12:32:48 +01:00
Magnus Norddahl
bee363d79a Add stencil testing 2016-12-12 10:44:34 +01:00
Magnus Norddahl
b0f3686bc6 Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-12-12 01:34:00 +01:00
Magnus Norddahl
b2bed88092 SSE speed test 2016-12-12 01:33:51 +01:00
Rachael Alexanderson
1a111f48bc Merge https://github.com/rheit/zdoom 2016-12-11 16:46:08 -05:00
Christoph Oelckers
77d9978b27 - fixed: Non-Actors cannot act as activators for action specials and must pass null when acticating one. 2016-12-11 21:39:35 +01:00
Christoph Oelckers
e61ae9a1f9 - pass a proper self pointer to BuiltinCallActionSpecial instead of making bogus assumptions about a function's parameters. 2016-12-11 21:32:19 +01:00
Magnus Norddahl
2af95965ef Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-12-11 17:41:07 +01:00
Magnus Norddahl
21341b92a5 Experiment with splitting triangle block coverage from block drawing 2016-12-11 17:39:44 +01:00
Christoph Oelckers
71fd949f26 Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-11 14:45:42 +01:00
Christoph Oelckers
b43609c701 - fixed: The weapon sprite fudge offset should not be added when just interpolating the position and calculating the delta. 2016-12-11 14:45:20 +01:00
Christoph Oelckers
40355f6298 - allow A_M_Refire to be called without state label because this seems to have been used in existing DECORATE mods. This way of calling it will revert to the old behavior of jumping one state forward instead of to a state label. 2016-12-11 13:07:25 +01:00
Christoph Oelckers
aa758159c9 - renamed Actor.NoiseAlert to Actor.SoundAlert to deconflict with the same-named action special. 2016-12-11 12:10:05 +01:00
Christoph Oelckers
d2d960672c Revert "Fixed: A_CustomMissile's CMF_AIMDIRECTION's pitch calculations were also backwards."
This reverts commit b17bd65279.

This would break too many existing mods.
2016-12-11 11:39:46 +01:00
Rachael Alexanderson
4eef1d99ee Merge https://github.com/rheit/zdoom 2016-12-10 15:46:35 -05:00
Christoph Oelckers
952e47cfe4 - renamed internal MELEERANGE constant to deconflict with Actor's MeleeRange member. 2016-12-10 16:36:19 +01:00
Rachael Alexanderson
c48b528824 Merge https://github.com/rheit/zdoom 2016-12-10 08:04:51 -05:00
Edoardo Prezioso
d92a814e8c - Fixed wrong argument format in voxeldef parser code.
It got revealed by the GCCPRINTF format addition to FScanner::ScriptMessage.
2016-12-10 14:02:12 +01:00