5832 commits

Author	SHA1	Message	Date
Steel Titanium	123b97c5ed	Fix skins overflow	2019-01-15 14:29:43 -05:00
fickleheart	81c73032e4	Fix rendering gaps on polys with upper/lower textures	2019-01-12 20:15:58 -05:00
Monster Iestyn	74cb384be2	revert to LF_SAVEGAME system code, removing all traces of saveoverride ... (I believe Sal wanted us to do this anyway, so...)	2019-01-08 17:14:21 +00:00
Digiku	5a48a22bb1	Update hw_md2.c -- add comment about anglef player->frameangle from Kart	2019-01-08 11:26:39 -05:00
mazmazz	3753e1be28	Fixed Addons Menu icons for search bar	2019-01-08 01:31:44 -05:00
mazmazz	6ae27013f2	Misssed alwaysfreelook defaults (first person)	2019-01-08 01:29:12 -05:00
mazmazz	58b3b6d236	Fix player.dta SIGNA0 overwriting regular end sign frame	2019-01-08 00:19:42 -05:00
mazmazz	8d930c7f47	GCC 7 fallthru bypasses (-Werror-implicit-fallthrough)	2019-01-07 23:06:47 -05:00
mazmazz	e5125d0746	Chat arrow offsets	2019-01-07 22:34:48 -05:00
mazmazz	1821edeee7	Update SRB2-CHAT nickname colors to 2.2 skincolors	2019-01-07 22:26:39 -05:00
mazmazz	275070b608	Correct addons menu back color	2019-01-07 21:58:42 -05:00
mazmazz	7a97ebe985	Dummy out SRB2-CHAT console colors ... Pending translation to 2.2 palette indexes	2019-01-07 21:54:38 -05:00
mazmazz	95c2f34278	Addons menu merge fixes	2019-01-07 21:45:41 -05:00
mazmazz	38ad1ec027	WIP hu_stuff merge fixes	2019-01-07 17:56:55 -05:00
mazmazz	a436313987	Menu merge fixes	2019-01-07 17:56:43 -05:00
mazmazz	4f40d2abdb	Merge errors for compile	2019-01-07 17:05:20 -05:00
Digiku	8e862b3c98	Update f_finale.c - Small credits update	2019-01-07 16:50:59 -05:00
mazmazz	1de7fcad8d	Resolve r_data.c colormap conflict	2019-01-07 15:29:37 -05:00
Nev3r	6acdc428f7	Solved conflicts related to PK3s ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-01-07 19:00:31 +01:00
Monster Iestyn	69d7927ee8	resolve the conflict in p_spec.c	2019-01-07 17:02:05 +00:00
Monster Iestyn	d4d30e9e9c	resolve conflict in r_main.c	2019-01-07 16:52:46 +00:00
mazmazz	70f2e9a7ab	Merge remote-tracking branch 'public-gl/master' into md3-vanilla	2019-01-07 04:06:45 -05:00
Digiku	e45c54dc60	Update f_finale.c - Remove Torgo's real name by request	2019-01-07 03:41:25 -05:00
mazmazz	c4fcdbf687	Resolve p_setup and d_netcmd conflicts (20190101 public merge)	2019-01-07 03:07:24 -05:00
mazmazz	78d631f5da	Resolved filesrch.c conflicts (20190101 public merge)	2019-01-07 02:54:26 -05:00
mazmazz	1dd464b17d	Resolve m_menu.c conflicts (20190101 public merge)	2019-01-07 02:31:45 -05:00
mazmazz	c91ac23ecb	Merge branch 'musicplus-core' into musicplus-feature-postboss	2019-01-07 01:17:07 -05:00
mazmazz	e1a566157c	Merge remote-tracking branch 'origin/master' into musicplus-core	2019-01-07 01:15:08 -05:00
mazmazz	403565e92f	Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss	2019-01-07 01:10:54 -05:00
Steel Titanium	d475bcb0b7	Some few changes	2019-01-05 23:42:25 -05:00
mazmazz	cae6a842de	Merge remote-tracking branch 'public-gl/master' into travis-deployer	2019-01-05 09:08:34 -05:00
Marco Z	67d829174e	Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC	2019-01-04 21:18:55 -05:00
Marco Z	d284b877f6	Add LibGME to DD vc10 project	2019-01-04 20:43:45 -05:00
Marco Z	35f8ff191a	Add GME to VC10 SRB2SDL project	2019-01-04 20:43:42 -05:00
Digiku	031e234d86	Merge branch 'changecontrol-text-overflow-fix' into 'master' ... Resolve buffer overflow crash when configuring System Menu and GIF controls See merge request STJr/SRB2!445	2019-01-04 19:39:17 -05:00
Digiku	e42e1178ed	Increase M_ChangecontrolResponse message buffer by 25 chars	2019-01-04 19:38:36 -05:00
mazmazz	2c2a96b554	MUS_MODPLUG fix	2019-01-04 18:39:09 -05:00
mazmazz	7be2e9cc30	Revert "Un-dummy md5 checks" ... This reverts commit b7528134e7.	2019-01-04 11:31:20 -05:00
mazmazz	0efc1b968f	Flip HAVE_OPENMPT on by default for non-Windows makefile	2019-01-04 01:48:04 -05:00
mazmazz	c2687a4289	CMake fixes for OpenMPT	2019-01-03 21:17:18 -05:00
mazmazz	c0ca2c8980	Remove dynamic openmpt loading	2019-01-03 20:52:09 -05:00
Marco Z	51976778e2	Fix MSVC compile errors	2019-01-03 20:34:10 -05:00
Marco Z	213927b264	Add libopenmpt to VC10 project	2019-01-03 20:28:00 -05:00
mazmazz	c31abf458f	Add mingw-compiled libopenmpt 0.4.0 DLLs	2019-01-03 16:07:32 -05:00
mazmazz	ccd742d92e	Fix blinking MD2 models ... MD2 models are forced to load float frames, so mesh->indices is never loaded, so glDrawElements can't be used. Use glDrawArrays instead.	2019-01-03 00:57:14 -05:00
mazmazz	b7528134e7	Un-dummy md5 checks	2019-01-02 23:31:29 -05:00
mazmazz	c5e9d6c97f	DD Compile fixes	2019-01-02 06:48:06 -05:00
mazmazz	5807384dbd	Remove S_MusicExists lua	2019-01-02 06:26:18 -05:00
Steel Titanium	2ba11a6d69	Support for per-map intermission music	2019-01-02 05:15:23 -05:00
mazmazz	91d0c090d6	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2019-01-02 05:06:09 -05:00