Monster Iestyn
6c85af79f6
Merge branch 'master' into hud-n-menu-tidbits
...
# Conflicts:
# src/m_menu.c
# src/screen.c
# src/st_stuff.c
2018-08-28 20:51:46 +01:00
Monster Iestyn
2d7263c7f1
Merge branch 'public_next'
...
# Conflicts:
# src/r_things.c
# src/v_video.c
2018-08-28 19:31:08 +01:00
mazmazz
5af6aa06ae
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-08-28 10:27:49 -04:00
mazmazz
474d17e532
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-08-28 10:23:13 -04:00
mazmazz
5ef4deb974
Fix MIDI looping/non-looping
2018-08-28 10:16:06 -04:00
mazmazz
adb9fa044d
Revise LUAh_MusicChange hook
2018-08-28 10:10:56 -04:00
mazmazz
e98cd17d0e
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-27 08:40:36 -04:00
mazmazz
cc27ce8ed4
Move cvars to D_RegisterClientCommands for config recall
2018-08-27 08:40:24 -04:00
mazmazz
0e685d2686
Remove MP3 warning for win32 Mixer X
2018-08-27 06:16:55 -04:00
mazmazz
1e9fdb0454
Corrected unterminated #endif in sdl_sound
2018-08-27 06:15:01 -04:00
mazmazz
193735bc5f
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-27 05:59:55 -04:00
mazmazz
1042f2bf84
Remove unused methods (for now?)
2018-08-27 05:53:43 -04:00
mazmazz
4285ce99af
Load Fluidsynth soundfont upon cvar change
2018-08-27 05:52:01 -04:00
mazmazz
fa8112c5be
Lazy midi reload support on menu
2018-08-27 00:43:25 -04:00
mazmazz
a37e45ff37
Advanced submenu for sound options
2018-08-26 23:58:43 -04:00
mazmazz
57e5e3dba5
Revert "Sound scroll menu attempt"
...
This reverts commit 6afa648c40
2018-08-26 23:46:55 -04:00
mazmazz
6afa648c40
Sound scroll menu attempt
2018-08-26 23:46:20 -04:00
mazmazz
cedf656451
Checkpoint: Add FluidSynth and Timidity support
2018-08-26 23:03:38 -04:00
mazmazz
cd44668e21
Makefile comments
2018-08-26 23:02:57 -04:00
mazmazz
5ef05da736
New SDL Mixer X builds with FluidSynth and Timidity
2018-08-26 23:02:29 -04:00
Monster Iestyn
3ea826f279
Merge branch 'master' into next
2018-08-26 21:10:41 +01:00
Monster Iestyn
69b0a86e4a
Merge branch 'yo_screen_so_wide_y_is_invalid' into 'master'
...
Yo Screen So Wide y Is Invalid
See merge request STJr/SRB2!271
2018-08-26 16:07:06 -04:00
mazmazz
8f5aeb49ff
HAVE_MIXERX and NOMIXERX compile flags (win32 only)
2018-08-26 15:12:00 -04:00
mazmazz
123c781b27
Fix S_ChangeMusic newmusic -> mmusic, merge error
2018-08-26 14:22:14 -04:00
mazmazz
0939cabd57
Make SDL Mixer X win32-exclusive
2018-08-26 14:20:41 -04:00
mazmazz
3dfbb61546
New SDL2 test files
2018-08-26 14:12:11 -04:00
mazmazz
ed6ec14797
Merge branch 'music-cleanup' into music-sdlmixerx
2018-08-26 14:04:54 -04:00
toaster
b26828805e
Missed one!
2018-08-26 12:38:53 +01:00
mazmazz
c8a802bb6b
Fixed post-boss music change with mapmusname comparison
2018-08-25 22:19:15 -04:00
mazmazz
b7c8f7fab7
Case-insensitive music_name comparison
2018-08-25 22:00:31 -04:00
mazmazz
7d42877ff2
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-08-25 21:55:49 -04:00
mazmazz
a622982a90
Remove tolower music_name, because we do case-insensitive matching now
2018-08-25 21:53:22 -04:00
mazmazz
1999544b62
Case-insensitive music matching
2018-08-25 21:50:56 -04:00
mazmazz
3cf24dc9b7
Case-insensitive music_name comparison
2018-08-25 21:42:39 -04:00
mazmazz
9fd8387830
Load mapmus vars post-boss even if another tune is playing, like a jingle
2018-08-25 17:42:46 -04:00
Monster Iestyn
7c321b4248
Merge branch 'v_video_killed_the_r_radio_star' into 'master'
...
v_video Killed The r_radio Star
See merge request STJr/SRB2!270
2018-08-25 16:43:25 -04:00
Monster Iestyn
7f0d75f741
Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master'
...
Zalloc Potter and the Death-Free Hallows
See merge request STJr/SRB2!269
2018-08-25 16:43:14 -04:00
Monster Iestyn
eb681b4b45
Merge branch 'lighting_fixes_plane_n_simple' into 'master'
...
Lighting fixes? Plane and simple!
See merge request STJr/SRB2!268
2018-08-25 16:43:00 -04:00
mazmazz
142807392e
UINT32 muspostbosspos fix
2018-08-25 16:28:56 -04:00
mazmazz
e588460fe5
MUSICPOSITION -> MUSICPOS
...
* Added muspos level header var to lua
# Conflicts:
# src/dehacked.c
# src/lua_maplib.c
# src/p_setup.c
2018-08-25 16:23:01 -04:00
mazmazz
6bb5280fbc
MUSICPOSITION -> MUSICPOS
...
* Added muspos level header var to lua
2018-08-25 16:21:34 -04:00
mazmazz
26d309992a
MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS
2018-08-25 16:18:09 -04:00
toaster
60177bba79
Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP.
2018-08-25 21:17:34 +01:00
mazmazz
bc0038ca3e
Merge branch 'musicplus-core' into musicplus-feature-postboss
...
# Conflicts:
# src/dehacked.c
# src/p_setup.c
2018-08-25 16:11:29 -04:00
mazmazz
13854fbffb
Added MUSICPOSTBOSSTRACK and MUSICPOSTBOSSPOSITION level header/variables
2018-08-25 16:10:46 -04:00
mazmazz
f30cf2b6cc
Added MUSICPOSTBOSS level header for boss post-defeat music
2018-08-25 16:02:12 -04:00
mazmazz
5ed5f469b2
Add MUSICPOSITION level header and mapmusposition variable to instantly jump to position
...
* Cutscene support too!
2018-08-25 15:59:20 -04:00
mazmazz
0ff0b0a3fb
Remove S_ChangeMusic call in G_PlayerReborn because redundant to S_Init
2018-08-25 15:23:48 -04:00
toaster
241c9c2260
Clean up a bunch of v_video.c functions that previously exhibited unfortunate side effects when run in non-green resolutions.
...
* V_DrawFixedPatch and ilk:
* Change the offset of V_FLIP so it's not one screen-pixel off where its non-flipped sprite would have started being drawn from.
* Write to x and y as well as desttop so that anti-screen-overflow checks later in the function behave properly with non-green resolutions.
* V_DrawFill:
* Reduce number of operations performed upon `c`.
* V_DrawString and ilk:
* Offset the left and right boundary checks in non-green resolutions such that you can actually draw stuff to the left of basevid screen x coordinate 0.
2018-08-25 19:52:17 +01:00
Digiku
eb5f4bcdb0
Merge branch 'op-nightshoop' into 'master'
...
NiGHTS objectplace: Place new hoop 1713 instead of 1705
See merge request STJr/SRB2Internal!136
2018-08-25 13:23:51 -04:00
