Commit graph

24347 commits

Author SHA1 Message Date
mazmazz
2db5278f47 Merge branch 'public-musicplus-core' into public-musicplus-jingle 2018-09-19 19:24:57 -04:00
mazmazz
47973f787e MP Jingle: Buildbot fixes 2018-09-19 19:24:35 -04:00
mazmazz
af78bff2e1 Merge branch 'public-musicplus-core' into public-musicplus-lua 2018-09-19 19:19:30 -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
81620f5885 Merge branch 'public-musicplus-core' into public-musicplus-lua 2018-09-19 18:56:17 -04:00
mazmazz
7102ccbcd8 Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel 2018-09-19 18:55:01 -04:00
mazmazz
b5e1856377 Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic 2018-09-19 18:55:00 -04:00
mazmazz
ab89003cb2 Merge branch 'public-musicplus-core' into public-musicplus-jingle 2018-09-19 18:55:00 -04:00
mazmazz
a45d4e31be Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-19 18:54:58 -04:00
mazmazz
73925fe590 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-09-19 18:53:46 -04:00
mazmazz
fa22f65610 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-19 18:53:41 -04:00
mazmazz
cf7131bfd4 Merge remote-tracking branch 'origin/master' into musicplus-core 2018-09-19 18:53:18 -04:00
TehRealSalt
43f8b46ba0 Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc 2018-09-19 18:45:47 -04:00
mazmazz
a235d95d37 MP Jingle: Buildbot fixes 2018-09-19 18:42:35 -04:00
mazmazz
3d4228b8de MP Core Mixer: Unused param fixes (buildbots) 2018-09-19 18:26:59 -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
TehRealSalt
a9d3789c37 Enable noclip cam again.
It's just... TOO good, despite the couple of issues with it
2018-09-18 23:56:26 -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
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
TehRealSalt
c043c79fd2 Spark fix
(please don't spread these fixes out across different branches :boi:)
2018-09-18 15:51:27 -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
toaster
15bf75d560 Update a bunch of icons - SDL_icon.xpm and other targets' .icos. 2018-09-18 19:37:03 +01: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
647506f90a Merge branch 'public-musicplus-core' into public-musicplus-lua 2018-09-18 12:56:16 -04:00