Commit graph

4589 commits

Author SHA1 Message Date
Monster Iestyn
1199a5f9b4 Merge branch 'colormap-code-cleanup' into 'master'
Colormap code cleanup

See merge request STJr/SRB2!275
2018-09-11 11:31:56 -04:00
mazmazz
9a52816cb4 Use percentage calc instead of interval decrement for tic-based fading 2018-09-11 10:28:24 -04:00
mazmazz
c468451a63 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-11 10:08:13 -04:00
mazmazz
36923ae7b0 Use percentage calc instead of interval decrement for tic-based timing 2018-09-11 10:05:25 -04:00
mazmazz
5907e075e6 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-10 22:37:54 -04:00
mazmazz
df4ea79ab7 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 22:37:34 -04:00
mazmazz
b7a216c78b Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:37:27 -04:00
mazmazz
36522665c3 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 22:35:45 -04:00
mazmazz
17e101a24b Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:35:26 -04:00
mazmazz
9038ba4d9c Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:35:03 -04:00
mazmazz
f29acffb19 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 21:57:09 -04:00
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
PrisimaTheFox
4ada0b0a9e Update m_anigif.c
Remember gif_frames starts at 0
2018-09-10 17:12:10 +01:00
PrisimaTheFox
d26ba2ee54 Update m_anigif.c
More accurate GIF delay.
2018-09-10 17:12:04 +01: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