mazmazz
|
1db8aee539
|
455: Mixed D+C fix
|
2018-09-15 00:53:21 -04:00 |
|
|
mazmazz
|
2e2acdd16a
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-14 22:36:09 -04:00 |
|
|
mazmazz
|
5f2df0f453
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-14 22:35:51 -04:00 |
|
|
mazmazz
|
2f995f4cbe
|
Remove possibly wrong comment about extracolormap_t->fog
|
2018-09-14 22:35:30 -04:00 |
|
|
mazmazz
|
ca5602f13b
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-13 12:19:28 -04:00 |
|
|
mazmazz
|
adca20b07f
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-13 12:19:10 -04:00 |
|
|
mazmazz
|
07af82aa84
|
Missed fog boolean -> integer
|
2018-09-13 12:18:53 -04:00 |
|
|
mazmazz
|
761150b12d
|
455: Fog flag fix for fading
|
2018-09-13 12:18:10 -04:00 |
|
|
mazmazz
|
21506873be
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-13 12:10:14 -04:00 |
|
|
mazmazz
|
103db964fe
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-13 12:08:56 -04:00 |
|
|
mazmazz
|
6824e6a359
|
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
|
2018-09-13 12:08:46 -04:00 |
|
|
mazmazz
|
3fc8ed5a9f
|
455: Set timing by either Back Y or Front Y, but not line length
|
2018-09-13 10:53:03 -04:00 |
|
|
mazmazz
|
94939f6613
|
455: Don't override fadergba on default/no colormap init (~BOUNCY)
|
2018-09-13 10:43:41 -04:00 |
|
|
mazmazz
|
5aa66f8872
|
455: Add speed increment timing (~EFFECT4) to FadeColormap
|
2018-09-13 10:43:32 -04:00 |
|
|
mazmazz
|
baf3aa5078
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-12 21:06:32 -04:00 |
|
|
mazmazz
|
dc72835679
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-12 21:06:27 -04:00 |
|
|
mazmazz
|
3b05f7f925
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-12 21:06:07 -04:00 |
|
|
mazmazz
|
0b2caa948f
|
Init side->colormap_data pointer to NULL (for paranoia)
|
2018-09-12 21:05:50 -04:00 |
|
|
mazmazz
|
05c91f1f81
|
455: Change to side->colormap_data
|
2018-09-12 20:52:05 -04:00 |
|
|
mazmazz
|
17a78ba674
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-12 20:47:00 -04:00 |
|
|
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
|
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
|
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
|
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 |
|