James R
143ec3e40b
Merge branch 'master' into next
2020-12-12 02:38:51 -08:00
James R
b31c4db89d
Remove trailing whitespace
2020-12-12 02:37:03 -08:00
Steel Titanium
ac7781a3b3
Expose more music functions to Lua
2020-10-31 21:15:41 -04:00
James R
15008f31a7
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
c3c34c489b
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
dbd79a29a4
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
James R
b18d60c1d3
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 22177753d2f00d58d19d930f51dcd086097dfd0d)
2020-09-22 20:47:31 -07:00
Tatsuru
8d65ce81c7
Legacy moment
2020-09-13 14:30:02 -03:00
James R
85d0199661
Merge branch 'audio-cleanup' into 'next'
...
Audio cleanup
See merge request STJr/SRB2!1101
2020-08-09 20:49:28 -04:00
James R
a808294c0c
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
5153338bf5
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
dff0e87e03
Kill CD support
2020-08-07 17:06:19 -04:00
Steel Titanium
2d39af8604
Remove all this unused playlist related code
2020-08-07 16:44:16 -04:00
Steel Titanium
5c53157192
Remove every musserv and sndserv def'd code
2020-08-07 16:40:46 -04:00
Steel Titanium
492ca3cea3
Remove some more DOS related stuff
2020-07-25 19:15:54 -04:00
kaysrishaq
f541c37ebc
Fix formatting
...
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
2020-07-13 15:16:49 -04:00
kaysrishaq
70896f9095
clean whitespace
2020-05-14 07:42:06 -04:00
kaysrishaq
c2a54acae3
Minor reorganization
2020-05-14 07:17:58 -04:00
kaysrishaq
fd31c5cd5e
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
7f7ccc9911
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
dab212dc56
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
24df9f032f
Merge branch 'master' into next
2020-05-06 18:36:20 -04:00
Alam Ed Arias
38232ce07e
fix build errors in public master
2020-05-06 18:35:54 -04:00
James R
e100f21dda
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
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
fickleheart
05b2570ae7
Merge remote-tracking branch 'upstream/next' into lua-music
2020-03-18 22:43:07 -05:00
Monster Iestyn
f4cb6e1f5e
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
f2c968dea8
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
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
James R
3d00596c6a
Don't override loop point if unset in MUSICDEF
2020-02-07 12:51:54 -08:00
James R
c4ee113c71
Let MUSICDEF set loop point
2020-02-07 12:47:41 -08:00
James R
2d8ea7125c
Remove unnecessary optimization
2020-01-20 15:36:27 -08:00
James R
9dbc54284e
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
1317dba3e4
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
d9742afb45
Merge remote-tracking branch 'origin/next' into next
2020-01-16 20:17:58 -05:00
James R
1f36bde25f
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
0134be8b78
please stop breaking clang
2020-01-16 12:05:21 -05:00
James R
1113a13621
1upsound always plays a sound instead of jingle
2020-01-10 12:55:03 -08:00
James R
4bf3597116
Fix NOOPENMPT compiling
2019-12-30 19:19:17 -08:00
Jaime Passos
757480f219
Some cleanup in general.
2019-12-30 02:07:39 -03:00
Jaime Passos
c303b1a435
Use strspn here.
2019-12-30 01:39:34 -03:00
Jaime Passos
773d564d6a
MUSICDEF parser changes.
2019-12-30 00:22:27 -03:00
Steel Titanium
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
mazmazz
be44f0701e
Clean up music error messages
2019-11-30 11:53:45 -05:00
Jaime Passos
67d0499903
Fix stuck closed captioning
2019-11-25 20:16:17 -03:00
toaster
7c7eec4b9a
Fix conditionset-based unlocks on the Sound Test.
2019-11-21 13:12:54 +00:00
toaster
261041dc69
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
a7f2931b47
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
d591554a5d
Merge branch 'radiomode' into 'master'
...
Radio mode
See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
MascaraSnake
17013bf1b7
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
