Commit graph

5957 commits

Author SHA1 Message Date
Steel Titanium
13a3f197bd Use MemAvailable instead 2018-09-20 18:30:46 -04:00
mazmazz
9fd7fac3ae MP Core Win32: Fix FadeSong unused callback param (buildbots) 2018-09-20 08:41:40 -04:00
Digiku
46691c557d Merge branch 'le-fof-sametagfix' into 'master'
Linedef Exec FOF specials: Don't stop procedure after the first matching FOF in target sector

See merge request STJr/SRB2Internal!194
2018-09-20 08:09:25 -04:00
mazmazz
64d3aaef14 foundrover ffloor_t -> boolean 2018-09-19 20:11:30 -04:00
mazmazz
0a35e11e2c Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic 2018-09-19 19:57:19 -04:00
mazmazz
67e89f9425 MP Core s_sound: I_FadeSongFromVolume call fix (buildbots) 2018-09-19 19:46:57 -04:00
mazmazz
ef9b2b633f Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic 2018-09-19 19:32:51 -04:00
mazmazz
85e028c1bf MP Core s_sound: Mixed D+C fix (buildbots) 2018-09-19 19:19:18 -04:00
mazmazz
43f6038d98 MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots) 2018-09-19 19:18:35 -04:00
mazmazz
8eb2171fcd MP Core Mixer: Old-style function dec fixes (buildbots) 2018-09-19 19:06:24 -04:00
mazmazz
b5e1856377 Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic 2018-09-19 18:55:00 -04:00
mazmazz
fae377b896 MP Core Mixer: Unused param fixes (buildbots) 2018-09-19 18:26:33 -04:00
mazmazz
9042f1a23b Initialize foundrover to NULL (for debug checking) 2018-09-19 17:50:05 -04:00
mazmazz
052f1aede6 Linedef exec FOF specials: Move logic into for (rover =...) block so procedure happens on every FOF match 2018-09-19 17:49:03 -04:00
Digiku
a8a0549bf4 Merge branch 'nights-keeppoints' into 'master'
NiGHTS: Deduct marescore when player hits ground, not immediately on timeout

See merge request STJr/SRB2Internal!161
2018-09-19 11:03:24 -04:00
Digiku
a5a8282a77 Merge branch 'nights-score-lap' into 'master'
NiGHTS: Intermission Bonuses

See merge request STJr/SRB2Internal!159
2018-09-19 11:03:14 -04:00
Digiku
96f61d8ae6 Nights intermission bonus y_inter.c: A comment 2018-09-19 10:53:11 -04:00
Digiku
eb307a4066 Nights intermission dehacked: a comment 2018-09-19 10:45:51 -04:00
mazmazz
ec61164765 MP Core: 2.1 dehacked typo 2018-09-18 23:29:18 -04:00
mazmazz
9d40bf57fe Mixer: Add back var_cleanup in I_LoadSong
Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!
2018-09-18 22:24:07 -04:00
Digiku
94730a921e Merge branch 'le-fadefof' into 'master'
Linedef Exec Action: Fade FOF

See merge request STJr/SRB2Internal!168
2018-09-18 17:14:48 -04:00
mazmazz
7dfe25d1b5 Merge branch 'master' into le-fadefof 2018-09-18 17:11:33 -04:00
mazmazz
4fa7a4ca37 musicplus-le-changemusic 2.2 -> 2.1 backport 2018-09-18 15:28:57 -04:00
mazmazz
a3664c3083 Lua P_RestoreMusic else if fix 2018-09-18 15:11:37 -04:00
mazmazz
4ce05ceadf MusicPlus core: Win32 DD compile fixes 2018-09-18 14:09:13 -04:00
mazmazz
d65967908d MusicPlus core: NOMIXER=1 compile fix 2018-09-18 13:23:42 -04:00
mazmazz
80ce366b3f Mixer I_StopSong: StopFadingSong and var_cleanup call fix 2018-09-18 12:55:19 -04:00
mazmazz
9c89bf3fef MusicPlus core: Lua separation fixes 2018-09-18 11:39:08 -04:00
Digiku
ba0b15a715 Merge branch 'fof-fixes-movingplatexists' into 'master'
Moving platform fix: Player snaps to floor when setting ~FF_EXISTS

See merge request STJr/SRB2Internal!188
2018-09-18 11:29:11 -04:00
mazmazz
c213c23af3 420: Don't interrupt existing light fade on duration timing except EFFECT5
(cherry picked from commit 3b957c32517a8f5148940c0067af7e88a51d1fee)
2018-09-18 11:08:33 -04:00
Digiku
be6bae4ccb Merge branch 'colormap-overhaul-fade' into 'master'
Linedef Exec 455 Fade Colormap, 456 Stop Fading Colormap

See merge request STJr/SRB2Internal!191
2018-09-18 11:06:09 -04:00
mazmazz
65aeea28bc Merge branch 'colormap-overhaul-fade' into le-fadefof 2018-09-18 11:05:30 -04:00
mazmazz
83cfc7d0e4 Merge remote-tracking branch 'origin/master' into le-fadefof 2018-09-18 10:52:03 -04:00
Digiku
7e8fdcae54 Merge branch 'colormap-overhaul-change-ldef' into 'master'
Linedef Exec 447: Change Colormap relative value calc

See merge request STJr/SRB2Internal!190
2018-09-18 10:49:54 -04:00
Digiku
31ea145fb2 Merge branch 'polyobj-fade' into 'master'
Linedef Exec 492: Fade PolyObject

See merge request STJr/SRB2Internal!192
2018-09-18 10:48:46 -04:00
Digiku
34a340340d Merge branch 'no-effect5-fudging' into 'master'
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec

See merge request STJr/SRB2Internal!193
2018-09-18 10:48:29 -04:00
mazmazz
32c48af258 MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz
4da5d45cf5 S_ChangeMusic: More specific load/play fail messages 2018-09-18 09:38:41 -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