15 commits

Author	SHA1	Message	Date
TehRealSalt	c7b0df8172	Merge remote-tracking branch 'srb2public/next' ... (Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)	2018-11-07 16:15:14 -05:00
mazmazz	5a4e6cf924	Loose ends other targets ... (cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)	2018-09-14 09:41:08 -04:00
TehRealSalt	7e9bcf5a49	Merge remote-tracking branch 'refs/remotes/srb2public/master'	2018-01-02 22:59:43 -05:00
Alam Ed Arias	f1968e5145	Disable win_dbg	2017-12-26 20:24:08 -05:00
Alam Ed Arias	faf88cf2e5	TCP: remove BADSOCKET	2017-12-26 19:56:50 -05:00
TehRealSalt	5fe2f4928f	Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu ... # Conflicts: # src/doomdef.h # src/sdl/i_main.c # src/sdl/i_video.c # src/y_inter.c	2017-10-17 15:53:34 -04:00
Alam Ed Arias	108b0c2732	Merge branch 'master' into disable_gettext	2017-03-29 16:56:44 -04:00
Sryder	68d439a783	Merge branch 'upstream/next' into zarrotsu_vanillamerge ... # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c	2017-02-17 20:14:55 +00:00
ZTsukei	b0b51f9a61	Some position code	2017-02-12 23:25:06 -05:00
Alam Ed Arias	628d1c4dab	DD: Mingw 3.4.5 build fix	2017-01-16 16:40:16 -05:00
Alam Ed Arias	55925cabe8	win32: fixup printf warnings	2017-01-08 14:06:30 -05:00
ZTsukei	e4a970f894	Starting from scratch. SRB2 v2.1.15	2016-07-06 00:10:19 -04:00
Alam Ed Arias	f21c72b889	debug: always load exchndl.dll	2016-05-31 21:30:18 -04:00
Alam Ed Arias	57091261d9	MSVC: fixed up MSVC project	2016-05-21 23:53:04 -04:00
Alam Ed Arias	b93cb1b65a	SRB2 2.1 release	2014-03-15 13:11:35 -04:00