Commit graph

4471 commits

Author SHA1 Message Date
mazmazz 43ae25c4fd Make default extracolormap on init
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
mazmazz 53b92a1601 Make default extracolormap on init
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:09 -04:00
mazmazz 0c4f3cbeca Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 21:15:44 -04:00
mazmazz 22746c1d91 Savegame fixes 2018-09-10 21:15:34 -04:00
mazmazz c007dfacec Savegame fixes 2018-09-10 21:12:56 -04:00
mazmazz 75267dfa2c Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef 2018-09-10 21:06:28 -04:00
mazmazz 3da38f2a9b Fixed colormap matching code again * Added debug messages for matching code 2018-09-10 20:56:59 -04:00
mazmazz 1e4f5e8d45 Remove MAXCOLORMAPS 2018-09-10 20:41:12 -04:00
mazmazz 8d78c22194 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 c92226890e Remove bottommap and topmap from savegame because unused 2018-09-10 16:50:35 -04:00
mazmazz 7e9297d06e Savegame netsync for sector colormaps; add spawn_midmap and co for comparison 2018-09-10 16:50:27 -04:00
mazmazz 7608583c6f Fix shared colormap matching 2018-09-10 16:42:07 -04:00
mazmazz 53733ddf76 Type 606 renderer check allow OGL again 2018-09-10 16:32:54 -04:00
mazmazz 2701976ba3 Compiler fixes 2018-09-10 16:28:39 -04:00
mazmazz e0d8a6eec0 Get rid of bottommap, midmap, topmap 2018-09-10 16:16:04 -04:00
mazmazz 574a591d43 P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block) 2018-09-10 16:08:43 -04:00
mazmazz e33ed45b7b Colormap overhaul in r_data.c
* Split R_CreateColormap to R_CreateLightTable
* Replace extra_colormaps array with next/prev pointer chain
* Remove foundcolormaps; instead store lumpnum in extracolormap_t
* Add properties to extracolormap_t for portability
2018-09-10 15:59:31 -04:00
mazmazz fef38acc59 Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup 2018-09-10 13:24:57 -04:00
mazmazz 88d9da79e6 Move tic-based to EFFECT4 2018-09-10 12:00:44 -04:00
mazmazz acea0bfd68 Move tic-based to EFFECT4, relative calc to EFFECT3 2018-09-10 12:00:15 -04:00
Monster Iestyn 40ff436829 Remove commented out stuff, now I've confirmed everything works fine without them 2018-09-10 15:49:21 +01:00
mazmazz 148e3ff538 Use ML_NOCLIMB for FF_TRANSLUCENT handling in type 452 2018-09-10 10:17:39 -04:00
mazmazz 8e75fe50db 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 da5a7a013d 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 02a94dc941 Add distance-based params and make default (ML_DONTPEGBOTTOM to use back offsets) 2018-09-10 09:49:52 -04:00
mazmazz b8da218b61 Add relative destvalue calc (ML_EFFECT4)
* rover->alpha init fixes with invisible FOFs
2018-09-10 09:49:00 -04:00
mazmazz e171e565ce Remove bottommap and topmap from savegame because unused 2018-09-10 09:03:58 -04:00
mazmazz 002f1bad8f Savegame netsync for sector colormaps; add spawn_midmap and co for comparison 2018-09-10 09:01:09 -04:00
mazmazz a6f959ba21 Set mobj->floorrover and ceilingrover in appropriate places 2018-09-10 00:38:07 -04:00
mazmazz 0d88f31bbd Add floorrover and ceilingrover to precipmobj_t 2018-09-10 00:23:23 -04:00
mazmazz 943dc9412d Initialize floorrover and ceilingrover on SpawnMobj 2018-09-10 00:20:51 -04:00
mazmazz 832f891cbb Remove rovernum increment from P_CheckPosition because unused 2018-09-10 00:13:32 -04:00
mazmazz 03d1baf422 Savegame floorrover fixes 2018-09-10 00:07:22 -04:00
mazmazz 5136293f62 Store sectornum/ffloornum as UINT32, not INT32 2018-09-09 23:52:36 -04:00
mazmazz dd35871699 Savegame netsync for mobj->floorrover and ceilingrrover 2018-09-09 23:48:42 -04:00
mazmazz f33f9dd284 Replace sectornum/rovernum index vars with ffloor pointers 2018-09-09 23:12:37 -04:00
mazmazz 9cc186441b Fix fog visual glitch with fading 2018-09-09 22:14:24 -04:00
mazmazz d01193df80 Apply ~FF_EXISTS moving plat fix for VERTICALFLIP 2018-09-09 21:59:41 -04:00
mazmazz 231f19aaab Revert "Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists"
This reverts commit cc11459054, reversing
changes made to 7e3d5cd373.
2018-09-09 21:02:43 -04:00
mazmazz 573e1d0017 Replace firsttic with timer increment 2018-09-09 21:01:00 -04:00
mazmazz 0202bbcfd3 Replace firsttic with timer increment 2018-09-09 20:45:12 -04:00
mazmazz 703764d769 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-09 20:18:57 -04:00
mazmazz 3d5f225702 Replace firsttic with decrement timer 2018-09-09 20:18:43 -04:00
mazmazz ea2276eb07 Fix tic-based bug returning early 2018-09-09 19:57:41 -04:00
mazmazz 43ae628adc Cap lightlevel fading at spawn_lightlevel (don't make darker) 2018-09-09 19:44:35 -04:00
mazmazz c3c4a251f1 Added tic-based logic to FOF fade (ML_EFFECT5) 2018-09-09 19:31:32 -04:00
Monster Iestyn c0bf79ad8e 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 80a4a03f8e 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 368f96e605 Fade FOF lighting fixes; properly calculate destlightvalue 2018-09-09 15:41:30 -04:00
mazmazz ca58fba24a Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-09 13:44:30 -04:00