17 commits

Author	SHA1	Message	Date
mazmazz	b7bb570f97	Merge remote-tracking branch 'public-gl/master' into public-musicplus-core	2019-01-01 10:41:40 -05:00
TehRealSalt	9e596d15af	Save override for level header ... Kind of like 2.2's, but with backwards-compatability with 2.1	2018-12-16 20:09:59 -05:00
Monster Iestyn	33c1ac33f5	Merge branch 'next' into 21-version ... # Conflicts: # src/d_netcmd.c	2018-12-02 15:45:07 +00:00
Wolfy	b59718d3ad	Remove hardcoded limit on admins ... # Conflicts: # src/d_netcmd.c	2018-11-29 07:05:49 -06:00
Wolfy	b8ce51bff2	Multiple admins ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h	2018-11-29 06:46:59 -06:00
mazmazz	ea7162a76a	Update source copyrights to 2018	2018-11-25 07:35:38 -05:00
mazmazz	a288b95458	Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup	2018-10-19 22:04:26 -04:00
Monster Iestyn	a4419abfdc	debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else	2018-10-11 19:59:09 +01:00
mazmazz	c5ea6b5efe	MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport	2018-09-18 10:22:17 -04:00
mazmazz	a414ccf24a	nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled ... (cherry picked from commit 07738fb0bc)	2018-09-14 10:35:51 -04:00
Inuyasha	f07585191b	copyright dates/statements updated and such ... (no actual SLOC changes)	2016-05-17 17:42:11 -07:00
Inuyasha	8c17dac589	The concept of "music slots" doesn't exist anymore. ... Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore. DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested. (cherry picked from commit 025ca413a2) # Conflicts: # src/p_user.c	2016-02-09 02:48:33 -08:00
Alam Ed Arias	73b3287b19	SRB2 2.1.14 release	2015-01-01 14:50:31 -05:00
Alam Ed Arias	404b5f666c	SRB2 2.1.12 release	2014-11-11 19:55:07 -05:00
Alam Ed Arias	c028c83235	SRB2 2.1.9 release	2014-08-03 23:49:33 -04:00
Alam Ed Arias	ed72bd8fa1	SRB2 2.1.4 release	2014-03-21 19:21:06 +00:00
Alam Ed Arias	b93cb1b65a	SRB2 2.1 release	2014-03-15 13:11:35 -04:00