Commit graph

470 commits

Author SHA1 Message Date
Sally Coolatta
107622968e Merge branch 'master' into new-menus 2022-08-27 22:36:58 -04:00
toaster
37f8b0e717 NUMSFX > sfxfree for PlaySound 2022-08-24 22:28:02 +01:00
Sally Coolatta
f571e559d4 Playsound command
For scripted global sound cues for the entire server.
2022-08-24 21:02:37 +01:00
James R
7e9dcffdf7 Do not play invalid sfx 2022-06-07 20:54:10 -07:00
toaster
9de7f2393b Turning music back on while on the menu turns the menu music on, not the title music. 2022-05-25 20:13:14 +01:00
toaster
2b2ba53e93 Minor refactor: Handle *sep entirely within S_AdjustSoundParams, instead of having a component partly outside. 2022-04-18 17:13:27 +01:00
toaster
dfbff49a52 Delete accidentially-committed whitespace 2022-04-17 23:50:43 +01:00
toaster
440203ff89 Resolve #233 - Sounds with non-NULL sources now work when two or more players are near the sound origin. 2022-04-17 23:22:48 +01:00
toaster
bf6b9c6fed Remove music slot compatibility
# Conflicts:
#	src/deh_lua.c
#	src/lua_baselib.c
2022-03-18 13:54:03 +00:00
toaster
c1f3237157 Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now 2022-02-24 21:19:03 +00:00
James R
9095261a18 POSITION music
Play SA2 "shwing" at title card; play POSITION music once
camera is steady (instantly in 1v1).

Encore: play portal warp sound instead of "shwing"; play
portal drone instead of POSITION music, always start
instantly.
2022-02-15 15:51:47 -08:00
James R
f749424de7 Turn kstart into sfx 2022-02-14 15:04:30 -08:00
Sally Coolatta
fcc5c8e0c4 Interpolate music credits 2021-12-25 04:57:35 -05:00
James R
170d0a2fb9 Toaster suggestions for e82bba18 2021-11-25 13:43:17 -08:00
James R
e82bba18f6 Use volume field of sound, access with SOC/lua
Volumes may be defined on a 0-100 scale, but any number is
accepted.

If the volume is negative then the sound will play at
normal volume (therefore the info table won't need to be
modified.)
2021-11-08 18:50:19 -08:00
toaster
303df77b68 Unassigned variable fix (probably going to rip out the closed caption system out of Kart at some point, but this is good for now). 2021-10-17 22:11:30 +01:00
Sryder
710abf6820 Fix sound crash, let a sound be played for multiple players again too.
S_getChannel now doesn't do any alterations to the channel, it *only* returns the number of the free channel.
2021-04-27 21:27:42 +01:00
Sally Coolatta
0f14f0cec1 Only check for listenmobj for the splitscreen players
Steel's comment is what hinted me to compare the code again -- P1 was the only one who didn't care about their listenmobj existing first.
2021-04-26 04:09:23 -04:00
Sally Coolatta
8958ebd293 Sound refactor
- Fix splitscreen volume being too low after james volume fix
- Use loops instead of horrid code duplication

Unfortunately seems to break sounds in menus and I dunno what to look at 😔
2021-04-23 17:38:38 -04:00
Sally Coolatta
de1f67b72a Use strings in the map header for next level, marathon next, thumbnails, minimaps, encoremaps, and tweakmaps 2021-04-09 21:10:46 -04:00
Sally Coolatta
359cf86efb Merge branch 'master' into big-large-map-markers 2021-04-09 19:49:33 -04:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
LJ Sonic
85cd429d1d Revert "Replace all instances of P_AproxDistance with FixedHypot"
This reverts commit 498ff708bb.
2021-02-13 17:45:20 +01:00
SteelT
29b5f38347 Merge branch 'master' into big-large-map-markers
# Conflicts:
#	src/d_netcmd.c
2021-01-09 15:52:34 -05:00
James R
498ff708bb Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
887f4a0919 Merge branch 'master' into next 2020-12-12 02:38:51 -08:00
James R
19af2b9afe Remove trailing whitespace 2020-12-12 02:37:03 -08:00
Sally Coolatta
fc934b38e1 Merge public next 2020-11-10 15:32:48 -05:00
James R
8f68a21f2f Fix many instances of G_BuildMapName
Some things are gonna be busted. Fix it later, BYE.
2020-10-31 20:17:12 -07:00
Steel Titanium
ef1ca357de Expose more music functions to Lua 2020-10-31 21:15:41 -04:00
James R
37c345c7eb Map lump names can be anything, map number is dynamically allocated 2020-10-30 20:10:31 -07:00
James R
d896fee2e5 Load multiple musicdef lumps from a single wad 2020-10-27 15:45:10 -07:00
James R
e7051737d7 Use 2.2's musicdef parser 2020-10-27 15:00:31 -07:00
James R
65cc5f52f2 Fix doubling the volume 2020-10-26 04:23:29 -07:00
Sally Coolatta
afbbfc9b1f Fix cvars
My wrist burns...
2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -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
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