Commit graph

9790 commits

Author SHA1 Message Date
Christoph Oelckers
e956d19769 - preserve the factor set by I_SetMusicVolume when starting new music. 2016-12-27 15:44:06 +01:00
Christoph Oelckers
4bf19fb665 - don't let monsters block teleports of non-solid inventory items. Doom's code never considered such a possibility and would consider the move blocking, despite the item being non-solid. 2016-12-27 15:34:44 +01:00
Christoph Oelckers
4da8b1a3b7 - delete r_ headers from portal.cpp. 2016-12-27 13:04:46 +01:00
alexey.lysiuk
2f9d5e285d Removed deprecated code from macOS SDL backend 2016-12-27 13:18:33 +02:00
alexey.lysiuk
186c7b8814 Removed deprecated code from macOS SDL backend 2016-12-27 12:56:21 +02:00
alexey.lysiuk
96228fd645 Fixed compilation of non-Windows backends 2016-12-27 12:55:26 +02:00
Magnus Norddahl
a94fee0e5d Rename R_ActiveDrawers to R_Drawers 2016-12-27 08:54:37 +01:00
Magnus Norddahl
272b302294 Create SWPixelFormatDrawers for pal and bgra drawers 2016-12-27 08:47:51 +01:00
Christoph Oelckers
d5032663ad - fixed: All missiles which can bounce off actors need the CANPASS/PASSMOBJ flag so setting this in the 'bouncetype' property is insufficient, it needs to be done when the actor has been completely parsed. 2016-12-27 02:12:27 -05:00
Magnus Norddahl
398001b6cb Move code into R_UpdateFuzzPos 2016-12-27 07:45:10 +01:00
Magnus Norddahl
4554cf45f1 Remove duplicate prototype entry 2016-12-27 07:41:30 +01:00
Magnus Norddahl
325fa20a02 Add R_DrawFogBoundaryLine and move R_DrawFogBoundary to a source file closer to its correct location 2016-12-27 07:40:35 +01:00
Magnus Norddahl
f1cd91922b Move to correct header 2016-12-27 07:32:21 +01:00
Magnus Norddahl
5a7765910f Merge R_SetupSpanBits with R_SetSpanSource and rename it to R_SetSpanTexture 2016-12-27 07:30:29 +01:00
Magnus Norddahl
4d0cc9e7bb Remove old voxel slab drawer 2016-12-27 07:25:11 +01:00
Magnus Norddahl
46e9a0cdf9 Remove zdoom ifdef version as we aren't doing merges from there anymore 2016-12-27 07:20:22 +01:00
Magnus Norddahl
49903af394 Remove 4 column wall drawers 2016-12-27 07:18:04 +01:00
Magnus Norddahl
2659090e1c Move renders into folders 2016-12-27 06:31:55 +01:00
Magnus Norddahl
e27702481d Fix warning 2016-12-27 05:12:10 +01:00
Magnus Norddahl
e91c5ac54d Merge branch 'master' into OverlayExtension10 2016-12-27 04:32:13 +01:00
Magnus Norddahl
bafc985282 Fix pal particle performance issue 2016-12-27 03:31:34 +01:00
Magnus Norddahl
66b154a475 Voxel mipmap selection 2016-12-27 03:07:50 +01:00
Christoph Oelckers
a37db1c4d7 - fixed: All missiles which can bounce off actors need the CANPASS/PASSMOBJ flag so setting this in the 'bouncetype' property is insufficient, it needs to be done when the actor has been completely parsed. 2016-12-27 00:32:54 +01:00
Rachael Alexanderson
6b2ddb0f3a Merge https://github.com/coelckers/gzdoom 2016-12-26 17:26:55 -05:00
Christoph Oelckers
e9574276a5 - added CanCollideWith calls to a few more places where they are needed. 2016-12-26 22:33:07 +01:00
Rachael Alexanderson
d8df255438 Merge https://github.com/coelckers/gzdoom 2016-12-26 15:46:44 -05:00
Rachael Alexanderson
7ea4c9508f Merge https://github.com/rheit/zdoom 2016-12-26 15:46:17 -05:00
Major Cooke
ff3487d389 Merge branch 'OverlayAlpha' into OverlayExtension9
# Conflicts:
#	src/p_pspr.cpp
#	src/r_draw.cpp
#	wadsrc/static/actors/actor.txt
#	wadsrc/static/actors/constants.txt
2016-12-26 14:37:22 -06:00
Christoph Oelckers
58316c821d - fixed: The pitch shifting info for sounds needs to be taken from the sfxinfo currently being played, not the one it links to. 2016-12-26 21:07:21 +01:00
Christoph Oelckers
5327055495 - fixed: Source for nailbomb damage in A_Explode should be the caller's target, if defined and the caller is a missile. 2016-12-26 20:37:04 +01:00
Christoph Oelckers
b9f7e0eb36 Merge remote-tracking branch 'remotes/zdoom/master' 2016-12-26 19:33:16 +01:00
Edoardo Prezioso
3f7c057f92 - Fixed heap use after free issue with lights. 2016-12-26 18:23:17 +01:00
Christoph Oelckers
625e97dfd1 - fixed: UpdateRenderSectorList needs to reset the sector before traversing floor portals. 2016-12-26 16:22:28 +01:00
alexey.lysiuk
3fe3abc51e Fixed endianness issue in script VM
See https://forum.zdoom.org/viewtopic.php?t=54549
2016-12-26 09:36:01 -05:00
alexey.lysiuk
aeee80c8fa Fixed endianness issue in script VM
See https://forum.zdoom.org/viewtopic.php?t=54549
2016-12-26 15:31:59 +01:00
Christoph Oelckers
470a96d3b2 - fixed: non-damaging attacks should not cause infighting, unless some relevant pain flags are being set. 2016-12-26 08:18:25 -05:00
Rachael Alexanderson
80228562b3 - Fixed problems with FillSub and FillRevSub drawers. 2016-12-26 08:05:04 -05:00
Rachael Alexanderson
5d6d75385e - pulled some things out of the loop for the fill drawer 2016-12-26 07:41:52 -05:00
Christoph Oelckers
be508bc670 - adjust to using msecnode_t's. 2016-12-26 12:11:55 +01:00
Christoph Oelckers
9cb2a8f931 Merge remote-tracking branch 'remotes/zdoom/master' 2016-12-26 12:04:13 +01:00
Christoph Oelckers
7f72de6b71 - use msecnode_t's for the touching_renderlists instead of std::forward_list.
- preparations for checking the proper sector to get a sprite's lighting info.
2016-12-26 11:58:08 +01:00
Magnus Norddahl
100b80143a Add basic voxel drawing showing how to use the input data structures 2016-12-26 05:09:01 +01:00
ZZYZX
6f16597668 GL renderer now uses RenderRadius links too 2016-12-25 23:46:03 +01:00
Christoph Oelckers
19856d6ccb Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-25 22:56:35 +01:00
Christoph Oelckers
c5d75c18b4 - make gl_finishbeforeswap more useful by handling the case where it causes stalls on NVidia. 2016-12-25 22:56:18 +01:00
Christoph Oelckers
04ff4282ef - removed the global 'sector_list' variable.
If the calling code wants to recycle this it will have to pass a container variable to AActor::UnlinkFromWorld and AActor::LinkToWorld.
This was changed because keeping such data in a global variable is dangerous for a set of functions that can be called from a script.
Note that the scripted versions do not yet support saving of the touching_sectorlist.
2016-12-25 22:40:26 +01:00
Christoph Oelckers
5723f10cc3 - use 'for' iterator syntax to check touching_renderlists. 2016-12-25 19:37:07 +01:00
Christoph Oelckers
663b305eec - include proper headers for std::find. 2016-12-25 19:25:19 +01:00
Christoph Oelckers
2ce55e5416 - fixed: non-damaging attacks should not cause infighting, unless some relevant pain flags are being set. 2016-12-25 19:19:49 +01:00
alexey.lysiuk
2901e2d834 Added missing Intel intrinsics #include 2016-12-25 17:43:13 +02:00
Christoph Oelckers
89b7cf4262 - fixed: RenderRadius needs to be serialized.
- fixed: CustomBridge can be visible so it shouldn't be completely excluded from the render lists.
2016-12-25 14:35:35 +01:00
Christoph Oelckers
ad2993950a - fixed light level calculation for low light levels. 2016-12-25 12:58:29 +01:00
ZZYZX
44c19b5ad9 Changed zero RenderRadius logic - negative values now used for 'no rendering', restored old logic with max(radius, renderradius) 2016-12-25 13:40:21 +02:00
ZZYZX
40a180c15f Changed zero RenderRadius logic - thing should still link to own sector 2016-12-25 13:37:45 +02:00
ZZYZX
fcd8a0ce92 Reverted STYLE_None change to P_LinkRenderSectors, implemented zero RenderRadius that effectively disables rendering of an actor entirely 2016-12-25 13:35:03 +02:00
ZZYZX
98657f6844 STYLE_None actors are no more subject to P_LinkRenderSectors 2016-12-25 13:19:45 +02:00
ZZYZX
87b23d160b Ported RenderRadius and related code from gzdoom branch 2016-12-25 13:09:32 +02:00
Magnus Norddahl
66b9e2208d Draw a rect where the voxels would be 2016-12-25 11:07:50 +01:00
Magnus Norddahl
5ec989d563 Make particles always square 2016-12-25 08:08:01 +01:00
Magnus Norddahl
08fd81802d Remove useRt 2016-12-25 08:01:21 +01:00
Magnus Norddahl
6f86c11058 DrawWallAdd1Pal cannot do dynamic lights 2016-12-25 07:56:09 +01:00
Magnus Norddahl
a76cd35333 Dynamic lights to the flats in pal mode 2016-12-25 07:49:44 +01:00
Magnus Norddahl
d428634c58 Add dynlights to pal wall drawers 2016-12-25 07:15:17 +01:00
Magnus Norddahl
ea92b95483 Change define to if statement 2016-12-25 06:00:18 +01:00
Magnus Norddahl
ced7bdf94a Remove rt drawer family and the infrastructure supporting it 2016-12-25 05:46:16 +01:00
Magnus Norddahl
57593adeb0 Simplify ESPSResult to a boolean 2016-12-25 05:15:23 +01:00
Magnus Norddahl
b0febec986 Removed r_columnmethod as its performance gains are too insignificant to justify its complexity on the codebase 2016-12-25 05:05:53 +01:00
Rachael Alexanderson
8231032f89 - fixed a crash
- tried to make MAKETRANSDOT algorithm more consistent with original
2016-12-24 19:22:31 -05:00
Rachael Alexanderson
564bfe482c Merge branch 'zdoom-rgb666-take3' of https://github.com/raa-eruanna/qzdoom into qzdoom-rgb666
# Conflicts:
#	src/r_draw.cpp
#	src/r_plane.cpp
#	src/r_things.h
#	src/v_draw.cpp
#	src/v_video.cpp
2016-12-24 19:00:28 -05:00
Rachael Alexanderson
6a550c89a9 Merge https://github.com/rheit/zdoom 2016-12-24 18:22:14 -05:00
Christoph Oelckers
4ee2d4a1a4 - print proper information in zcc_compile.cpp. 2016-12-24 23:52:52 +01:00
alexey.lysiuk
5d8d15ecc3 Fixed additional format string warning reported by GCC/Clang
See https://forum.zdoom.org/viewtopic.php?t=54541
2016-12-24 23:51:08 +01:00
alexey.lysiuk
e825918451 Fixed format strings warnings reported by GCC/Clang
See https://forum.zdoom.org/viewtopic.php?t=54541 and https://forum.zdoom.org/viewtopic.php?t=54709
2016-12-24 23:51:08 +01:00
Rachael Alexanderson
62e093a7da - fixed: mistyped r_columnmethod instead of r_blendmethod in a span drawer. 2016-12-24 14:10:51 -05:00
Rachael Alexanderson
9ece249dbb - Reimplemented rgb555 into burn/crossfade in f_wipe.cpp. 2016-12-24 12:42:27 -05:00
Rachael Alexanderson
785b58f57a - Reimplemented rgb555 for drawers in r_drawt_pal.cpp 2016-12-24 12:30:45 -05:00
Christoph Oelckers
54822c29eb - changed pitch math in P_RailAttack to avoid having to deal with bogus math throughout the entire function. Effectively the only thing this changes is passing the correct pitch to P_DrawRailTrail. 2016-12-24 18:24:44 +01:00
Christoph Oelckers
39d2945016 fixed two more places where a negative pitch was calculated:
- A_CustomRailgun when missing the target.
 - A_FaceMovementDirection which ironically had some bad compensation inside. It is not restored to how the code looked in 2.8.1.
