James R
f9e74e8ba2
Merge branch 'kill-cd-support' into 'next'
...
Kill CD support
See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
9955ff1357
Merge branch 'kill-dos' into 'next'
...
Remove support for DOS
See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
Steel Titanium
913c07959e
Kill CD support
2020-08-07 17:06:19 -04:00
Steel Titanium
1c588cef63
Remove all this unused playlist related code
2020-08-07 16:44:16 -04:00
Steel Titanium
e302f17bbb
Remove every musserv and sndserv def'd code
2020-08-07 16:40:46 -04:00
James R
0e0015cb44
And remove the limit on S_SetSfxVolume :V
2020-08-07 13:02:35 -07:00
James R
aedc5ae7af
Kill MIDI more >:)
2020-08-07 13:00:04 -07:00
James R
72e225f8c9
Rename digmusicvolume to musicvolume, default soundvolume and musicvolume to 100%
2020-08-07 12:43:59 -07:00
James R
9077a4ff03
Kill MIDI
2020-08-07 12:39:08 -07:00
James R
7adf2159f6
Reduce songs and sounds to 1/4 volume, add a musicdef option for volume
2020-08-06 21:24:41 -07:00
SteelT
9a75d397d6
Merge src/s_sound.c/h
2020-08-06 16:56:41 -04:00
Steel Titanium
d126fe8786
Remove some more DOS related stuff
2020-07-25 19:15:54 -04:00
kaysrishaq
9916f468a7
Fix formatting
...
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
2020-07-13 15:16:49 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
kaysrishaq
de393b2c54
clean whitespace
2020-05-14 07:42:06 -04:00
kaysrishaq
828e85b452
Minor reorganization
2020-05-14 07:17:58 -04:00
kaysrishaq
0d9491d327
Update
...
Worked out some edge cases that had resulted in tracks restarting in the same format when they shouldn't - or tracks not switching to the other format when they should.
Removed stray }
2020-05-14 06:33:03 -04:00
kaysrishaq
f6addb956e
musicpref console variable
...
Adds musicpref to console and sound options menu, which allows users to select whether to prioritize MIDI or Digital music.
Functions GameMIDIMusic_OnChange and GameDigiMusic_OnChange updated to not assume digital music priority, and to have more consistent behavior between the two.
Positive side effect of using P_RestoreMusic in these functions means that powerup music (speed shoes, invincibility) will restore in the correct position when reenabling the original MusicType they loaded in with.
2020-05-13 19:20:21 -04:00
Monster Iestyn
6878220a1b
turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)
2020-05-12 18:40:51 +01:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Alam Ed Arias
ec948af34f
Merge branch 'master' into next
2020-05-06 18:36:20 -04:00
Alam Ed Arias
b46398b06a
fix build errors in public master
2020-05-06 18:35:54 -04:00
James R
a1502046cf
Merge remote-tracking branch 'origin/master' into resume
2020-04-30 09:32:40 -07:00
James R
feceb97df0
C90 moment
2020-04-19 22:08:37 -07:00
James R
dc37cdf2a6
Merge branch 'loop-patch' into 'next'
...
Let MUSICDEF set loop point
See merge request STJr/SRB2!762
2020-04-09 19:47:43 -04:00
Wolfy
1d1b1514b4
Remove stupid dumbfuck #ifdefs
...
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
2020-04-07 05:24:38 -05:00
James R
7e0aa16e70
Reset Invincibility (and Grow) music to the start if stacked
...
Toggleable via the resetspecialmusic cvar.
2020-03-21 22:28:55 -07:00
James R
dd1715aa15
Optionally only resync Invincibility and Grow music
2020-03-21 22:28:55 -07:00
James R
f6888ab004
Reset mapmusresume on level load etc.
...
This is probably important, right?
2020-03-21 22:28:55 -07:00
James R
911dd57334
Restore level music to where it left off
...
Toggleable via the resume cvar.
2020-03-21 22:28:55 -07:00
James R
8524c3749d
Fade level music back in after Invincibility and Grow
...
Cvars are invincibilitymusicfade and growmusicfade. Both measure milliseconds.
2020-03-21 22:28:54 -07:00
James R
04d7112538
Limit music resync threshold to one second
2020-03-21 22:28:54 -07:00
James R
530cac8673
Hey it's audio- ....resynching...
2020-03-21 22:28:54 -07:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
fickleheart
7bf9bc4b9e
Merge remote-tracking branch 'upstream/next' into lua-music
2020-03-18 22:43:07 -05:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
fickleheart
5aebc0ed6d
Add JingleStatus hook for carrying custom jingle tunes
...
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
2020-02-23 17:20:44 -06:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
James R
a25dd93500
Don't override loop point if unset in MUSICDEF
2020-02-07 12:51:54 -08:00
James R
e620758aa0
Let MUSICDEF set loop point
2020-02-07 12:47:41 -08:00
James R
c26ed0db5a
Remove unnecessary optimization
2020-01-20 15:36:27 -08:00
James R
0fdbc9498f
Opt into new MUSICDEF format (2.2.0 compatibility)
...
The "VERSION" directive enables features available in a certain version of
SRB2. It may be used as "VERSION 2.2.0".
2020-01-18 23:12:30 -08:00
James R
9aa551cc2b
Refactor MUSICDEF parsing, actually count lines
...
If you use strtok for (CR)LF, it'll skip the empty lines bruh.
2020-01-18 22:17:47 -08:00
Alam Ed Arias
2ce99b7914
Merge remote-tracking branch 'origin/next' into next
2020-01-16 20:17:58 -05:00
James R
2edd207624
Merge branch 'musicdef' into 'next'
...
MUSICDEF parser changes.
See merge request STJr/SRB2!599
2020-01-16 19:35:38 -05:00
Alam Ed Arias
45139da3b5
please stop breaking clang
2020-01-16 12:05:21 -05:00
James R
f2445b27b5
1upsound always plays a sound instead of jingle
2020-01-10 12:55:03 -08:00
James R
cdadd86780
Fix NOOPENMPT compiling
2019-12-30 19:19:17 -08:00
Jaime Passos
e266073014
Some cleanup in general.
2019-12-30 02:07:39 -03:00
