mazmazz
aa9da189a6
453: A line break
2018-09-18 07:28:30 -04:00
mazmazz
dfaf0b00d4
453: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
2018-09-18 07:28:28 -04:00
mazmazz
2fac7c36ad
453: Don't interrupt current FOF fade unless EFFECT5
2018-09-18 07:27:47 -04:00
mazmazz
70a672229c
453: Use new colormap netsync for fade FOF thinker
2018-09-17 00:34:03 -04:00
mazmazz
20537f1310
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-16 08:20:57 -04:00
mazmazz
33bc560f15
420: Strip test comments
2018-09-16 08:20:14 -04:00
mazmazz
3ce5362a1d
453: Extra parameter for Add_ColormapFader
2018-09-15 20:40:17 -04:00
Nev3r
2009c93ddd
The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now.
2018-09-15 12:21:25 +02:00
mazmazz
13e910f6ff
420: Unncessary include
2018-09-15 20:03:43 -04:00
mazmazz
e2e1ca0ac6
420: Combine speed and duration logic for fade lighting
2018-09-15 19:01:21 -04:00
mazmazz
e01fd1f3a3
453: Try ResetFakeFloorFader if condition again
2018-09-15 02:24:44 -04:00
mazmazz
a19c44d21f
453: P_ResetFakeFloorFader stray & address if condition
2018-09-15 02:16:54 -04:00
mazmazz
95aeb78550
453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor
2018-09-15 01:05:21 -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
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
c19927883f
Merge branch 'master' into le-fadefof
2018-09-12 18:01:42 -04:00
mazmazz
3d03964bb9
Fade FOF colormap support
2018-09-12 16:59:35 -04:00
mazmazz
59b7a64eaf
P_ResetFakeFloorFader: Argument order error with dolighting
2018-09-12 12:40:56 -04:00
Monster Iestyn
bab4a67516
Merge branch 'master' into change-colormap-ldef
2018-09-11 16:43:01 +01:00
Monster Iestyn
78130e830e
Merge branch 'public_next'
...
# Conflicts:
# src/p_setup.c
# src/r_data.c
2018-09-11 16:41:27 +01:00
Monster Iestyn
d8f73b0d97
Merge branch 'master' into next
2018-09-11 16:34:16 +01:00
mazmazz
31ee9df9b9
Use percentage calc instead of interval decrement for tic-based fading
2018-09-11 10:28:24 -04:00
mazmazz
17055a1345
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-11 10:08:13 -04:00
mazmazz
b13103603f
Use percentage calc instead of interval decrement for tic-based timing
2018-09-11 10:05:25 -04:00
mazmazz
fe4938a1c2
Move tic-based to EFFECT4
2018-09-10 12:00:44 -04:00
mazmazz
fc6b599bbc
Move tic-based to EFFECT4, relative calc to EFFECT3
2018-09-10 12:00:15 -04:00
Monster Iestyn
22b799a655
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
mazmazz
38a63c5d8f
Use ML_NOCLIMB for FF_TRANSLUCENT handling in type 452
2018-09-10 10:17:39 -04:00
mazmazz
88e22b73a9
Default to using back offset params if back linedef exists; else fallback to distance-based params
2018-09-10 10:11:27 -04:00
mazmazz
eb7a5fc0cf
Add type 452 Set FOF Alpha
...
* Fade FOF moved to type 453
* Stop Fade FOF moved to type 454
2018-09-10 10:09:02 -04:00
mazmazz
fe813bff47
Add distance-based params and make default (ML_DONTPEGBOTTOM to use back offsets)
2018-09-10 09:49:52 -04:00
mazmazz
583262d073
Add relative destvalue calc (ML_EFFECT4)
...
* rover->alpha init fixes with invisible FOFs
2018-09-10 09:49:00 -04:00
mazmazz
473d902696
Remove bottommap and topmap from savegame because unused
2018-09-10 09:03:58 -04:00
mazmazz
8a4bb895af
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 09:01:09 -04:00
mazmazz
1c878ccce1
Store sectornum/ffloornum as UINT32, not INT32
2018-09-09 23:52:36 -04:00
mazmazz
ca0d6fd0c2
Fix fog visual glitch with fading
2018-09-09 22:14:24 -04:00
mazmazz
ecfc2e66f1
Replace firsttic with timer increment
2018-09-09 20:45:12 -04:00
mazmazz
97bc852b80
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-09 20:18:57 -04:00
mazmazz
8efe62e4de
Replace firsttic with decrement timer
2018-09-09 20:18:43 -04:00
mazmazz
bb55774171
Fix tic-based bug returning early
2018-09-09 19:57:41 -04:00
mazmazz
295ff73e70
Cap lightlevel fading at spawn_lightlevel (don't make darker)
2018-09-09 19:44:35 -04:00
mazmazz
f77957ddf0
Added tic-based logic to FOF fade (ML_EFFECT5)
2018-09-09 19:31:32 -04:00
Monster Iestyn
a5ba47cb3a
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
mazmazz
44ba282d5f
Finalize light level on fade finish (not forced stop)
...
* Added destlightlevel property to fade_t
* Fixed dotranslucent, dolighting, docollision order weirdness in function calls
2018-09-09 17:20:35 -04:00
mazmazz
4e3f0c9a84
Fade FOF lighting fixes; properly calculate destlightvalue
2018-09-09 15:41:30 -04:00
mazmazz
18c6f560e4
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-09 13:44:30 -04:00
mazmazz
cbf692fc52
Revert "Snap light level to software values (32 levels)"
...
This reverts commit 8ec3e23ed5 .
2018-09-09 13:43:00 -04:00