266 commits

Author	SHA1	Message	Date
Jaime Passos	94ab276508	Merge remote-tracking branch 'origin/master' into f_wipes	2019-10-28 23:14:00 -03:00
Jaime Passos	a22af36305	add r_patch.c	2019-10-28 15:28:42 -03:00
Jaime Passos	7746767735	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c	2019-10-06 17:40:41 -03:00
Jaime Passos	fe60902df5	Merge remote-tracking branch 'origin/master' into renderswitch	2019-09-27 22:53:57 -03:00
Jaime Passos	5f6c702ed6	sky barreling	2019-09-17 23:38:04 -03:00
Alam Ed Arias	35e3d9acab	Revert "Merge branch 'gl_skydome' into 'master'" ... This reverts merge request !326	2019-09-17 20:20:09 +00:00
Jaime Passos	db979845e0	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c	2019-09-15 16:24:24 -03:00
Steel Titanium	00d64c380d	Merge branch 'newicon' into 'master' ... New EXE icon See merge request STJr/SRB2Internal!265	2019-09-12 14:05:32 -04:00
Jaime Passos	fec579db8c	Merge remote-tracking branch 'origin/master' into gl_skydome	2019-09-10 19:20:20 -03:00
Jaime Passos	8057eeaaca	Merge remote-tracking branch 'jimita/renderswitch' into renderswitch	2019-09-10 18:12:01 -03:00
Jaime Passos	f0788598c9	Better fades	2019-09-09 23:31:48 -03:00
Alam Ed Arias	9d64ee88a0	Be clear on what FALLTHRU we really want	2019-09-09 15:02:13 -04:00
Jaime Passos	dc93cafda9	can i push this already?	2019-09-08 22:25:18 -03:00
Jaime Passos	c7e01a558e	initial stuff	2019-09-08 18:44:40 -03:00
Jaime Passos	2863ede7bf	initial stuff	2019-09-08 18:27:35 -03:00
Jaime Passos	f6d2b5109b	PRBoom sky dome	2019-09-03 02:12:17 -03:00
Jaime Passos	d99026df3b	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b	2019-09-02 20:27:50 -03:00
Alam Ed Arias	92a954609d	Merge branch 'public_next' into private	2019-08-08 23:41:19 -04:00
Alam Ed Arias	5a79a446df	Tested to be compile with Mingw64 9.1.0	2019-08-08 21:25:46 -04:00
Alam Ed Arias	07f89fd6b5	Makefile: stop building with DWARF v2 debugging info	2019-08-08 18:43:42 -04:00
mazmazz	84c9633579	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b	2019-08-04 21:33:13 -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	b99f06c0c9	Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx	2019-08-04 01:10:21 -04:00
mazmazz	dd9efebab5	Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle	2019-08-03 23:38:49 -04:00
Steel Titanium	c93fb440e5	use VERSIONSTRING	2019-07-30 20:56:03 -04:00
Alam Ed Arias	ed0754382f	Merge remote-tracking branch 'private/master' into newicon	2019-07-29 19:04:19 -04:00
Alam Ed Arias	b77780e1e7	Fix building with MSVC	2019-07-29 19:02:45 -04:00
Steel Titanium	9813cbc857	More icon stuff	2019-07-27 01:13:54 -04:00
Steel Titanium	3ffb7b6192	New icons ... Also update IMG_xpm.c	2019-07-16 19:20:00 -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
mazmazz	6244489fd0	Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle	2019-06-29 18:10:44 -04:00
mazmazz	dc0a92ea62	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla	2019-06-29 17:51:30 -04:00
mazmazz	521d8fd8c1	Merge remote-tracking branch 'public-gl/master' into md3-vanilla	2019-06-29 15:02:07 -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
Monster Iestyn	e7e3b0ef38	Merge branch 'public_next' ... # Conflicts: # src/doomdef.h # src/hardware/hw_draw.c # src/m_misc.c # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj	2019-06-09 20:04:08 +01:00
Alam Ed Arias	ea08ba3fba	Merge branch 'master' into next	2019-06-07 18:07:32 -04:00
Alam Ed Arias	83b8a98df4	Merge branch 'gme-msvc' into 'master' ... Add GME to MSVC 10 solution See merge request STJr/SRB2!448	2019-06-07 18:06:51 -04:00
Steel Titanium	81dec89aeb	Merge branch 'next' into public-musicplus-libopenmpt	2019-06-03 15:36:50 -04:00
Steel Titanium	91767a7740	Merge branch 'master' into public-musicplus-libopenmpt	2019-05-20 21:33:10 -04:00
Monster Iestyn	66bc287688	Merge branch 'public_next'	2019-05-16 15:58:17 +01:00
mazmazz	6d803decb6	Merge remote-tracking branch 'public-gl/master' into md3-vanilla	2019-05-08 17:56:05 -04:00
Nev3r	aab2f55aec	Merge branch 'banip-command' into 'next' ... Ban IP command See merge request STJr/SRB2!460	2019-05-06 13:09:14 -04:00
Monster Iestyn	1b2afea091	Merge branch 'public_next'	2019-05-03 16:42:42 +01:00
Monster Iestyn	d4ab2837bb	Merge branch 'master' into next	2019-05-03 16:00:45 +01:00
mazmazz	3d90488d17	Merge remote-tracking branch 'public-gl/master' into md3-vanilla	2019-05-02 17:43:40 -04:00
Steel Titanium	26fdee8217	Don't enable UPnP support if NONET is defined.	2019-04-16 15:05:09 -04:00
mazmazz	8317155c40	Merge branch 'public-gl-next' into public-musicplus-jingle	2019-03-15 18:42:19 -04:00
Steel Titanium	67a80ba311	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command	2019-03-15 16:13:31 -04:00
mazmazz	9ec98c588f	Merge branch 'public_next'	2019-03-14 22:15:34 -04:00
mazmazz	93626c2293	Merge remote-tracking branch 'public-gl/next' into public-musicplus-core	2019-03-13 19:45:07 -04:00
Monster Iestyn	a93e96c75b	Merge branch 'public_next' ... # Conflicts: # src/sdl12/Srb2SDL-vc10.vcxproj # src/sdl12/Srb2SDL-vc9.vcproj # src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj	2019-03-02 20:51:15 +00:00
wolfs	5620d0188e	Merge branch 'apng' into 'master' ... Support aPNG in new versions of libpng See merge request KartKrew/Kart-Public!63	2019-02-28 12:00:58 -08:00
Steel Titanium	bf2f6ebc09	Save ban list right after banning.	2019-02-21 19:47:00 -05:00
mazmazz	66e6a6f940	Merge remote-tracking branch 'public-gl/master' into md3-vanilla	2019-01-07 04:06:45 -05:00
Marco Z	882355d24b	Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC	2019-01-04 21:18:55 -05:00
Marco Z	09ed8bd046	Add LibGME to DD vc10 project	2019-01-04 20:43:45 -05:00
mazmazz	d1534257dd	Add mingw-compiled libopenmpt 0.4.0 DLLs	2019-01-03 16:07:32 -05:00
mazmazz	2e4c139551	DD Compile fixes	2019-01-02 06:48:06 -05:00
mazmazz	08812b1501	Revised MinGW Makefile logic for OpenMPT	2019-01-02 02:37:48 -05:00
mazmazz	953f5b6297	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2019-01-02 02:15:29 -05:00
mazmazz	109dd70a53	Merge remote-tracking branch 'public-gl/master' into public-musicplus-core	2019-01-02 02:15:16 -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
Digiku	bbd878e520	Merge branch 'mingw-64bit-cpu-target-revise' into 'master' ... MinGW64:Target nocona for 64-bit builds [revision] See merge request STJr/SRB2!440	2019-01-01 11:15:34 -05:00
mazmazz	b7bb570f97	Merge remote-tracking branch 'public-gl/master' into public-musicplus-core	2019-01-01 10:41:40 -05:00
mazmazz	4cfacf5cde	Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile	2018-12-29 21:14:50 -05:00
mazmazz	74d6921f47	Merge tag 'SRB2_release_2.1.23' into md3-vanilla-ssn	2018-12-26 22:55:25 -05:00
Arthur	b19252651f	Removed all glBegin/glEnd references ... MD2/MD3 now works, with the exception of WAD textures for some odd reason	2018-12-23 17:00:11 -05:00
Monster Iestyn	2d675750cf	fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c	2018-12-23 21:52:49 +00:00
Alam Ed Arias	102fd11cb4	More work to cleanup the ARM builds	2018-12-22 19:50:32 -05:00
Alam Arias	b6a917cda1	Added ARM/ARM64 to whole vc10 sln ... Added ARM/ARM64 to zlib, libpng Added ARM/ARM64 to srb2dd/srb2sdl	2018-12-21 16:47:10 -05:00
Arthur	3ed0edbcfe	Common model format, with MD2/MD3 loading	2018-12-18 17:52:45 -05:00
Alam Ed Arias	6e79722437	Fix float-equal warning in Win32 interface	2018-12-16 14:01:28 -05:00
Monster Iestyn	11cb163435	Backport the Blockmap library I made two years ago	2018-11-30 17:11:11 +00:00
mazmazz	ea7162a76a	Update source copyrights to 2018	2018-11-25 07:35:38 -05:00
Monster Iestyn	08af33c51f	Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't	2018-11-23 19:12:48 +00:00
Steel Titanium	fe43deacec	Merge branch 'master' into responsefile-fix	2018-11-22 23:02:20 -05:00
Monster Iestyn	224c0fccdb	Merge branch 'public_next' ... # Conflicts: # src/Makefile.cfg # src/d_clisrv.c # src/p_setup.c # src/r_segs.c # src/r_things.c	2018-11-20 14:33:10 +00:00
mazmazz	6cc6edc137	Changed Mixer X sources to 2.2.0; added x64 gcc support	2018-11-19 20:51:54 -05:00
Steel Titanium	02c08a3e10	Some small changes	2018-11-14 21:01:54 -05:00
Steel Titanium	f02105732e	Fix up compiling on DD version	2018-11-14 18:00:10 -05:00
Steel Titanium	c5a97dcfe6	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit	2018-11-14 17:28:41 -05:00
Alam Ed Arias	f73ea4f984	Clean up warnings	2018-11-14 10:52:16 -05:00
Monster Iestyn	f3b59c1731	Fix VC project files to include hw_clip.c/h	2018-11-14 12:11:57 +00:00
Marco Z	0b97b2a76c	Missed #ifdef HAVE_LIBGME in win_snd	2018-11-13 22:50:08 -05:00
Steel Titanium	4836e711d3	Fix up 64-bit MINGW	2018-11-13 20:32:18 -05:00
mazmazz	2db2b6e6af	Win32 boolean fixes	2018-11-13 17:24:19 -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	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
mazmazz	a288b95458	Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup	2018-10-19 22:04:26 -04:00
Monster Iestyn	d4e11762fa	Merge branch 'public_next' ... # Conflicts: # src/nds/i_sound.c # src/r_data.c # src/sdl12/mixer_sound.c # src/sdl12/sdl_sound.c # src/win32ce/win_snd.c	2018-10-19 22:46:19 +01:00
Sryder	6184f91dd3	Add an int to I_PlaySound to tell an interface which channel number SRB2 is using. ... I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.	2018-10-13 23:01:11 +01:00
Monster Iestyn	291ebf302c	Merge branch 'public_next' ... # Conflicts: # src/Makefile # src/lua_script.c # src/p_user.c # src/sdl/i_system.c # src/v_video.c # src/w_wad.c	2018-10-10 14:51:34 +01:00
Steel Titanium	027e6e8e3c	Change win_snd.c also	2018-10-07 15:00:48 -04:00
Steel Titanium	b812a6a4ab	Really fix DD compiling this time.	2018-10-04 22:56:11 -04:00
Steel Titanium	fc5d969642	Fix DD compiling	2018-10-04 22:44:26 -04:00