Commit graph

395 commits

Author SHA1 Message Date
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
e2e1ca0ac6 420: Combine speed and duration logic for fade lighting 2018-09-15 19:01:21 -04:00
mazmazz
17ea15a050 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-15 01:51:06 -04:00
mazmazz
20eb98b89f Colormap overhaul: %d format size_t -> UINT32 fix 2018-09-15 01:50:33 -04:00
mazmazz
95aeb78550 453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor 2018-09-15 01:05:21 -04:00
Monster Iestyn
128e5fd2bb Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items 2018-09-14 21:01:07 +01:00
mazmazz
5515fba00e Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-14 08:42:02 -04:00
mazmazz
2bef671a5f Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-13 12:10:14 -04:00
mazmazz
031bc8f4d7 Make extracolormap_t->fog UINT8; it's not boolean, but categorical 2018-09-13 12:08:46 -04:00
mazmazz
99c67decc1 455: Add speed increment timing (~EFFECT4) to FadeColormap 2018-09-13 10:43:32 -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
3b7f7cf305 Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased 2018-09-12 21:35:46 -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
95f5b7c3f8 Colormap savegame failsafe - Handle NULL (default colormap) 2018-09-12 11:13:49 -04:00
mazmazz
fd5a8d9fb5 Colormap savegame failsafe - Handle NULL (default colormap) 2018-09-12 11:06:18 -04:00
mazmazz
df739180b0 Fade colormap special 455! And stop fade colormap 456
* Added T_FadeColormap thinker and netsync
* Added sector_t fadecolormapdata property
2018-09-12 09:06:38 -04:00
mazmazz
50c5cfaba5 Split colormap netsync to Load/SaveExtraColormap methods 2018-09-11 22:44:31 -04:00
mazmazz
186a75b7d3 Consolidate colormap matching into R_GetColormapFromList 2018-09-11 15:56:21 -04:00
mazmazz
029d47376b Remove cr/cg/cb/ca in favor of rgba * Change default colormap values to be in sync with rgba/fadergba 2018-09-11 13:27:04 -04: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
a4052d96b0 Make default extracolormap on init
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
mazmazz
7000d27175 Savegame fixes 2018-09-10 21:15:34 -04:00
mazmazz
96b07962fd Fixed colormap matching code again * Added debug messages for matching code 2018-09-10 20:56:59 -04:00
mazmazz
c1d1f08ea6 extracolormap_t refinement and netsyncing
* Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor)
* Crunched some UINT16/32 into UINT8
* Calculate mask values in R_CreateLightTable
* ifdef out EXTRACOLORMAPLUMPS
2018-09-10 20:36:34 -04:00
mazmazz
78f984e362 Remove bottommap and topmap from savegame because unused 2018-09-10 16:50:35 -04:00
mazmazz
27a8309ea4 Savegame netsync for sector colormaps; add spawn_midmap and co for comparison 2018-09-10 16:50:27 -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
93fa4d2f3a Savegame floorrover fixes 2018-09-10 00:07:22 -04:00
mazmazz
1c878ccce1 Store sectornum/ffloornum as UINT32, not INT32 2018-09-09 23:52:36 -04:00
mazmazz
45228f823c Savegame netsync for mobj->floorrover and ceilingrrover 2018-09-09 23:48:42 -04:00
mazmazz
5402e8a9a3 Replace sectornum/rovernum index vars with ffloor pointers 2018-09-09 23:12:37 -04:00
mazmazz
4a6ddbd496 Replace firsttic with timer increment 2018-09-09 21:01:00 -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
f77957ddf0 Added tic-based logic to FOF fade (ML_EFFECT5) 2018-09-09 19:31:32 -04: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
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
mazmazz
b0fca6b7b4 Polyobject Fade logic 2018-09-09 08:08:48 -04:00
mazmazz
8571b407c6 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-08 23:03:18 -04:00
mazmazz
8ec3e23ed5 Snap light level to software values (32 levels)
* New properties `exactlightlevel` and `lightlevel` in `lightlevel_t`
2018-09-08 23:01:35 -04:00
mazmazz
07c6705bdb Implemented tic-based light fading
* ML_BLOCKMONSTERS specifies destvalue and speed by texture offsets
* ML_NOCLIMB toggles tic-based logic
* Added props `duration`, `interval`, and `firsttic` to `lightlevel_t`
2018-09-08 22:10:51 -04:00