Commit graph

9810 commits

Author SHA1 Message Date
mazmazz
b31b93abec S_ChangeMusic: More specific load/play fail messages 2018-09-18 08:32:34 -04:00
mazmazz
7b94368549 p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec 2018-09-18 07:37:29 -04:00
mazmazz
f3f8575dfc 492: Remove pre-existing thinker when setting up new fade 2018-09-18 07:31:19 -04:00
mazmazz
ae5b02bccd 492: Don't interrupt existing polyobj fader unless EFFECT5 2018-09-18 07:31:17 -04:00
mazmazz
5daf21de9b 455: A line break 2018-09-18 07:30:37 -04:00
mazmazz
71e7a15425 455: Commented out, but allow existing fade overlap of 2 tics (or speed*2) 2018-09-18 07:30:35 -04:00
mazmazz
a48b9d9e3f 455: Don't interrupt current color fading 2018-09-18 07:29:21 -04:00
mazmazz
aa9da189a6 453: A line break 2018-09-18 07:28:30 -04:00
mazmazz
dfaf0b00d4 453: Commented out, but allow existing fade overlap of 2 tics (or speed*2) 2018-09-18 07:28:28 -04:00
mazmazz
2fac7c36ad 453: Don't interrupt current FOF fade unless EFFECT5 2018-09-18 07:27:47 -04:00
Monster Iestyn
c088d55547 Merge branch 'public_next' 2018-09-17 21:50:19 +01:00
Monster Iestyn
e48e3e15c4 Merge branch 'public-var2s-fix' into 'next'
Level spec thinker: Netsync var2s

See merge request STJr/SRB2!280
2018-09-17 14:43:44 -04:00
mazmazz
f307c6d1b6 Line exec trigger netsync: Save var2s in addition to vars 2018-09-17 14:13:31 -04:00
Digiku
a35a4e052c Merge branch 'colormap-overhaul' into 'master'
Colormap code overhaul

See merge request STJr/SRB2Internal!189
2018-09-17 11:24:14 -04:00
mazmazz
f57e7c7fc5 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-17 10:57:02 -04:00
mazmazz
7b1856e32a Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-17 10:56:56 -04:00
mazmazz
e57bd5206c Colormap netsync: Count ffloors for colormap loading upper limit 2018-09-17 10:38:17 -04:00
mazmazz
5f176f5525 Colormap netsync: Handle unaccounted dummy colormaps properly 2018-09-17 10:30:21 -04:00
mazmazz
30b57e22cd Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-17 08:06:17 -04:00
mazmazz
67d3b713a2 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-17 08:06:10 -04:00
mazmazz
02ed2d247e Colormap netsync: String format numsectors to UINT32 (thanks buildbot) 2018-09-17 08:05:51 -04:00
mazmazz
70a672229c 453: Use new colormap netsync for fade FOF thinker 2018-09-17 00:34:03 -04:00
mazmazz
02c33bcac8 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-17 00:28:16 -04:00
mazmazz
db35c7cd45 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-17 00:27:11 -04:00
mazmazz
0cba69e75a Colormap netsync: Mixed D+C fixes 2018-09-17 00:26:58 -04:00
mazmazz
a1e2ee2e11 Postboss: S_ChangeMusicAdvanced -> Ex 2018-09-16 23:44:42 -04:00
mazmazz
5f5ea5eec6 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-09-16 23:32:18 -04:00
mazmazz
08efe2aa24 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-16 23:18:11 -04:00
mazmazz
ce37b8f121 S_ChangeMusicAdvanced -> S_ChangeMusicEx 2018-09-16 23:10:23 -04:00
mazmazz
8315170069 Separate Lua from musicplus-core 2018-09-16 23:09:37 -04:00
mazmazz
c36f189da3 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-16 22:42:57 -04:00
mazmazz
e5d533edc2 New colormap netsync fixes 2018-09-16 22:42:36 -04:00
mazmazz
3bfdcad4cc New colormap netsync fixes 2018-09-16 22:41:08 -04:00
mazmazz
82ebf0c64a 455: Fade colormap netsync use new colormap saving 2018-09-16 20:27:24 -04:00
mazmazz
1103503dee Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-16 20:25:59 -04:00
mazmazz
5923e85c5a Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector 2018-09-16 20:25:46 -04:00
mazmazz
d21467eeaa Improve MIDI console parameters
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
2018-09-16 16:02:26 -04:00
mazmazz
0c307ea528 Build notes for SDL Mixer X 2018-09-16 16:02:24 -04:00
mazmazz
56e697ba90 Add SDL Mixer X external DLL dependencies 2018-09-16 16:02:23 -04:00
Monster Iestyn
9481e7d358 Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
mazmazz
e58cfe9ced Improve MIDI console parameters
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
2018-09-16 11:51:39 -04:00
Digiku
7b65f36d43 Merge branch 'lightfade-ticbased' into 'master'
Linedef Exec 420: Fade Lighting add duration timing

See merge request STJr/SRB2Internal!186
2018-09-16 08:24:09 -04:00
mazmazz
20537f1310 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-16 08:20:57 -04:00
mazmazz
33bc560f15 420: Strip test comments 2018-09-16 08:20:14 -04:00
mazmazz
18abae47ce Build notes for SDL Mixer X 2018-09-15 22:20:04 -04:00
mazmazz
48f82b4aa8 Add SDL Mixer X external DLL dependencies 2018-09-15 21:47:03 -04:00
mazmazz
3ce5362a1d 453: Extra parameter for Add_ColormapFader 2018-09-15 20:40:17 -04:00
mazmazz
d8b57f32e7 492: Merge speed and duration logic for fade polyobject 2018-09-15 20:00:37 -04:00
Monster Iestyn
94b02c8e44 Merge branch 'mario-block-sync' into 'next'
Fix for Mario block FOF texture synchronisation in netgames

See merge request STJr/SRB2!279
2018-09-15 10:15:47 -04:00
Nev3r
2009c93ddd The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now. 2018-09-15 12:21:25 +02:00