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
|
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
|
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
|
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
|
ee51f586c2
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-12 09:11:35 -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
|
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
|
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
|
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 |
|
|
mazmazz
|
0fb594ad58
|
R_AddColormaps method
|
2018-09-11 21:02:58 -04:00 |
|
|
mazmazz
|
a1a05c9972
|
Add relative color change to 447
|
2018-09-11 19:11:50 -04:00 |
|
|
mazmazz
|
b9e4cd40ca
|
Use RGB/RGBA macros in 447 code
|
2018-09-11 17:32:43 -04:00 |
|
|
mazmazz
|
3e49cc68d2
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-11 17:31:35 -04:00 |
|
|
mazmazz
|
548f02eea1
|
Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA
|
2018-09-11 17:30:43 -04:00 |
|
|
Monster Iestyn
|
55418f9750
|
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
|
5975f26177
|
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
|
5523fc3a8d
|
Account for NULL colormaps in alpha-only code 447
|
2018-09-11 17:07:50 -04:00 |
|
|
mazmazz
|
f703c19502
|
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
|
bb6cf6a807
|
Added alpha-only, relative calc, and offset params to 447 Change Colormap
|
2018-09-11 16:50:35 -04:00 |
|
|
mazmazz
|
71ade23739
|
Ifdef typo
|
2018-09-11 15:59:56 -04:00 |
|
|
mazmazz
|
fb7ac4ccae
|
Ifdef typo
|
2018-09-11 15:59:13 -04:00 |
|
|
mazmazz
|
c6dbf2e560
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-11 15:57:58 -04:00 |
|
|
mazmazz
|
c920827032
|
Consolidate colormap matching into R_GetColormapFromList
|
2018-09-11 15:56:21 -04:00 |
|
|
mazmazz
|
3290104922
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-11 15:50:21 -04:00 |
|
|
mazmazz
|
78aefc05cf
|
Consolidate colormap matching into R_GetExistingColormap
|
2018-09-11 15:50:12 -04:00 |
|
|
mazmazz
|
87cf18b60b
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-11 15:20:58 -04:00 |
|
|
mazmazz
|
85d89287de
|
Add R_CopyColormap
|
2018-09-11 15:20:30 -04:00 |
|
|
mazmazz
|
5dad8d15b0
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-11 15:03:04 -04:00 |
|