stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-17 08:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
4365 commits 175 branches 41 tags 272 MiB
Commit graph

4365 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
eae5d3333f Stub I_UnloadSong because we already unload in I_StopMusic 
* Stop-gap for now. Ideally the logic would be in the respective places.

# Conflicts:
#	src/sdl/mixer_sound.c
 2018-08-24 18:02:46 -04:00
mazmazz
d39b7011c5 Volume fixes 
# Conflicts:
#	src/sdl/mixer_sound.c
 2018-08-24 18:01:57 -04:00
mazmazz
9d0d101d03 I_SongPlaying detect GME properly 2018-08-24 18:00:39 -04:00
mazmazz
4d91b44c63 Detect GME more simply 2018-08-24 17:58:56 -04:00
mazmazz
bd01c75a4e Stub I_UnloadSong because we already unload in I_StopMusic 
* Stop-gap for now. Ideally the logic would be in the respective places.
 2018-08-24 17:56:22 -04:00
mazmazz
a688de5dc2 Volume fixes 2018-08-24 17:56:14 -04:00
mazmazz
fb6f8c8a07 A word 2018-08-24 13:41:26 -04:00
mazmazz
df455fc638 Merge branch 'music-cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into music-cleanup 2018-08-24 13:36:07 -04:00
mazmazz
5f21bf230d GME fix: play song in I_PlaySong, not I_LoadSong 2018-08-24 13:35:41 -04:00
mazmazz
bf4e7d2dd6 Lua S_MusicInfo fix and FMOD GME fix: play song in I_PlaySong, not I_LoadSong 2018-08-24 13:12:14 -04:00
mazmazz
bf61dbb6e2 Checkpoint: Revised fading routines for new load/play pattern 
* Perform fade-out/fade-in using callbacks
* Move queued music from interface to s_sound
 2018-08-24 13:11:38 -04:00
mazmazz
b5ef4e04d8 Lua method reordering for Musicplus 
* Change to S_MusicName to S_MusicInfo for API
 2018-08-23 21:23:55 -04:00
mazmazz
a2d626384a Merge branch 'music-cleanup' into musicplus-core 
Pending rewrite of fade music changing

# Conflicts:
#	src/android/i_sound.c
#	src/djgppdos/i_sound.c
#	src/i_sound.h
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/mixer_sound.c
#	src/sdl/sdl_sound.c
#	src/win32/win_snd.c
 2018-08-23 21:07:39 -04:00
mazmazz
9e6eebeb8d Refactor I_MusicType MusicPlaying and MusicPaused other targets 2018-08-23 20:23:16 -04:00
mazmazz
4b82de9e54 Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ... 2018-08-23 20:14:46 -04:00
Monster Iestyn
aee7dce891 Rewrite seenames HUD code even more; use text color flags rather than the special text color chars 2018-08-23 23:00:15 +01:00
mazmazz
cf065e106f Refactoring and reordering other targets 2018-08-23 17:54:40 -04:00
Monster Iestyn
011459790f Add INFLIVES as a constant that Lua/SOC can use 2018-08-23 22:18:52 +01:00
Monster Iestyn
e2c280504b Make switch case for cv_seenames.value in ST_Drawer 2018-08-23 22:09:48 +01:00
mazmazz
a7d51bf810 Minor refactoring and reordering 
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
 2018-08-23 17:05:37 -04:00
Monster Iestyn
6a88a65b94 Add quick macro for drawing the 1st person timer icons with timer string, add comments to ST_drawPowerupHUD 2018-08-23 22:00:37 +01:00
mazmazz
f6ec93198f Play the opposite type music (Digital/MIDI) when toggling between them in menu 
* S_MusicInfo method to retrieve name, flags, and looping
 2018-08-23 16:46:40 -04:00
