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
70eec29992
Mute music instead of pausing if lose focus
2020-09-28 11:58:24 -07:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
922f6aa9f8
Scale volume cvars by half, 200% max and 50% default
2020-09-25 02:23:44 -07:00
James R
c9e3281b99
Merge remote-tracking branch 'origin/master' into tinnitus
2020-09-25 01:57:08 -07:00
SteelT
9a0ab0759b
Fix music credits not being shown on level music start
...
By pretty much restoring the old musicdef system, I tried to work with it but couldn't, if needed that can easily be brought back later on.
2020-09-24 15:55:37 -04: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
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
Tatsuru
a4c1c6044b
Legacy moment
2020-09-13 14:30:02 -03:00
James R
4ce347c6f2
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.
2020-09-08 22:40:42 -07:00
SteelT
ba15c7caf3
Don't let a missing music lump cause an I_Error()
...
Fix midi lump checking being broken
2020-08-18 15:10:56 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Sally Coolatta
7d095060cf
Makes it past s_sound.o and sounds.o
2020-08-15 02:15:08 -04:00
Sally Coolatta
9b9ab8a2d5
Get up to p_user
2020-08-14 23:23:14 -04:00
Sally Coolatta
5a6263c36b
Make it past p_mobj
2020-08-14 20:48:06 -04:00
Sally Coolatta
8731c6b7a4
Another round of fixing up
...
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
SteelT
84a4c7ba62
Fix some more ifdefs
2020-08-10 18:57:58 -04:00
Sally Coolatta
9e7ed8f649
Merge s_sound.c/h
2020-08-10 15:09:24 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04: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
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
