mazmazz
|
9778cc2ad5
|
455: A line break
|
2018-09-18 07:30:37 -04:00 |
|
|
mazmazz
|
56ee711f33
|
455: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
|
2018-09-18 07:30:35 -04:00 |
|
|
mazmazz
|
64b96c7192
|
455: Don't interrupt current color fading
|
2018-09-18 07:29:21 -04:00 |
|
|
mazmazz
|
c462bd4b17
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-17 10:57:02 -04:00 |
|
|
mazmazz
|
71df02c996
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-17 10:56:56 -04:00 |
|
|
mazmazz
|
69a4906911
|
Colormap netsync: Count ffloors for colormap loading upper limit
|
2018-09-17 10:38:17 -04:00 |
|
|
mazmazz
|
d417f733e5
|
Colormap netsync: Handle unaccounted dummy colormaps properly
|
2018-09-17 10:30:21 -04:00 |
|
|
mazmazz
|
1e7a4af207
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-17 08:06:17 -04:00 |
|
|
mazmazz
|
8b4c4e20d5
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-17 08:06:10 -04:00 |
|
|
mazmazz
|
752a963037
|
Colormap netsync: String format numsectors to UINT32 (thanks buildbot)
|
2018-09-17 08:05:51 -04:00 |
|
|
mazmazz
|
c44ce7b401
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-17 00:28:16 -04:00 |
|
|
mazmazz
|
3ebd545523
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-17 00:27:11 -04:00 |
|
|
mazmazz
|
f3e1d280d0
|
Colormap netsync: Mixed D+C fixes
|
2018-09-17 00:26:58 -04:00 |
|
|
mazmazz
|
60ba0f5911
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-16 22:42:57 -04:00 |
|
|
mazmazz
|
4b55415add
|
New colormap netsync fixes
|
2018-09-16 22:42:36 -04:00 |
|
|
mazmazz
|
0a998fec02
|
New colormap netsync fixes
|
2018-09-16 22:41:08 -04:00 |
|
|
mazmazz
|
d4a18fd456
|
455: Fade colormap netsync use new colormap saving
|
2018-09-16 20:27:24 -04:00 |
|
|
mazmazz
|
545602d94d
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-16 20:25:59 -04:00 |
|
|
mazmazz
|
4cdbc7249f
|
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
|
2018-09-16 20:25:46 -04:00 |
|
|
mazmazz
|
efe0af960d
|
Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS
|
2018-09-15 02:10:55 -04:00 |
|
|
mazmazz
|
79484de4ea
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-15 01:51:06 -04:00 |
|
|
mazmazz
|
5e55f6f311
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-15 01:50:53 -04:00 |
|
|
mazmazz
|
6844ed37c5
|
Colormap overhaul: %d format size_t -> UINT32 fix
|
2018-09-15 01:50:33 -04:00 |
|
|
mazmazz
|
1db8aee539
|
455: Mixed D+C fix
|
2018-09-15 00:53:21 -04:00 |
|
|
mazmazz
|
be6acdb019
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-15 00:52:45 -04:00 |
|
|
mazmazz
|
57959522e2
|
Colormap overhaul r_data: Mixed D+C fix
|
2018-09-15 00:49:03 -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 |
|