Commit graph

4036 commits

Author SHA1 Message Date
mazmazz
7aee739203 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 13:33:31 -04:00
mazmazz
2cac83d5e9 Initialize extra_colormaps to NULL on program start 2018-09-11 13:31:09 -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
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
1c24b9ac8e Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-11 11:26:12 -04:00
mazmazz
1bb41a00bc Don't decrement fade timer if song is paused 2018-09-11 11:20:46 -04:00
mazmazz
2b4d7d1ad4 Change to percentage calc from interval decrement for volume fade 2018-09-11 11:17:30 -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
74772857cf Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 22:37:34 -04:00
mazmazz
bbab5fc735 Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:37:27 -04:00
mazmazz
7267245f74 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 22:35:45 -04:00
mazmazz
98fefaaef7 Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:35:26 -04:00
mazmazz
9ab67b01e2 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 21:57:09 -04:00
mazmazz
a4052d96b0 Make default extracolormap on init
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
mazmazz
c4cb0b2a9f Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 21:15:44 -04:00
mazmazz
7000d27175 Savegame fixes 2018-09-10 21:15:34 -04:00
mazmazz
0c74c5c017 Savegame fixes 2018-09-10 21:12:56 -04:00
mazmazz
7eed10f563 Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef 2018-09-10 21:06:28 -04:00
mazmazz
96b07962fd Fixed colormap matching code again * Added debug messages for matching code 2018-09-10 20:56:59 -04:00
mazmazz
c3fafd18be Remove MAXCOLORMAPS 2018-09-10 20:41:12 -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
102467489e Fix shared colormap matching 2018-09-10 16:42:07 -04:00
mazmazz
c767436629 Type 606 renderer check allow OGL again 2018-09-10 16:32:54 -04:00
mazmazz
0344ca70ba Compiler fixes 2018-09-10 16:28:39 -04:00
mazmazz
d8056b1fea Get rid of bottommap, midmap, topmap 2018-09-10 16:16:04 -04:00
mazmazz
5f03a9b1a9 P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block) 2018-09-10 16:08:43 -04:00
mazmazz
15aded0882 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
e3fd7eee79 Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup 2018-09-10 13:24:57 -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
092b58fe39 Set mobj->floorrover and ceilingrover in appropriate places 2018-09-10 00:38:07 -04:00
mazmazz
df9c6c4a1f Add floorrover and ceilingrover to precipmobj_t 2018-09-10 00:23:23 -04:00
mazmazz
3d83908596 Initialize floorrover and ceilingrover on SpawnMobj 2018-09-10 00:20:51 -04:00
mazmazz
913177ce23 Remove rovernum increment from P_CheckPosition because unused 2018-09-10 00:13:32 -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