Magnus Norddahl
e91c5ac54d
Merge branch 'master' into OverlayExtension10
2016-12-27 04:32:13 +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
f5883d3f86
- fixed: DynamicLight needs a render radius of -1 so that it gets excluded from the touching_renderlist.
2016-12-26 12:04: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
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
ZZYZX
38cb7aeaaa
Invisible and Custom bridges now have RenderRadius -1 to prevent excessive linking
2016-12-25 13:43:32 +02: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
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
87b23d160b
Ported RenderRadius and related code from gzdoom branch
2016-12-25 13:09:32 +02: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
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
Rachael Alexanderson
2fa13396f2
- Added r_blendmethod to the menu.
2016-12-24 12:50:17 -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
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
Rachael Alexanderson
4755d56bbe
Merge https://github.com/rheit/zdoom
2016-12-24 02:31:38 -05: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
Christoph Oelckers
4fcf9933f0
- copy target to a local variable in A_VileAttack so that it remains accessible if A_Explode destroys the actor.
2016-12-23 16:34:02 +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
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
Rachael Alexanderson
978152f483
Merge https://github.com/rheit/zdoom
...
# Conflicts:
# wadsrc/static/compatibility.txt
2016-12-19 08:16:41 -05:00
alexey.lysiuk
f6b0f2648c
Cleared staircase to secret area in Ultimate Doom E4M3
...
Only the final room with goodies is marked as secret
2016-12-19 12:18:43 +01:00
alexey.lysiuk
28a23d4ff3
Removed unreachable secrets from Doom IWADs
...
See https://forum.zdoom.org/viewtopic.php?t=54632
2016-12-19 12:18:43 +01:00
Rachael Alexanderson
bedf4bccea
Merge commit '1fa37aaeb79d3ab1e5d4aa2b4376130e9f4826fb'
2016-12-18 20:55:45 -05: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
Christoph Oelckers
98e549246d
Merge branch 'master' of https://github.com/rheit/zdoom
2016-12-17 17:39:57 +01:00
Rachael Alexanderson
b50ff986a6
Merge https://github.com/rheit/zdoom
2016-12-12 08:26:19 -05:00
Christoph Oelckers
f3762934e3
- fixed: A_AlertMonsters lost one 'self.' during conversion.
2016-12-12 12:50:17 +01:00
Rachael Alexanderson
1a111f48bc
Merge https://github.com/rheit/zdoom
2016-12-11 16:46:08 -05:00
Christoph Oelckers
71fd949f26
Merge branch 'master' of https://github.com/rheit/zdoom
2016-12-11 14:45:42 +01:00
Christoph Oelckers
0f9758bb75
- fixed some conversion errors in A_StalkerLookInit.
2016-12-11 13:17:50 +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
898e2900b3
- more fixes in blastradius.txt.
2016-12-11 12:42:55 +01:00
Christoph Oelckers
2b24fee53d
- fixed: A_BlastRadius accessed the player's ReadyWeapon before ensuring it got called from a player.
2016-12-11 12:37:12 +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
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
c109ebf7cb
Merge branch 'master' of https://github.com/coelckers/gzdoom
2016-12-09 03:00:02 -05:00
Christoph Oelckers
14400c41b6
Merge branch 'zmaster'
2016-12-08 17:53:41 +01:00
Christoph Oelckers
a4d2468d34
- disable weapon interpolation for offset changes.
...
This has been causing far too many problems so now it will only be done if a A_Weaponoffset is either used with WOF_ADD or WOF_INTERPOLATE.
2016-12-08 17:52:59 +01:00
Rachael Alexanderson
dc07c2075f
Merge branch 'master' of https://github.com/coelckers/gzdoom
2016-12-08 07:47:33 -05:00
alexey.lysiuk
3aac058022
Fixed loading of Hexen and Strife
...
Names in sprite offsets files for these IWADs contain '[' and '\' characters and such names need to be quoted
2016-12-08 12:07:12 +02:00
Rachael Alexanderson
40b68bfea0
Merge branch 'master' of https://github.com/coelckers/gzdoom
...
# Conflicts:
# src/CMakeLists.txt
2016-12-07 23:12:42 -05:00
Christoph Oelckers
1e950d75bd
- made dynamic light attenuation completely opt-in. This can be done either by setting a MAPINFO option for lights that do not automatically specify it and with a light property. The light property will always take precedence, if set.
2016-12-07 23:17:18 +01:00
Rachael Alexanderson
a78b713f4b
Merge https://github.com/coelckers/gzdoom
...
# Conflicts:
# src/v_video.cpp
2016-12-06 18:19:08 -05:00