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 |
|
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
|
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
|
41735f1da8
|
Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA
|
2018-09-11 17:30:43 -04:00 |
|
Monster Iestyn
|
7d49951cc0
|
Merge branch 'change-colormap-ldef' into 'master'
New linedef executor special: change tagged sector's colormap
See merge request STJr/SRB2Internal!149
|
2018-09-11 17:21:31 -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
|
cf271e33dd
|
Ifdef typo
|
2018-09-11 15:59:56 -04:00 |
|