mazmazz
5a4e6cf924
Loose ends other targets
...
(cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)
2018-09-14 09:41:08 -04:00
mazmazz
61a7e2bf2b
NiGHTS drone loop: Change flyangle comparison to fix detection from vertical angles
...
Use > 90 && < 270 instead of >= 90 && <= 270. Fixes a bug where if you fly directly up (flyangle 90) or directly down (flyangle 270), that registers as a backwards direction, so you trigger the loop detection by flying BACKWARDS, not FORWARDS. This edge case (only possible via JUMPTOAXIS) should default to FORWARDS looping.
(cherry picked from commit ce215195f89bf52e5c2e2ddd7d5444685edf835d)
2018-09-14 08:58:19 -04:00
mazmazz
64a0f83238
Fix NiGHTS drone loop detection by using pl->flyangle
...
(cherry picked from commit 67e438128435aca992e2d45aa1f35603c5501984)
2018-09-14 08:57:37 -04:00
mazmazz
1b2cbfa568
Merge remote-tracking branch 'public-gitlab/master' into public-op-nightsbumper-fix
2018-09-14 08:55:30 -04:00
mazmazz
b1993b87a9
P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER
...
(cherry picked from commit d85f108997bfeca3e0b1731c1aad70617456400b)
2018-09-14 08:52:10 -04:00
mazmazz
619c218702
MT_NIGHTSBUMPER Spawn: Don't reset mthing->options
...
(cherry picked from commit dc9fd6f02ed4b681ed4982d119672f07cc91e585)
2018-09-14 08:52:10 -04:00
mazmazz
5515fba00e
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-14 08:42:02 -04:00
mazmazz
6a2fb34912
420: Removed unnecessary include (gametic no longer needed)
2018-09-14 08:26:52 -04:00
Monster Iestyn
d097bb7e9e
Merge branch 'thwomp-fixes' into 'next'
...
Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS
See merge request STJr/SRB2!277
2018-09-13 14:47:40 -04:00
mazmazz
b849693c96
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:19:28 -04:00
mazmazz
2e75be2d42
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:19:10 -04:00
mazmazz
3dc4a1d7da
Missed fog boolean -> integer
2018-09-13 12:18:53 -04:00
mazmazz
065638d029
455: Fog flag fix for fading
2018-09-13 12:18:10 -04:00
mazmazz
2bef671a5f
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:10:14 -04:00
mazmazz
375f48be27
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:08:56 -04:00
mazmazz
031bc8f4d7
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
2018-09-13 12:08:46 -04:00
Digiku
8f59606199
Don't trigger thwomp on spectators
2018-09-13 11:32:40 -04:00
mazmazz
a7ec620ea4
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-13 11:32:38 -04:00
mazmazz
b58f765254
455: Set timing by either Back Y or Front Y, but not line length
2018-09-13 10:53:03 -04:00
mazmazz
8464a5ec8a
455: Don't override fadergba on default/no colormap init (~BOUNCY)
2018-09-13 10:43:41 -04:00
mazmazz
99c67decc1
455: Add speed increment timing (~EFFECT4) to FadeColormap
2018-09-13 10:43:32 -04:00
mazmazz
c9f6c362ff
491, 492: Allow BLOCKMONSTERS raw translucency value in floorheight
2018-09-13 00:26:49 -04:00
mazmazz
509965d2c0
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes
...
* 490: Set proper render flags according to spawnflags
* 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* 492:
* Tic-based (EFFECT4) and speed timing
* Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* Set proper render flags according to spawnflags
* Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 00:06:11 -04:00
mazmazz
33c1109993
PolyObjFade: Apply RENDER, SOLID, and NOSPECIALS flags according to spawnflags
2018-09-13 00:06:08 -04:00
mazmazz
d0b2728ce1
490 PolyVisible: Set proper spawn render flags instead of RENDERALL
2018-09-13 00:06:06 -04:00
mazmazz
35e58d3c8c
420: A parenthesis
2018-09-12 21:49:03 -04:00
mazmazz
3b7f7cf305
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
2018-09-12 21:35:46 -04:00
mazmazz
ef7de5f543
420: Allow Back Y Offset for timing parameter
2018-09-12 21:32:12 -04:00
mazmazz
5dd6ea6c01
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-12 21:06:27 -04:00
mazmazz
fc1d5ca2ca
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 21:06:07 -04:00
mazmazz
70f3f7c80d
Init side->colormap_data pointer to NULL (for paranoia)
2018-09-12 21:05:50 -04:00
mazmazz
3e94448632
455: Change to side->colormap_data
2018-09-12 20:52:05 -04:00
mazmazz
5783302f08
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 20:47:00 -04:00
mazmazz
9060ad0e66
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 20:46:02 -04:00
mazmazz
18bd48843f
Add colormap_data to side_t and store colormaps there on setup
2018-09-12 20:43:48 -04:00
mazmazz
c19927883f
Merge branch 'master' into le-fadefof
2018-09-12 18:01:42 -04:00
mazmazz
209fda288f
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 17:40:24 -04:00
mazmazz
854caf2383
Merge errors
2018-09-12 17:39:30 -04:00
mazmazz
16279631f1
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 17:30:09 -04:00
mazmazz
691ee31681
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
mazmazz
3d03964bb9
Fade FOF colormap support
2018-09-12 16:59:35 -04:00
mazmazz
675c9646a0
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 16:30:10 -04:00
mazmazz
f64703b2b1
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 16:29:02 -04:00
mazmazz
d53201d45d
Use lightlist.extra_colormap double pointers in OpenGL
2018-09-12 16:28:55 -04:00
mazmazz
8e3c609510
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 16:07:07 -04:00
mazmazz
f06e0a6569
Make lightlists react to control sector colormap changes (double pointer)
2018-09-12 16:06:56 -04:00
mazmazz
59b7a64eaf
P_ResetFakeFloorFader: Argument order error with dolighting
2018-09-12 12:40:56 -04:00
mazmazz
72e0702be6
T_FadeColormap: Fade subtraction error
2018-09-12 11:33:44 -04:00
mazmazz
138d76a1b8
455: TFERLINE - Set target sector's colormap first to control backsector's colormap
2018-09-12 11:21:49 -04:00
mazmazz
920ebfcc13
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 11:14:52 -04:00