mazmazz
|
af89cf92e2
|
Merge branch 'public-musicplus-core' into public-musicplus-jingle
|
2018-09-19 18:55:00 -04:00 |
|
mazmazz
|
86f3fadd5e
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2018-09-19 18:54:58 -04:00 |
|
mazmazz
|
1c314833db
|
Merge branch 'musicplus-core' into musicplus-feature-postboss
|
2018-09-19 18:53:46 -04:00 |
|
mazmazz
|
3e9b253438
|
Merge branch 'musicplus-core' into musicplus-sdlmixerx
|
2018-09-19 18:53:41 -04:00 |
|
mazmazz
|
1da3b921dd
|
Merge remote-tracking branch 'origin/master' into musicplus-core
|
2018-09-19 18:53:18 -04:00 |
|
mazmazz
|
e08bdec216
|
MP Jingle: Buildbot fixes
|
2018-09-19 18:42:35 -04:00 |
|
mazmazz
|
494c5290cf
|
MP Core Mixer: Unused param fixes (buildbots)
|
2018-09-19 18:26:59 -04:00 |
|
mazmazz
|
974b1d340a
|
MP Core Mixer: Unused param fixes (buildbots)
|
2018-09-19 18:26:33 -04:00 |
|
mazmazz
|
5e1b4272c1
|
Initialize foundrover to NULL (for debug checking)
|
2018-09-19 17:50:05 -04:00 |
|
mazmazz
|
24938473a5
|
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
|
87087c190e
|
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
|
106afd48af
|
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
|
e3ecb61173
|
Nights intermission bonus y_inter.c: A comment
|
2018-09-19 10:53:11 -04:00 |
|
Digiku
|
1dadee6804
|
Nights intermission dehacked: a comment
|
2018-09-19 10:45:51 -04:00 |
|
mazmazz
|
481c0d7623
|
EndOfLevel: 2.1 _clear -> lclear music in y_inter
|
2018-09-18 23:32:00 -04:00 |
|
mazmazz
|
db9528f6e4
|
MP Core: 2.1 dehacked typo
|
2018-09-18 23:29:18 -04:00 |
|
mazmazz
|
b057b2932d
|
EndOfLevel: 2.1 dehacked setup fix
|
2018-09-18 23:28:39 -04:00 |
|
mazmazz
|
1dd47e850b
|
EndOfLevel: Check player->exiting > 0 && <= TICRATE, fixes start-of-level fading in 2.1
Braces in y_inter.c
|
2018-09-18 23:27:00 -04:00 |
|
mazmazz
|
26749d275c
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2018-09-18 22:24:44 -04:00 |
|
mazmazz
|
00bbb60e69
|
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 |
|
mazmazz
|
f99b6a89ed
|
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:15:53 -04:00 |
|
Digiku
|
981c149e01
|
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
|
81ad8f0681
|
Merge branch 'master' into le-fadefof
|
2018-09-18 17:11:33 -04:00 |
|
mazmazz
|
d542c2440d
|
musicplus-feature-endoflevel 2.2 -> 2.1 backport
|
2018-09-18 15:50:12 -04:00 |
|
mazmazz
|
b55191f09a
|
Merge branch 'musicplus-core' into musicplus-feature-postboss
|
2018-09-18 15:35:02 -04:00 |
|
mazmazz
|
2e0e0a3856
|
musicplus-le-changemusic 2.2 -> 2.1 backport
|
2018-09-18 15:28:57 -04:00 |
|
mazmazz
|
26721b673a
|
Lua P_RestoreMusic else if fix
|
2018-09-18 15:12:09 -04:00 |
|
mazmazz
|
0cfe0824b6
|
Lua P_RestoreMusic else if fix
|
2018-09-18 15:11:37 -04:00 |
|
mazmazz
|
be2342799e
|
Lua P_RestoreMusic else if fix
|
2018-09-18 15:10:42 -04:00 |
|
mazmazz
|
c60d61a493
|
musicplus-jingle 2.2 -> 2.1 backport
|
2018-09-18 15:10:00 -04:00 |
|
mazmazz
|
0f5b7e6630
|
MusicPlus core: Win32 DD compile fixes
|
2018-09-18 14:09:24 -04:00 |
|
mazmazz
|
e4f48cfb71
|
MusicPlus core: Win32 DD compile fixes
|
2018-09-18 14:09:13 -04:00 |
|
mazmazz
|
68c295c9e1
|
MusicPlus core: NOMIXER=1 compile fix
|
2018-09-18 13:23:59 -04:00 |
|
mazmazz
|
b71996106b
|
MusicPlus core: NOMIXER=1 compile fix
|
2018-09-18 13:23:42 -04:00 |
|
mazmazz
|
b48b5a29a4
|
Move cv_modfilter from mixer_sound.c to s_sound.c for other targets
|
2018-09-18 13:01:34 -04:00 |
|
mazmazz
|
38afb85b47
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2018-09-18 12:59:53 -04:00 |
|
mazmazz
|
1a935eabd5
|
Mixer I_StopSong: StopFadingSong and var_cleanup call fix
|
2018-09-18 12:55:19 -04:00 |
|
mazmazz
|
f079c9170f
|
Merge branch 'musicplus-core' into musicplus-sdlmixerx
|
2018-09-18 12:51:55 -04:00 |
|
mazmazz
|
67566f9a2f
|
Mixer I_StopSong: StopFadingSong and var_cleanup call fix
|
2018-09-18 12:51:42 -04:00 |
|
mazmazz
|
cf7d913f3b
|
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
|
2018-09-18 12:46:46 -04:00 |
|
mazmazz
|
8583785d72
|
Merge branch 'musicplus-core' into musicplus-sdlmixerx
|
2018-09-18 12:46:41 -04:00 |
|
mazmazz
|
4cba996a89
|
Define cv_midiplayer/soundfontpath/timiditypath in s_sound.c when NOMIXER=1
|
2018-09-18 12:41:49 -04:00 |
|
mazmazz
|
4d89beb105
|
musicplus-libopenmpt 2.2 -> 2.1 backport
|
2018-09-18 12:31:47 -04:00 |
|
mazmazz
|
a2c5c331c0
|
Merge branch 'master' into musicplus-core
|
2018-09-18 12:20:56 -04:00 |
|
mazmazz
|
66283ce36a
|
MusicPlus core: Lua separation fixes
|
2018-09-18 11:39:08 -04:00 |
|
Digiku
|
b7bcc16c98
|
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
|
c45d523e8f
|
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
|
a036c42973
|
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
|
3cdd904fbc
|
Merge branch 'colormap-overhaul-fade' into le-fadefof
|
2018-09-18 11:05:30 -04:00 |
|
mazmazz
|
899e8ef2a0
|
Merge remote-tracking branch 'origin/master' into le-fadefof
|
2018-09-18 10:52:03 -04:00 |
|