Commit graph

6747 commits

Author SHA1 Message Date
mazmazz
551237350e MP Mixer X: Fix double->UINT32 cast (buildbots) 2018-09-20 08:30:31 -04:00
mazmazz
4b4bd638a9 MP libopenmpt: Add doomdef.h header to load_libraries, resolve CONS_Printf (buildbots) 2018-09-20 08:23:29 -04:00
Digiku
b75f54ea95 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
b38f6f6125 MP Libopenmpt: Fix UINT32->double cast (buildbots) 2018-09-20 07:42:35 -04:00
mazmazz
2896b3e3c4 MP Libopenmpt: SDL header in load_libraries 2018-09-20 07:39:53 -04:00
mazmazz
d5b3d74e6f MP Libopenmpt: Separate loading into sdl/load_libraries.c 2018-09-19 23:18:06 -04:00
mazmazz
65b8dd559c MP libopenmpt: Remove from Linux buildbots due to explicit OPENMPT=1 change 2018-09-19 23:05:46 -04:00
mazmazz
1508f3a320 MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms 2018-09-19 23:03:35 -04:00
mazmazz
31343be41b foundrover ffloor_t -> boolean 2018-09-19 20:11:30 -04:00
mazmazz
03367bdc60 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-09-19 20:07:03 -04:00
mazmazz
6f1a5cbfc9 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-19 20:06:56 -04:00
mazmazz
7290723484 Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic 2018-09-19 19:57:19 -04:00
mazmazz
0bc6b2e4d8 Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel 2018-09-19 19:56:54 -04:00
mazmazz
7cd1bfb8d7 Merge branch 'public-musicplus-core' into public-musicplus-jingle 2018-09-19 19:56:50 -04:00
mazmazz
a4fade9b25 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-19 19:56:49 -04:00
mazmazz
f52659d9f9 MP Postboss: strnicmp -> boolean remove cast (buildbots) 2018-09-19 19:54:14 -04:00
mazmazz
af5aecb246 MP Jingle: Better empty_music_stack_entry initialization (buildbots) 2018-09-19 19:51:04 -04:00
mazmazz
7084fc89bd MP Core s_sound: I_FadeSongFromVolume call fix (buildbots) 2018-09-19 19:47:21 -04:00
mazmazz
2644180b7e MP Core s_sound: I_FadeSongFromVolume call fix (buildbots) 2018-09-19 19:46:57 -04:00
mazmazz
37addc02e6 MP Core Mixer: Old-style function dec fixes (buildbots) 2018-09-19 19:41:38 -04:00
mazmazz
49c678d2e9 MP Core s_sound: Mixed D+C fix (buildbots) 2018-09-19 19:41:23 -04:00
mazmazz
de47ab63f2 MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots) 2018-09-19 19:40:24 -04:00
mazmazz
be5555d393 Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel 2018-09-19 19:32:52 -04:00
mazmazz
17fc39c62e Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic 2018-09-19 19:32:51 -04:00
mazmazz
7cc0b6cf95 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-19 19:32:49 -04:00
mazmazz
affbc89602 Merge branch 'public-musicplus-core' into public-musicplus-jingle 2018-09-19 19:24:57 -04:00
mazmazz
17c796fe74 MP Jingle: Buildbot fixes 2018-09-19 19:24:35 -04:00
mazmazz
164be3056f MP Core s_sound: Mixed D+C fix (buildbots) 2018-09-19 19:19:18 -04:00
mazmazz
96fa8996db MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots) 2018-09-19 19:18:35 -04:00
mazmazz
ade637798b MP Core Mixer: Old-style function dec fixes (buildbots) 2018-09-19 19:06:24 -04:00
mazmazz
75558c40a2 Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel 2018-09-19 18:55:01 -04:00
mazmazz
d4cef2bf9b Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic 2018-09-19 18:55:00 -04:00
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