Commit graph

4259 commits

Author SHA1 Message Date
mazmazz
3e94448632 455: Change to side->colormap_data 2018-09-12 20:52:05 -04:00
mazmazz
5783302f08 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-12 20:47:00 -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
209fda288f Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-12 17:40:24 -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
675c9646a0 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-12 16:30:10 -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
72e0702be6 T_FadeColormap: Fade subtraction error 2018-09-12 11:33:44 -04:00
mazmazz
138d76a1b8 455: TFERLINE - Set target sector's colormap first to control backsector's colormap 2018-09-12 11:21:49 -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
caefcb1edc More NULL failsafes 2018-09-12 11:11:22 -04:00
mazmazz
fd5a8d9fb5 Colormap savegame failsafe - Handle NULL (default colormap) 2018-09-12 11:06:18 -04:00
mazmazz
938c01506f 456: Missing break 2018-09-12 09:42:51 -04:00
mazmazz
e2ba709913 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-12 09:12:31 -04:00
mazmazz
896b253927 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 09:11:35 -04:00
mazmazz
cf2aa6fa6e 447: ResetColormapFader when changing colormap explicitly 2018-09-12 09:09:10 -04:00
mazmazz
054c18b9b7 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-12 09:07:55 -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
21537d529d Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-12 08:08:02 -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
f5c3b3cbbc Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-12 07:15:56 -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
a80e129863 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 22:46:40 -04:00
mazmazz
832cbfe278 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 22:44:44 -04:00
mazmazz
50c5cfaba5 Split colormap netsync to Load/SaveExtraColormap methods 2018-09-11 22:44:31 -04:00
mazmazz
8e4d87a739 Add R_CheckEqualColormaps comparison method 2018-09-11 22:43:12 -04:00
mazmazz
a79e785f5d Add R_CheckEqualColormaps comparison method 2018-09-11 22:34:29 -04:00
mazmazz
994e8f8ed3 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 21:04:21 -04:00
mazmazz
86e619e1bf R_AddColormaps method 2018-09-11 21:03:55 -04:00
mazmazz
8a212a83ac Use R_AddColormaps method in 447 relative calc 2018-09-11 21:03:13 -04:00
mazmazz
f9316a29a8 R_AddColormaps method 2018-09-11 21:02:58 -04:00