Monster Iestyn
0948b12eae ST_drawNiGHTSHUD tweaks: Split NiGHTS link drawing into its own function, remove "minlink" hack and just do things properly 2018-08-23 21:13:45 +01:00
Monster Iestyn
d2a4408610 Make switch case for stplyr->textvar in ST_drawNightsRecords 2018-08-23 20:27:40 +01:00
Monster Iestyn
aa863e481e Add INFLIVES macro, to make it easier to find infinite lives-related code 2018-08-23 20:09:39 +01:00
mazmazz
4aa100aa57 Toggle Digi/MIDI music in menu accurately; add S_MusicType 2018-08-23 13:09:20 -04:00
mazmazz
86f151db65 nodigimusic nomusic nosound refactor other targets 2018-08-23 12:43:38 -04:00
mazmazz
07738fb0bc nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled 2018-08-23 12:42:57 -04:00
mazmazz
d5ec388159 I_MusicPlaying, I_MusicPaused other targets 2018-08-23 12:31:01 -04:00
mazmazz
f5f0b5e76c Refactoring, music statues 
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
 2018-08-23 12:30:47 -04:00
mazmazz
9fb9386f84 Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets 2018-08-23 11:54:58 -04:00
mazmazz
701cc5a7dd Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method 
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering
 2018-08-23 11:54:36 -04:00
mazmazz
14b393ab16 Added I_GetMusicType and removed midimode variable: other targets 2018-08-23 10:19:04 -04:00
mazmazz
55f3803e4b Added I_GetMusicType and removed midimode variable 
* Revised S_PlayMusic arguments
* Now music plays again!
 2018-08-23 10:18:38 -04:00
mazmazz
9a5fc5f66a Loose ends other targets 2018-08-23 09:37:02 -04:00
mazmazz
e89eccf78e Loose ends from previous work 
* Pause/ResumeSong remove handle argument
* LoadSong declare char *data argument
* Variable weirdness
 2018-08-23 09:36:51 -04:00
mazmazz
3ec1a122e0 Revert "Nix'd midimusicvolume other targets" 
This reverts commit 58fbb4636f.

# Conflicts:
#	src/android/i_sound.c
#	src/dummy/i_sound.c
#	src/win32/win_snd.c
 2018-08-23 09:09:12 -04:00
mazmazz
75cbfab8c6 Playback routines other targets 2018-08-23 09:06:31 -04:00
mazmazz
7efab8b314 Revert "Nix'd midimusicvolume", don't know what I want to do with this yet 
This reverts commit b5c3095820.

# Conflicts:
#	src/i_sound.h
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/mixer_sound.c
 2018-08-23 09:06:13 -04:00
mazmazz
e42defa299 Playback routines: Load, Play, Pause, Stop, Unload 
* Re-purpose I_LoadSong for digital music loading
* I_StartDigSong logic split between I_LoadSong and I_PlaySong
* Pause, Stop, and Unload routines are combined from Digi and MIDI
* music_lumpnum, music_data, music_handle from s_sound.c are gone
 2018-08-23 09:02:14 -04:00
mazmazz
0bc9576eb0 Revert "CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong" 
This reverts commit 8b46bce155.
 2018-08-23 07:50:02 -04:00
mazmazz
8b46bce155 CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong 
* music_lumpnum, music_data, music_handle are gone
* Relevant interfaces I_PlaySong are transferred to I_StartDigSong
 2018-08-23 07:49:09 -04:00
mazmazz
58fbb4636f Nix'd midimusicvolume other targets 2018-08-23 07:39:45 -04:00
mazmazz
b5c3095820 Nix'd midimusicvolume 2018-08-23 07:39:32 -04:00
Monster Iestyn
32bcf11cda Merge branch 'cez-bramble-hardcode' into 'master' 
CEZ Bramble Hardcode

See merge request STJr/SRB2Internal!169
 2018-08-22 14:47:04 -04:00
Monster Iestyn
f8c4c6dbc4 Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125 2018-08-22 17:16:11 +01:00
mazmazz
720a1212ae Update SDL Windows dependency to 2.0.8 
* To do: Update Visual Studio .lib files
 2018-08-22 11:39:29 -04:00
mazmazz
7d64c3114c SDL Mixer X compile on Windows x86 2018-08-22 00:17:25 -04:00
mazmazz
3829998889 Initial work on SDL Mixer X 2018-08-21 14:57:53 -04:00
mazmazz
76f9890328 Position fixes with looppoint 2018-08-21 11:58:38 -04:00