lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11925 commits 1 branch 29 tags 122 MiB
Commit graph

93 commits

Author SHA1 Message Date
James R de9d1d2b35 Forgot to commit s_sound.h 2020-09-22 20:51:01 -07: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
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
kaysrishaq f541c37ebc Fix formatting 
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
 2020-07-13 15:16:49 -04:00
kaysrishaq c2a54acae3 Minor reorganization 2020-05-14 07:17:58 -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
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
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R c4ee113c71 Let MUSICDEF set loop point 2020-02-07 12:47:41 -08:00
James R 1113a13621 1upsound always plays a sound instead of jingle 2020-01-10 12:55:03 -08:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Jaime Passos 67d0499903 Fix stuck closed captioning 2019-11-25 20:16:17 -03:00
MascaraSnake d591554a5d Merge branch 'radiomode' into 'master' 
Radio mode

See merge request STJr/SRB2Internal!443
 2019-11-13 04:16:38 -05:00
toaster 0a4d0ecc5c Better comments for musicdef struct 2019-11-05 19:50:49 +00:00
toaster 5f8671b100 Sound test is cool now! 
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif

* Port MUSICDEFs from Kart.
    * Safe to modify without modifying game, so we can put it in music.dta eventually.
    * "Title", "AltTitle", "Authors" fields are self-evident.
    * "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
    * "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
    * Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
    * Now called "V_DrawStretchyFixedPatch".
    * "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
    * Available to Lua under v.drawStretched!
    * Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.

Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
 2019-11-05 16:23:46 +00:00
mazmazz 91eb380412 Fix some jingle resuming behavior with boss music switching 2019-10-26 15:02:45 -04:00
James R cd252eb468 Console variables to toggle music/sound playing when the window is unfocused 
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
 2019-10-23 17:21:09 -07:00
mazmazz 46993268ae * Added FORCERESETMUSIC level header 
* cv_resetmusicbyheader toggle to disable said override
* Never reset music during time attack
* Change cv_resetmusic default back to off
 2019-08-04 20:02:38 -04:00
toaster 384dc0674e Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit 603d5805f7.
 2019-08-04 12:03:57 +01:00
toaster 603d5805f7 Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
 2019-08-04 11:32:55 +01:00
mazmazz bddafbeece Merge branch 'internal-musicplus-jingle' into musicplus-aug2019 2019-08-04 02:41:37 -04:00
mazmazz 81d0840301 Jingle resume: Don't set music position when music is replaced 2019-08-04 00:56:17 -04:00
mazmazz 5b0f7d2850 Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -04:00
mazmazz 923dc34215 Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle 2019-06-29 18:33:45 -04:00
Steel Titanium 58bb05be00 Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt 
# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props
 2019-06-11 17:48:00 -04:00
Steel Titanium bf3d5f4188 circleci: Fix compiling error 2019-05-20 23:22:23 -04:00
mazmazz 8317155c40 Merge branch 'public-gl-next' into public-musicplus-jingle 2019-03-15 18:42:19 -04:00
mazmazz 9ec98c588f Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
Steel Titanium 7d1e59d4ba Some few changes 2019-01-05 23:42:25 -05:00
mazmazz 6166fad045 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:14:49 -05:00
mazmazz 075f28b7c8 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz b7bb570f97 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
Steel Titanium 981a1192fb Save sound toggles to config 2018-11-25 14:22:52 -05:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz f2bfed7892 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-11-13 14:34:40 -05:00
mazmazz 8f87bf82cd Merge branch 'master' into musicplus-core 2018-11-13 13:46:30 -05:00
Monster Iestyn 268bde3fdf Merge branch 'public_next' 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/g_game.h
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_hudlib.c
#	src/lua_libs.h
#	src/lua_maplib.c
#	src/lua_script.c
#	src/m_misc.h
#	src/p_mobj.c
#	src/s_sound.c
#	src/sdl12/mixer_sound.c
#	src/w_wad.c
 2018-11-10 15:41:57 +00:00
Steel Titanium 87d3552ff9 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into music-clean 2018-10-20 14:00:12 -04:00
Monster Iestyn b5c4b476a6 Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/m_menu.c
#	src/s_sound.c
#	src/sdl/sdl_sound.c
 2018-10-20 15:31:48 +01:00
Steel Titanium b3faed190b Move commands and console variable into s_sound.c 2018-10-11 16:29:43 -04:00
mazmazz 78c1b99cd4 MP Jingle: Changed music_stacks from fixed array to next/prev chain 2018-09-20 17:13:52 -04:00
mazmazz c60d61a493 musicplus-jingle 2.2 -> 2.1 backport 2018-09-18 15:10:00 -04:00
mazmazz 4d89beb105 musicplus-libopenmpt 2.2 -> 2.1 backport 2018-09-18 12:31:47 -04:00
mazmazz c5ea6b5efe MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz 48445c7733 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-16 23:18:11 -04:00
mazmazz d7f4c9be84 S_ChangeMusicAdvanced -> S_ChangeMusicEx 2018-09-16 23:10:23 -04:00
mazmazz 8c78d86c36 Play the opposite type music (Digital/MIDI) when toggling between them in menu 
* S_MusicInfo method to retrieve name, flags, and looping

(cherry picked from commit f6ec93198f)
 2018-09-14 10:38:32 -04:00