Commit graph

245 commits

Author SHA1 Message Date
Steel Titanium
ef1ca357de Expose more music functions to Lua 2020-10-31 21:15:41 -04:00
James R
6363162826 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
ac8def3139 Merge branch 'lua-sectorsounds' into 'next'
Support sectors as sound origins in Lua

See merge request STJr/SRB2!1144
2020-10-08 21:05:01 -04:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
James R
be80ef5365 Apply volume to sounds with origin too
Previously sounds with an origin would always start at max volume. This is
because the distance calculation adjusts the volume, and that volume needs to
be updated every tic as distance changes. Storing the original volume works.

(cherry picked from commit 4ce347c6f2)
2020-09-22 20:47:31 -07:00
Tatsuru
a4c1c6044b Legacy moment 2020-09-13 14:30:02 -03:00
James R
8bef076b83 Merge branch 'audio-cleanup' into 'next'
Audio cleanup

See merge request STJr/SRB2!1101
2020-08-09 20:49:28 -04:00
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
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
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
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
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
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
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
Jaime Passos
48950bbc16 Use strspn here. 2019-12-30 01:39:34 -03:00
Jaime Passos
30696bf981 MUSICDEF parser changes. 2019-12-30 00:22:27 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
mazmazz
728c08d705 Clean up music error messages 2019-11-30 11:53:45 -05:00
Jaime Passos
9178660d34 Fix stuck closed captioning 2019-11-25 20:16:17 -03:00
toaster
056cb494a6 Fix conditionset-based unlocks on the Sound Test. 2019-11-21 13:12:54 +00:00
toaster
763b49e83f Resolve #281. (Might have problems with non-SDL interfaces, but definitely good for what we're shipping with.) 2019-11-14 14:19:13 +00:00
toaster
0999bb7678 Update SFX definition to credit VAdaPEGA specifically, given we've made most credits more specific now too. 2019-11-13 15:02:06 +00:00
MascaraSnake
d648a2ad87 Merge branch 'radiomode' into 'master'
Radio mode

See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
MascaraSnake
8f89ad3b72 Merge branch 'jingle-fixes' into 'master'
Fix some jingle resuming behavior when also changing base level music

See merge request STJr/SRB2Internal!415
2019-11-12 15:41:53 -05:00
toaster
a8169e3844 Sound test is cool now!
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif

* Port MUSICDEFs from Kart.
    * Safe to modify without modifying game, so we can put it in music.dta eventually.
    * "Title", "AltTitle", "Authors" fields are self-evident.
    * "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
    * "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
    * Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
    * Now called "V_DrawStretchyFixedPatch".
    * "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
    * Available to Lua under v.drawStretched!
    * Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.

Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
2019-11-05 16:23:46 +00:00
mazmazz
a23cc44d93 Fix some jingle resuming behavior with boss music switching 2019-10-26 15:02:45 -04:00