Digiku
3c43ce46c6
Merge branch 'sphere-ring-concurrence' into 'master'
...
Change SETSPHERES console command to SETRINGS to handle player->spheres transparently
See merge request STJr/SRB2Internal!167
2018-08-29 04:24:23 -04:00
TehRealSalt
20cfe7e4a1
Make the low player count distributions slightly more extreme
...
Scales below 8 players instead of 6 players. The distance multipler in 4P is now x1.14 instead of x1.07.
2018-08-28 23:06:31 -04:00
TehRealSalt
e124604d61
This doesn't work
...
1.) I mixed it up, so opponent win/lose quotes would play globally instead of your own
2.) You can't even play skin-specific sounds globally, so it'd always be Sonic
2018-08-28 22:50:53 -04:00
TehRealSalt
7505fb72a8
Wrong order here
2018-08-28 18:50:59 -04:00
mazmazz
f4e80bb0b0
Fix music fade out when MUSICPOSTBOSS is not specified or doesn't exist
2018-08-28 18:46:30 -04:00
TehRealSalt
9ff5e2d2e2
New voices
...
- Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?)
- Win/lose quotes are played at full volume for the person who said it.
- A new sound effect plays when you hit someone with voices disabled.
- Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions
- Added our skin sound constants to the dehacked list.
- Unrelated: finish line sfx plays in splitscreen
2018-08-28 16:29:50 -04:00
toaster
530983e435
Addons menu.
...
Bitch.
2018-08-28 21:08:47 +01:00
Monster Iestyn
edf9c4ebc5
At toaster's suggestion, have 2p control whether closed captioning is moved up if the powerup display is 1st person only
2018-08-28 20:57:43 +01:00
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
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
