4764 commits

Author	SHA1	Message	Date
Monster Iestyn	efa042a995	whoops, removed some variables I shouldn't have, so I've added them back	2019-02-13 16:52:51 +00:00
Monster Iestyn	30a00c812c	Split the column caching code of HWR_DrawPatchInCache into a new function, HWR_DrawColumnInCache. This should make modifying the OpenGL caching code look a little less daunting, hopefully. ... I also removed some "const"s for now, since I wasn't sure if they were needed or even correct to use or not here... if they're fine I could add them back later though. (Note: I have not tested if this compiles yet)	2019-02-13 16:39:37 +00:00
MascaraSnake	5eb089cc14	Forgot the continue statements	2019-02-03 17:07:13 +01:00
MascaraSnake	00cad05550	Emblem number in emblem definition is optional. If none is supplied, place in first free slot.	2019-02-03 17:03:33 +01:00
MascaraSnake	bc30bd06df	In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC	2019-02-03 14:32:07 +01:00
MascaraSnake	8c345b87ca	Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD	2019-02-03 11:05:22 +01:00
MascaraSnake	0dd8779b91	Hardcoded emblems of the first four special stages	2019-01-30 23:01:58 +01:00
MascaraSnake	88a6dbae9b	Spring Hill -> Christmas Chime	2019-01-29 22:26:15 +01:00
MascaraSnake	f6dd521fd0	Updated/added emblem locations for GFZ, THZ, DSZ1, CEZ1, FHZ2 and HHZ	2019-01-28 21:28:38 +01:00
Monster Iestyn	f3796dc7f6	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
mazmazz	a050ed956a	Fixed Addons Menu icons for search bar	2019-01-08 01:31:44 -05:00
mazmazz	47bd042a7e	Misssed alwaysfreelook defaults (first person)	2019-01-08 01:29:12 -05:00
mazmazz	d5de5e9f49	Fix player.dta SIGNA0 overwriting regular end sign frame	2019-01-08 00:19:42 -05:00
mazmazz	e02fd489a7	GCC 7 fallthru bypasses (-Werror-implicit-fallthrough)	2019-01-07 23:06:47 -05:00
mazmazz	8ea8bf2587	Chat arrow offsets	2019-01-07 22:34:48 -05:00
mazmazz	5066e340f4	Update SRB2-CHAT nickname colors to 2.2 skincolors	2019-01-07 22:26:39 -05:00
mazmazz	e403d1bacc	Correct addons menu back color	2019-01-07 21:58:42 -05:00
mazmazz	dfc427e81a	Dummy out SRB2-CHAT console colors ... Pending translation to 2.2 palette indexes	2019-01-07 21:54:38 -05:00
mazmazz	411b1b4f54	Addons menu merge fixes	2019-01-07 21:45:41 -05:00
mazmazz	a775a63dfd	WIP hu_stuff merge fixes	2019-01-07 17:56:55 -05:00
mazmazz	875aee60a0	Menu merge fixes	2019-01-07 17:56:43 -05:00
mazmazz	b3f7b169b2	Merge errors for compile	2019-01-07 17:05:20 -05:00
mazmazz	7aa55f24f5	Resolve r_data.c colormap conflict	2019-01-07 15:29:37 -05:00
Nev3r	7d09149b04	Solved conflicts related to PK3s ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-01-07 19:00:31 +01:00
Monster Iestyn	9effa134d2	resolve the conflict in p_spec.c	2019-01-07 17:02:05 +00:00
Monster Iestyn	96ad8dd81a	resolve conflict in r_main.c	2019-01-07 16:52:46 +00:00
mazmazz	015e7b9862	Resolve p_setup and d_netcmd conflicts (20190101 public merge)	2019-01-07 03:07:24 -05:00
mazmazz	e18eb69a0b	Resolved filesrch.c conflicts (20190101 public merge)	2019-01-07 02:54:26 -05:00
mazmazz	e9150b6645	Resolve m_menu.c conflicts (20190101 public merge)	2019-01-07 02:31:45 -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
Alam Ed Arias	819e4ef2ae	Merge branch 'master' into next	2019-01-01 23:00:39 -05:00
Digiku	393c64b8bc	Merge branch 'expanded-nmuslist' into 'next' ... Expand NMUSList to include HUD changes See merge request STJr/SRB2!388	2019-01-01 15:06:04 -05:00
Digiku	5278d1ca20	Merge branch 'caps-lock-consistency-fix' into 'master' ... Update capslock state on window re-focus See merge request STJr/SRB2!436	2019-01-01 15:05:20 -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	3d2e58861d	Rename M5 to ARCHOPTS; allow override by command line	2018-12-29 21:55:35 -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
Digiku	80e30c6aaa	Merge branch 'MSVC-ARM' into 'master' ... ARM and ARM64 support with MSVC toolchain See merge request STJr/SRB2!412	2018-12-28 01:05:40 -05:00
Steel Titanium	d048e7cbec	Don't set if LINUX64 is defined	2018-12-27 21:17:02 -05:00
Steel Titanium	5ba0863876	Stupid restrictions	2018-12-27 19:00:18 -05:00
Steel Titanium	4a05fd5f26	More explict check	2018-12-27 18:54:10 -05:00
Steel Titanium	6dddf61265	Target nocona for 64-bit builds	2018-12-27 00:56:33 -05:00
james	0b857f127f	Update capslock state on window re-focus	2018-12-26 15:49:57 -08:00
Digiku	da9447342c	Merge branch '2123-version' into 'master' ... Update code versions to 2.1.23 See merge request STJr/SRB2!435	2018-12-26 17:14:58 -05:00
Digiku	ebb4c65d92	Merge branch 'srb2-chat-nonet' into 'master' ... Hide SRB2-CHAT behind #ifndef NONET See merge request STJr/SRB2!434	2018-12-26 17:13:23 -05:00
mazmazz	60bdc056f8	Also hide Chat Options if NONET	2018-12-26 16:41:39 -05:00
mazmazz	894c139bf1	Update code versions to 2.1.23	2018-12-26 16:31:43 -05:00
mazmazz	814db7e371	Hide SRB2-CHAT behind #ifndef NONET	2018-12-26 16:20:17 -05:00
Steel Titanium	4f18ec60bc	Fix saving progress on vanilia	2018-12-26 15:47:12 -05:00
mazmazz	fa6f791ec3	Fix -ANGLE_180 because MSVC complains ... -ANGLE_180 evaluates equal to ANGLE_180.	2018-12-25 01:14:05 -05:00
mazmazz	73a67fc9f5	Merge branch 'ctf-enemy-flag-sound' into 2122-version	2018-12-25 00:27:08 -05:00