Commit graph

4253 commits

Author SHA1 Message Date
mazmazz
7b1856e32a Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-17 10:56:56 -04:00
mazmazz
e57bd5206c Colormap netsync: Count ffloors for colormap loading upper limit 2018-09-17 10:38:17 -04:00
mazmazz
5f176f5525 Colormap netsync: Handle unaccounted dummy colormaps properly 2018-09-17 10:30:21 -04:00
mazmazz
67d3b713a2 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-17 08:06:10 -04:00
mazmazz
02ed2d247e Colormap netsync: String format numsectors to UINT32 (thanks buildbot) 2018-09-17 08:05:51 -04:00
mazmazz
db35c7cd45 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-17 00:27:11 -04:00
mazmazz
0cba69e75a Colormap netsync: Mixed D+C fixes 2018-09-17 00:26:58 -04:00
mazmazz
c36f189da3 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-16 22:42:57 -04:00
mazmazz
e5d533edc2 New colormap netsync fixes 2018-09-16 22:42:36 -04:00
mazmazz
5923e85c5a Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector 2018-09-16 20:25:46 -04:00
mazmazz
09338f77a7 Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS 2018-09-15 02:10:55 -04:00
mazmazz
400dbe0118 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-15 01:50:53 -04:00
mazmazz
20eb98b89f Colormap overhaul: %d format size_t -> UINT32 fix 2018-09-15 01:50:33 -04:00
mazmazz
2d032082a8 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-15 00:52:45 -04:00
mazmazz
23de95dce2 Colormap overhaul r_data: Mixed D+C fix 2018-09-15 00:49:03 -04:00
mazmazz
ac094790b7 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-14 22:35:51 -04:00
mazmazz
d19eefdcf4 Remove possibly wrong comment about extracolormap_t->fog 2018-09-14 22:35:30 -04:00
mazmazz
2e75be2d42 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-13 12:19:10 -04:00
mazmazz
3dc4a1d7da Missed fog boolean -> integer 2018-09-13 12:18:53 -04:00
mazmazz
375f48be27 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-13 12:08:56 -04:00
mazmazz
031bc8f4d7 Make extracolormap_t->fog UINT8; it's not boolean, but categorical 2018-09-13 12:08:46 -04:00
mazmazz
fc1d5ca2ca Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 21:06:07 -04:00
mazmazz
70f3f7c80d Init side->colormap_data pointer to NULL (for paranoia) 2018-09-12 21:05:50 -04:00
mazmazz
9060ad0e66 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 20:46:02 -04:00
mazmazz
18bd48843f Add colormap_data to side_t and store colormaps there on setup 2018-09-12 20:43:48 -04:00
mazmazz
10e0d795a7 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 17:39:59 -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
f64703b2b1 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 16:29:02 -04:00
mazmazz
d53201d45d Use lightlist.extra_colormap double pointers in OpenGL 2018-09-12 16:28:55 -04:00
mazmazz
8e3c609510 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 16:07:07 -04:00
mazmazz
f06e0a6569 Make lightlists react to control sector colormap changes (double pointer) 2018-09-12 16:06:56 -04:00
mazmazz
920ebfcc13 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 11:14:52 -04:00
mazmazz
95f5b7c3f8 Colormap savegame failsafe - Handle NULL (default colormap) 2018-09-12 11:13:49 -04:00
mazmazz
896b253927 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 09:11:35 -04:00
mazmazz
91004ac075 Outdated comment; unused var 2018-09-12 08:07:34 -04:00
mazmazz
9cec18d960 Formatting 2018-09-12 08:06:44 -04:00
mazmazz
ef74b9e661 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 08:03:45 -04:00
mazmazz
a799917ccb 447: Allow relative calc from backside colormap (ML_TFERLINE) 2018-09-12 07:55:47 -04:00
mazmazz
cb958d5bbf 447: Allow alternate alpha without relative calc 2018-09-12 07:38:51 -04:00
mazmazz
c701341f83 447: AddColormap no longer returns chained colormap, so chain it ourselves 2018-09-12 07:31:10 -04:00
mazmazz
68d242bc4c R_AddColormap will not return an existing colormap, and new colormap is not added to chain 2018-09-12 07:24:22 -04:00
mazmazz
e275a2e9b8 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 07:15:26 -04:00
mazmazz
4d6cbd8878 Smarter default fadergbaA and fadeend for relative calc 2018-09-12 07:14:23 -04:00
mazmazz
c99f4319ec Add fadestart/fadeend/fog to R_AddColormaps 2018-09-12 07:07:26 -04:00
mazmazz
d26073584b 447: Extra params for R_AddColormaps 2018-09-12 07:06:58 -04:00
mazmazz
b9a33f5efd Add fadestart/fadeend/fog to R_AddColormaps 2018-09-12 07:06:45 -04:00
mazmazz
caa756acf9 Duplicate lines 2018-09-11 22:49:32 -04:00
mazmazz
832cbfe278 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 22:44:44 -04:00