6196 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
mazmazz	1fcfa7fcf1	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 20:46:02 -04:00
mazmazz	f7ff440250	Add colormap_data to side_t and store colormaps there on setup	2018-09-12 20:43:48 -04:00
mazmazz	fad12d6be3	Merge branch 'master' into le-fadefof	2018-09-12 18:01:42 -04:00
mazmazz	30b9ed59c0	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-12 17:40:24 -04:00
mazmazz	fec74d5d82	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 17:39:59 -04:00
mazmazz	ad9ef5d593	Merge errors	2018-09-12 17:39:30 -04:00
mazmazz	978b9bdea2	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 17:30:09 -04:00
mazmazz	c58e9b0bae	Merge remote-tracking branch 'origin/master' into colormap-overhaul	2018-09-12 17:28:22 -04:00
mazmazz	9fb9b44383	Fade FOF colormap support	2018-09-12 16:59:35 -04:00
mazmazz	06fa05f6cd	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-12 16:30:10 -04:00
mazmazz	8535fb01c2	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 16:29:02 -04:00
mazmazz	62b6950e33	Use lightlist.extra_colormap double pointers in OpenGL	2018-09-12 16:28:55 -04:00
mazmazz	9170174768	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 16:07:07 -04:00
mazmazz	7d36aae7c4	Make lightlists react to control sector colormap changes (double pointer)	2018-09-12 16:06:56 -04:00
mazmazz	42f1f0acdb	P_ResetFakeFloorFader: Argument order error with dolighting	2018-09-12 12:40:56 -04:00
mazmazz	d2f636d5a2	T_FadeColormap: Fade subtraction error	2018-09-12 11:33:44 -04:00
mazmazz	51a2982226	455: TFERLINE - Set target sector's colormap first to control backsector's colormap	2018-09-12 11:21:49 -04:00
mazmazz	b120331151	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 11:14:52 -04:00
mazmazz	92c5cb8233	Colormap savegame failsafe - Handle NULL (default colormap)	2018-09-12 11:13:49 -04:00
mazmazz	d85019b4e4	More NULL failsafes	2018-09-12 11:11:22 -04:00
mazmazz	e95cd0f962	Colormap savegame failsafe - Handle NULL (default colormap)	2018-09-12 11:06:18 -04:00
mazmazz	8190433b71	456: Missing break	2018-09-12 09:42:51 -04:00
mazmazz	70e151de1a	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-12 09:12:31 -04:00
mazmazz	ee51f586c2	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 09:11:35 -04:00
mazmazz	4d9925e8cf	447: ResetColormapFader when changing colormap explicitly	2018-09-12 09:09:10 -04:00
mazmazz	c4079dfca9	Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade	2018-09-12 09:07:55 -04:00
mazmazz	14b71bdbc5	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	5e08f79035	Merge branch 'colormap-overhaul' into colormap-overhaul-fade	2018-09-12 08:08:02 -04:00
mazmazz	9a6a8b0b82	Outdated comment; unused var	2018-09-12 08:07:34 -04:00
mazmazz	cb2ac9b4d3	Formatting	2018-09-12 08:06:44 -04:00
mazmazz	7767adbf32	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 08:03:45 -04:00
mazmazz	4d26cf6330	447: Allow relative calc from backside colormap (ML_TFERLINE)	2018-09-12 07:55:47 -04:00
mazmazz	6f0b28c48f	447: Allow alternate alpha without relative calc	2018-09-12 07:38:51 -04:00
mazmazz	9a388af8ec	447: AddColormap no longer returns chained colormap, so chain it ourselves	2018-09-12 07:31:10 -04:00
mazmazz	55c43a2161	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	947f1162e0	Merge branch 'colormap-overhaul' into colormap-overhaul-fade	2018-09-12 07:15:56 -04:00
mazmazz	867bde3789	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-12 07:15:26 -04:00
mazmazz	87ad2a87f7	Smarter default fadergbaA and fadeend for relative calc	2018-09-12 07:14:23 -04:00
mazmazz	133c3598a7	Add fadestart/fadeend/fog to R_AddColormaps	2018-09-12 07:07:26 -04:00
mazmazz	6059b8edc9	447: Extra params for R_AddColormaps	2018-09-12 07:06:58 -04:00
mazmazz	8754268abe	Add fadestart/fadeend/fog to R_AddColormaps	2018-09-12 07:06:45 -04:00
mazmazz	5e59b8c55a	Duplicate lines	2018-09-11 22:49:32 -04:00
mazmazz	0e108fa732	Merge branch 'colormap-overhaul' into colormap-overhaul-fade	2018-09-11 22:46:40 -04:00
mazmazz	b56ff10ce7	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 22:44:44 -04:00
mazmazz	92a97fb1a6	Split colormap netsync to Load/SaveExtraColormap methods	2018-09-11 22:44:31 -04:00
mazmazz	90aeac5058	Add R_CheckEqualColormaps comparison method	2018-09-11 22:43:12 -04:00
mazmazz	ead14becd7	Add R_CheckEqualColormaps comparison method	2018-09-11 22:34:29 -04:00
mazmazz	c790117280	Merge branch 'colormap-overhaul' into colormap-overhaul-fade	2018-09-11 21:04:21 -04:00
mazmazz	f0c11eb135	R_AddColormaps method	2018-09-11 21:03:55 -04:00
mazmazz	54669a6cc8	Use R_AddColormaps method in 447 relative calc	2018-09-11 21:03:13 -04:00