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
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