Commit graph

5832 commits

Author SHA1 Message Date
Steel
ac8658fac8 Fix up errors with buildbots 2018-09-21 07:16:54 -04:00
mazmazz
9d4ef0397c MP Jingle: Remove P_RestoreMusic from space countdown (no reason to have it) 2018-09-20 19:05:05 -04:00
Steel Titanium
43cbb0d11e Add some stuff 2018-09-20 18:33:50 -04:00
Steel Titanium
13a3f197bd Use MemAvailable instead 2018-09-20 18:30:46 -04:00
mazmazz
fa5532b386 MP Jingle: Add fade timing hack after ending a non-looping song 2018-09-20 18:30:21 -04:00
mazmazz
9bfd8c4a4b MP Jingle: Changed music_stacks from fixed array to next/prev chain 2018-09-20 17:13:52 -04:00
mazmazz
95db2ea276 MP Core Win32: Fix FadeSong unused callback param (buildbots) 2018-09-20 08:42:28 -04:00
mazmazz
9fd7fac3ae MP Core Win32: Fix FadeSong unused callback param (buildbots) 2018-09-20 08:41:40 -04:00
mazmazz
3ec85a69ff MP Mixer X: Fix double->UINT32 cast (buildbots) 2018-09-20 08:30:31 -04:00
mazmazz
82c049e80d MP libopenmpt: Add doomdef.h header to load_libraries, resolve CONS_Printf (buildbots) 2018-09-20 08:23:29 -04:00
mazmazz
65314be0ec MP Libopenmpt: Fix UINT32->double cast (buildbots) 2018-09-20 07:42:35 -04:00
mazmazz
bde488215f MP Libopenmpt: SDL header in load_libraries 2018-09-20 07:39:53 -04:00
mazmazz
28b456c05d MP Libopenmpt: Separate loading into sdl/load_libraries.c 2018-09-19 23:18:06 -04:00
mazmazz
f771c12701 MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms 2018-09-19 23:03:35 -04:00
mazmazz
64d3aaef14 foundrover ffloor_t -> boolean 2018-09-19 20:11:30 -04:00
mazmazz
d45c3b39bc Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-09-19 20:07:03 -04:00
mazmazz
000873cf50 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-19 20:06:56 -04:00
mazmazz
0a35e11e2c Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic 2018-09-19 19:57:19 -04:00
mazmazz
5290746977 Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel 2018-09-19 19:56:54 -04:00
mazmazz
8cca1f5627 Merge branch 'public-musicplus-core' into public-musicplus-jingle 2018-09-19 19:56:50 -04:00
mazmazz
c737b18924 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-19 19:56:49 -04:00
mazmazz
dede6696ca MP Postboss: strnicmp -> boolean remove cast (buildbots) 2018-09-19 19:54:14 -04:00
mazmazz
1e2436434a MP Jingle: Better empty_music_stack_entry initialization (buildbots) 2018-09-19 19:51:04 -04:00
mazmazz
2b3f8be93d MP Core s_sound: I_FadeSongFromVolume call fix (buildbots) 2018-09-19 19:47:21 -04:00
mazmazz
67e89f9425 MP Core s_sound: I_FadeSongFromVolume call fix (buildbots) 2018-09-19 19:46:57 -04:00
mazmazz
6884a229f0 MP Core Mixer: Old-style function dec fixes (buildbots) 2018-09-19 19:41:38 -04:00
mazmazz
9547e6206c MP Core s_sound: Mixed D+C fix (buildbots) 2018-09-19 19:41:23 -04:00
mazmazz
7a5cfe2514 MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots) 2018-09-19 19:40:24 -04:00
mazmazz
13cc8d31e9 Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel 2018-09-19 19:32:52 -04:00
mazmazz
ef9b2b633f Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic 2018-09-19 19:32:51 -04:00
mazmazz
494f172597 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-19 19:32:49 -04:00
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
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
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
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