2016-12-24 18:10:37 +01:00
Rachael Alexanderson
101108877a - Reimplemented rgb555 into all drawers in r_draw_pal.cpp including span drawers. All that remains now are the 4col drawers in r_drawt_pal.cpp. 2016-12-24 11:40:15 -05:00
Christoph Oelckers
287974968a - renamed A_FireCustomMissile and added a deprecated compatibility wrapper to deal with the inverted pitch this function used. 2016-12-24 16:34:45 +01:00
Rachael Alexanderson
80482e98a3 - renamed r_blendmode to r_blendmethod
- did another drawer
2016-12-24 10:15:02 -05:00
Rachael Alexanderson
4e100fc9a1 Merge branch 'master' of https://github.com/rheit/zdoom into zdoom-rgb666-take3 2016-12-24 10:11:53 -05:00
Christoph Oelckers
b807f50bde - fixed: AimBulletMissile used negative pitch to calculate the projectile's trajectory, presumably because A_Face calculated it wrong in recent devbuilds. 2016-12-24 15:10:07 +01:00
Christoph Oelckers
d4c0ee9e43 - address bad use of pitch in A_CustomMissile.
This function calculated everything correctly but ultimately set the vertical velocity wrong. Most importantly this meant that the actual velocity vector and actor pitch - if CMF_SAVEPITCH was used - did not match.
Since this bug has been present since the pitch parameter was added, this deprecates A_CustomMissile and replaces it with a properly implemented A_SpawnProjectile function and handling the compatibility case with a new flag and a scripted wrapper function.
All internal uses of A_CustomMissile have been replaced as well.
2016-12-24 14:46:34 +01:00
Magnus Norddahl
b04ac8f346 Rounded particles 2016-12-24 14:45:56 +01:00
Rachael Alexanderson
88b6038999 - More rgb555 reimplements. 2016-12-24 04:35:05 -05:00
Rachael Alexanderson
9d2128a4f4 - Fixed compile errors. 2016-12-24 04:01:50 -05:00
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