mazmazz
adb9fa044d
Revise LUAh_MusicChange hook
2018-08-28 10:10:56 -04:00
TehRealSalt
b4f2a03e28
Merge branch 'sonicitems' into sal-misc
2018-08-27 21:08:39 -04:00
TehRealSalt
8f790957f1
Last touches for smk maps
...
- different min/max on capped spring pads
- turn the normally almost-useless "non-ramp sector" type into "wall sector", which disables both stepup AND stepdown instead of just stepdown
2018-08-27 18:09:32 -04:00
toaster
3e1d365091
Fix that thing where item boxes just wouldn't respawn in battle if you nabbed them all too quickly (which is very likely to happen in large netgames where we have the great fortune of playing on battal bowl).
2018-08-27 17:25:22 +01: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
TehRealSalt
82e018eb99
Correct remaining instances where step up/down scales with the object instead of the map
2018-08-27 01:07:44 -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
TehRealSalt
5498b63cca
Adjustments made to address the netgame
...
Less grow, less invinc, less ballhog, just a teensy bit less triple orbinaut, and SPB odds no longer scale with lower player counts like other power items do
2018-08-26 19:55:31 -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
TehRealSalt
844fbbfc4c
Good catch
2018-08-26 15:17:55 -04:00
mazmazz
8f5aeb49ff
HAVE_MIXERX and NOMIXERX compile flags (win32 only)
2018-08-26 15:12:00 -04:00
TehRealSalt
798cf3c8ae
Rebalance Battle items in response to last night's netgame
2018-08-26 14:58:21 -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
dec11f37ff
Increase the amount of time between the switch to the Rankings half of intermission and ranking is calculated a tad.
...
Turns out it wasn't taking the length of the level-to-rankings switch animation into account!
2018-08-26 17:31:04 +01:00
toaster
98ccb96938
Real time reordering of intermission rankings as rank counts up!
...
Also features jittering of the intermission elements because I thought it'd be fun, plus some better handling of players leaving (and then new ones joining) mid-intermission.
2018-08-26 16:23:50 +01:00
toaster
f2b73e15b4
* Exempt drop shadows from encore remapping.
...
* Make MT_GHOST's encoremapping depend on whether the source was encoremapped.
* Revamp how sector typegroup 2, type 15 inverts the encoremapping (so planes don't get awkwardly desynchronised).
2018-08-26 15:15:03 +01:00
toaster
44c33561b5
Merge branch 'sonicitems' into encore
2018-08-26 12:45:02 +01:00
toaster
6365e6b2f9
Undef SHITPLANESPARENCY downstream from vanilla, as promised.
2018-08-26 12:43:31 +01:00
toaster
41b7625fa7
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
...
# Conflicts:
# src/g_game.c
# src/v_video.c
2018-08-26 12:42:55 +01:00
toaster
b26828805e
Missed one!
2018-08-26 12:38:53 +01:00
toaster
e564f76416
Dumbass copypaste rectified, stplyr is NOT valid in mobjthinker code. toaster, stop making commits to sonicitems
2018-08-26 12:27:45 +01:00
TehRealSalt
b7caeccda9
Merge branch 'sonicitems' into encore
2018-08-26 00:12:02 -04:00
TehRealSalt
efa439f6bf
Merge branch 'sal-misc' into sonicitems
2018-08-26 00:11:19 -04: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
