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
|
9dbb0a1c3e
|
EndOfLevel: 2.1 _clear -> lclear music in y_inter
|
2018-09-18 23:32:00 -04:00 |
|
mazmazz
|
ec61164765
|
MP Core: 2.1 dehacked typo
|
2018-09-18 23:29:18 -04:00 |
|
mazmazz
|
d7ba245022
|
EndOfLevel: 2.1 dehacked setup fix
|
2018-09-18 23:28:39 -04:00 |
|
mazmazz
|
e0feed7210
|
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
|
15dc28144b
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2018-09-18 22:24:44 -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 |
|
mazmazz
|
27cde189de
|
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 |
|
mazmazz
|
7dfe25d1b5
|
Merge branch 'master' into le-fadefof
|
2018-09-18 17:11:33 -04:00 |
|
mazmazz
|
54d02e1d9a
|
musicplus-feature-endoflevel 2.2 -> 2.1 backport
|
2018-09-18 15:50:12 -04:00 |
|
mazmazz
|
4d164802c1
|
Merge branch 'musicplus-core' into musicplus-feature-postboss
|
2018-09-18 15:35:02 -04:00 |
|
mazmazz
|
4fa7a4ca37
|
musicplus-le-changemusic 2.2 -> 2.1 backport
|
2018-09-18 15:28:57 -04:00 |
|
mazmazz
|
7aee66592f
|
Lua P_RestoreMusic else if fix
|
2018-09-18 15:12:09 -04:00 |
|
mazmazz
|
a3664c3083
|
Lua P_RestoreMusic else if fix
|
2018-09-18 15:11:37 -04:00 |
|
mazmazz
|
f539ebf7a9
|
Lua P_RestoreMusic else if fix
|
2018-09-18 15:10:42 -04:00 |
|
mazmazz
|
77381cd984
|
musicplus-jingle 2.2 -> 2.1 backport
|
2018-09-18 15:10:00 -04:00 |
|
mazmazz
|
0f2b4da1a9
|
MusicPlus core: Win32 DD compile fixes
|
2018-09-18 14:09:24 -04:00 |
|
mazmazz
|
4ce05ceadf
|
MusicPlus core: Win32 DD compile fixes
|
2018-09-18 14:09:13 -04:00 |
|
mazmazz
|
50fa4e52fd
|
MusicPlus core: NOMIXER=1 compile fix
|
2018-09-18 13:23:59 -04:00 |
|
mazmazz
|
d65967908d
|
MusicPlus core: NOMIXER=1 compile fix
|
2018-09-18 13:23:42 -04:00 |
|
mazmazz
|
cd0dbac3db
|
Move cv_modfilter from mixer_sound.c to s_sound.c for other targets
|
2018-09-18 13:01:34 -04:00 |
|
mazmazz
|
bd4a612fa3
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2018-09-18 12:59:53 -04:00 |
|
mazmazz
|
80ce366b3f
|
Mixer I_StopSong: StopFadingSong and var_cleanup call fix
|
2018-09-18 12:55:19 -04:00 |
|
mazmazz
|
88c7d45b22
|
Merge branch 'musicplus-core' into musicplus-sdlmixerx
|
2018-09-18 12:51:55 -04:00 |
|
mazmazz
|
0e8ec47727
|
Mixer I_StopSong: StopFadingSong and var_cleanup call fix
|
2018-09-18 12:51:42 -04:00 |
|
mazmazz
|
320cb89af9
|
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
|
2018-09-18 12:46:46 -04:00 |
|
mazmazz
|
28d62dc19b
|
Merge branch 'musicplus-core' into musicplus-sdlmixerx
|
2018-09-18 12:46:41 -04:00 |
|
mazmazz
|
633c20debb
|
Define cv_midiplayer/soundfontpath/timiditypath in s_sound.c when NOMIXER=1
|
2018-09-18 12:41:49 -04:00 |
|
mazmazz
|
85c6715188
|
musicplus-libopenmpt 2.2 -> 2.1 backport
|
2018-09-18 12:31:47 -04:00 |
|
mazmazz
|
9457fe15bf
|
Merge branch 'master' into musicplus-core
|
2018-09-18 12:20:56 -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 |
|
mazmazz
|
95ea520ad1
|
MusicPlus core: Lua separation fixes
|
2018-09-18 10:32:38 -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
|
0c7ddd44c5
|
Merge branch 'music-cleanup' into musicplus-core
|
2018-09-18 08:33:20 -04:00 |
|
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 |
|