mazmazz
|
17ea15a050
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-15 01:51:06 -04:00 |
|
mazmazz
|
400dbe0118
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-15 01:50:53 -04:00 |
|
mazmazz
|
20eb98b89f
|
Colormap overhaul: %d format size_t -> UINT32 fix
|
2018-09-15 01:50:33 -04:00 |
|
mazmazz
|
73a907f52f
|
455: Mixed D+C fix
|
2018-09-15 00:53:21 -04:00 |
|
mazmazz
|
2d032082a8
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-15 00:52:45 -04:00 |
|
mazmazz
|
23de95dce2
|
Colormap overhaul r_data: Mixed D+C fix
|
2018-09-15 00:49:03 -04:00 |
|
mazmazz
|
2083cd815b
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-14 22:36:09 -04:00 |
|
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
|
b849693c96
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-13 12:19:28 -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
|
065638d029
|
455: Fog flag fix for fading
|
2018-09-13 12:18:10 -04:00 |
|
mazmazz
|
2bef671a5f
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-13 12:10:14 -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
|
b58f765254
|
455: Set timing by either Back Y or Front Y, but not line length
|
2018-09-13 10:53:03 -04:00 |
|
mazmazz
|
8464a5ec8a
|
455: Don't override fadergba on default/no colormap init (~BOUNCY)
|
2018-09-13 10:43:41 -04:00 |
|
mazmazz
|
99c67decc1
|
455: Add speed increment timing (~EFFECT4) to FadeColormap
|
2018-09-13 10:43:32 -04:00 |
|
mazmazz
|
bf954892a7
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-12 21:06:32 -04:00 |
|
mazmazz
|
5dd6ea6c01
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-12 21:06:27 -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
|
3e94448632
|
455: Change to side->colormap_data
|
2018-09-12 20:52:05 -04:00 |
|
mazmazz
|
5783302f08
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-12 20:47:00 -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
|
209fda288f
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-12 17:40:24 -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
|
675c9646a0
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-12 16:30:10 -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
|
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
|
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
|
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 |
|