incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
21551 commits 1 branch 0 tags 204 MiB
Commit graph

145 commits

Author SHA1 Message Date
NepDisk
1f6e8f25cd Music Test port from Saturn pt1 
Mostly ported over but its kind of broken for whatever reason...
 2025-03-12 12:36:07 -04:00
NepDisk
28d8f15bfc Merge branch 'v2dev3' into ACS2 2024-11-16 14:27:34 -05:00
hayaunderscore
98f8bd46cd support for legacy v1 musicdefs 2024-11-16 14:22:08 -05:00
Eidolon
d08b923f06 Merge branch 'extern-c-everything' into 'master' 
Add extern "C" in C++ to all headers

See merge request KartKrew/Kart!842
 2024-10-15 14:14:43 -04:00
James R
9e801c66d5 Merge branch 'universal-typedef' into 'master' 
Move all typedef into one file

See merge request KartKrew/Kart!791
 2024-10-15 04:16:58 -04:00
NepDisk
272535fa17 readd back these accidently removed lines and fix crash 2024-09-07 14:46:18 -04:00
Oni
8012a21070 Merge branch 'alt-music' into 'master' 
Alt Music

See merge request KartKrew/Kart!915
 2024-09-07 13:57:13 -04:00
NepDisk
a12f67cbbf Streamer Safe music cvar 2024-09-07 01:39:59 -04:00
Eidolon
957a051692 Add 'contentidunsafe' property to MUSICDEF 
This allows marking music in MUSICDEF as unsafe for Content ID and
other similar content surveillance mechanisms.
 2024-09-07 00:45:24 -04:00
Oni
f6edce1f88 Merge branch 'multi-musicdef' into 'master' 
Multi Musicdef

See merge request KartKrew/Kart!1084
 2024-09-07 00:41:27 -04:00
toaster
4f6ebff439 musicdef_t: Add hash field 
Slight optimisation for S_FindMusicDef, but will net us some big wins with our next feature.
 2024-09-07 00:17:09 -04:00
Oni
110c9e2dc7 Merge branch 'musicdef-update' into 'master' 
First Musicdef changes in preparation for music test

See merge request KartKrew/Kart!812
 2024-09-07 00:14:41 -04:00
Sal
1d8475a958 Merge branch 'hooklib-port' into 'master' 
Hooklib refactor ported and (mostly) squashed

See merge request KartKrew/Kart!662
 2024-07-31 02:30:20 -04:00
NepDisk
9b307973ef Assorted stuff 
Things include brining back kstart music, removing position etc
 2024-07-30 00:13:53 -04:00
toaster
bf6b9c6fed Remove music slot compatibility 
# Conflicts:
#	src/deh_lua.c
#	src/lua_baselib.c
 2022-03-18 13:54:03 +00:00
Sally Coolatta
fcc5c8e0c4 Interpolate music credits 2021-12-25 04:57:35 -05: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
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -04: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
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
68f95f2244 Fix musicdefs 2020-08-10 16:48:40 -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
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
aedc5ae7af Kill MIDI more >:) 2020-08-07 13:00:04 -07:00
James R
9077a4ff03 Kill MIDI 2020-08-07 12:39:08 -07:00
James R
374d032a6b Clean up stuff, make volume work again 2020-08-07 12:29:37 -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
kaysrishaq
9916f468a7 Fix formatting 
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
 2020-07-13 15:16:49 -04:00
James R
3162a203be Merge remote-tracking branch 'pub/master' into wtf 2020-06-03 15:57:09 -07: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
Monster Iestyn
166b06b589 turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file) 
(cherry picked from commit dab212dc56936dd92a935d0c81003ff1d35ee2ee)
 2020-05-15 09:58:28 -07:00
kaysrishaq
828e85b452 Minor reorganization 2020-05-14 07:17:58 -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
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
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
James R
15e8291903 Reset the music fade in cvar pointer too 
This fixes a bug with death fades.
 2020-03-21 22:28:55 -07:00
James R
8524c3749d Fade level music back in after Invincibility and Grow 
Cvars are invincibilitymusicfade and growmusicfade. Both measure milliseconds.
 2020-03-21 22:28:54 -07:00
James R
530cac8673 Hey it's audio- ....resynching... 2020-03-21 22:28:54 -07:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
e620758aa0 Let MUSICDEF set loop point 2020-02-07 12:47:41 -08:00
James R
f2445b27b5 1upsound always plays a sound instead of jingle 2020-01-10 12:55:03 -08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00