TehRealSalt
|
a3089a546f
|
Spindash boost dust, pogo spring sfx
|
2018-09-19 20:13:48 -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
|
1b4c7e71cc
|
Merge branch 'public-musicplus-core' into public-musicplus-lua
|
2018-09-19 19:56:47 -04:00 |
|
mazmazz
|
4c0635f94b
|
MP Lua: FadeMusic signed/unsigned comparison fix (buildbots)
|
2018-09-19 19:55:22 -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
|
0bcc8ff26a
|
MP Lua: MusicExists Mixed D+C fix (buildbots)
|
2018-09-19 19:29:38 -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
|
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 |
|