Commit graph

4241 commits

Author SHA1 Message Date
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
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
mazmazz
bc6382a024 Add relative color change to 447 2018-09-11 19:11:50 -04:00
mazmazz
3f5ea6f3bb Use RGB/RGBA macros in 447 code 2018-09-11 17:32:43 -04:00
mazmazz
6e6513483a Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 17:31:35 -04:00
mazmazz
bf3b877815 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 17:31:02 -04:00
mazmazz
41735f1da8 Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA 2018-09-11 17:30:43 -04:00
mazmazz
31b92844ad Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 17:09:13 -04:00
mazmazz
9869e13eda Don't set sector's extra_colormap if we just made a default clone
* Allow colormap parsing to proceed in p_setup always
* Add R_CheckDefaultColormap
* Add R_GetRgbaR/G/B/A macros
2018-09-11 17:08:57 -04:00
mazmazz
8e477c80a7 Account for NULL colormaps in alpha-only code 447 2018-09-11 17:07:50 -04:00
mazmazz
aed2411a91 Don't set sector's extra_colormap if we just made a default clone
* Allow colormap parsing to proceed in p_setup always
* Add R_CheckDefaultColormap
* Add R_GetRgbaR/G/B/A macros
2018-09-11 17:06:44 -04:00
mazmazz
03ddb86707 Added alpha-only, relative calc, and offset params to 447 Change Colormap 2018-09-11 16:50:35 -04:00
mazmazz
83648d90d5 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 16:00:14 -04:00
mazmazz
cf271e33dd Ifdef typo 2018-09-11 15:59:56 -04:00
mazmazz
d17b0d5d15 Ifdef typo 2018-09-11 15:59:13 -04:00
mazmazz
438243345e Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 15:57:58 -04:00
mazmazz
c93f06b801 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 15:57:22 -04:00
mazmazz
186a75b7d3 Consolidate colormap matching into R_GetColormapFromList 2018-09-11 15:56:21 -04:00