95e7e59179
Remove stupid dumbfuck #ifdefs
...
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
2020-04-07 05:24:38 -05:00
18c8f47f9a
fix rewind, fix sound local sound playing in freecam
2019-09-09 22:15:50 +02:00
f61f7f4411
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
2c363c4e1e
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
201466b1c1
Merge v1
2019-05-02 01:36:19 -04:00
387a701db5
Add a "-noaudio" parm to cover "-nomusic" and "-nosound"
2019-04-18 23:50:29 -07:00
a187656a8f
Fix up more stuff
...
Now in a mergable state
2019-04-18 12:20:13 -04:00
1f61397545
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
6267986c72
Add demo rewinding
...
Preview is fairly basic, and only shows players
rewinding. Full state is restored via reloading
the replay and jumping to the timestamp once
the rewind is done.
2019-04-06 14:51:00 -05:00
4b7d2aea84
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fdde5f13c5
When resetting volume on same music, make it fade instead of a hard change
2019-03-13 23:55:30 -04:00
67e2857303
When changing to same music, reset the internal volume
2019-03-13 23:41:35 -04:00
1975a9b885
Prevent music changes from playing when unfocused
2019-03-11 21:48:29 -05:00
0f9648eac0
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
37e79ebfbd
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
2ccdd3e4b7
Fix Music toggle trying to play a non-existent song in Kart
2019-01-09 21:13:06 -05:00
de72403fb9
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
3e37d131ed
Minor touchups/cleanup
2019-01-04 16:47:03 -05:00
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
2422501ab9
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
46571fbda2
Fixes to merge process
2018-11-29 10:07:35 -05:00
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
ba111d42ca
Last minute changes.
2018-11-26 00:24:11 -05:00
cf01e820c4
Take the command line params into account
...
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
7d4c9dda91
Add newline to end of file
2018-11-25 14:24:50 -05:00
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
e5fef95d94
Sound volume distance indication now scales with mapheader scale.
2018-11-25 13:30:43 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
1ab5ac58a7
Title demos don't interrupt the music
2018-11-13 21:01:59 -05:00
d0f21ca415
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
93ab9850a3
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
...
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
6af56273bf
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
499faec555
Merge remote-tracking branch 'srb2public/next'
...
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
f8d87c8f08
Preface with splitscreen checks
2018-10-29 05:26:17 -04:00
146c8b228b
- Reduce volume reduction
...
- Don't apply to sounds without an origin mobj
2018-10-25 22:53:58 -04:00
5ff1817c34
Divide sound volume by number of local players
2018-10-23 20:53:05 -04:00
cc0d1db9d8
Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup
2018-10-19 23:56:56 -04:00
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
bcc1911672
Merge branch 'nextmerge_plus_rain' into 'master'
...
Next-merge plus rain
See merge request KartKrew/Kart!41
2018-10-16 16:36:18 -04:00
a919260fd2
Default sound channels
...
Now that we figured out that the sound cut-outs were due to a race condition and not this option, I feel content putting it with these other engine tweaks.
2018-10-16 13:26:03 -04:00
5701fe8a51
Give engines SF_TOTALLYSINGLE, and bug-fix it so that it can work like a flag
...
Sryder's request
2018-10-16 12:30:47 -04:00
a1e1aa81b5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
6184f91dd3
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
450b536147
Remove the condition in restartaudio command.
...
No longer needed as S_RegisterSoundStuff will return early if in
dedicated mode.
2018-10-11 20:11:37 -04:00
b3faed190b
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
2644180b7e
MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)
2018-09-19 19:46:57 -04:00
164be3056f
MP Core s_sound: Mixed D+C fix (buildbots)
2018-09-19 19:19:18 -04:00
c5ea6b5efe
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
Wolfy