9 commits

Author	SHA1	Message	Date
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	5b0f7d2850	Merge branch 'master' into musicplus-sdlmixerx	2019-06-29 19:31:01 -04: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	6c78af3542	Missed (unused?) viewpoint strings	2018-12-03 12:20:19 -05:00
mazmazz	60b16289e5	Change spectator string for "Press F12 to watch"	2018-12-03 12:11:03 -05: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
toasterbabe	c5f6ae8aaa	Fixed forceskin to not always allow due to bad logic.	2016-07-14 13:24:57 +01:00
Alam Ed Arias	b93cb1b65a	SRB2 2.1 release	2014-03-15 13:11:35 -04:00