14517 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
SteelT	af9e73cef0	Easy conflicts - src/win32/win_dll.c and src/win32/win_vid.c	2020-08-06 18:10:16 -04:00
Sally Coolatta	a73b9a9a0d	Merge p_slopes.c	2020-08-06 17:58:30 -04:00
Sally Coolatta	337db54965	Missed this in p_setup.c	2020-08-06 17:55:36 -04:00
Sally Coolatta	438743ce97	Merge doomstat.h	2020-08-06 17:53:35 -04:00
Sally Coolatta	59eb714bef	Merge doomdef.h	2020-08-06 17:42:29 -04:00
Sally Coolatta	95fc67e4a6	Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge	2020-08-06 17:38:33 -04:00
Sally Coolatta	cdb0310982	Merge info.c/h	2020-08-06 17:38:29 -04:00
SteelT	9a75d397d6	Merge src/s_sound.c/h	2020-08-06 16:56:41 -04:00
Sally Coolatta	43c627b02e	Merge f_finale.c/h	2020-08-06 15:35:07 -04:00
Sally Coolatta	b9886a166e	Merge p_setup.c	2020-08-06 11:42:16 -04:00
Sally Coolatta	f0484d87fa	Merge p_sight.c	2020-08-06 11:12:19 -04:00
Sally Coolatta	372eb72d5b	Merge p_floor.c	2020-08-06 11:07:33 -04:00
Sally Coolatta	c14e9a23f7	Merge p_enemy.c	2020-08-06 11:00:49 -04:00
Sally Coolatta	3ebc8517be	Merge hu_stuff.c/h	2020-08-06 10:52:00 -04:00
Sally Coolatta	4ab8b07fbc	Merge assets/README.txt	2020-08-06 10:23:22 -04:00
Sally Coolatta	536054b3f0	Merge assets/CMakeLists.txt	2020-08-06 10:23:12 -04:00
SteelT	e62eb255f0	Merge config.h.in	2020-08-06 01:17:22 -04:00
SteelT	a470716f48	Merge src/win32/Srb2win-vc10.vcxproj	2020-08-06 01:12:19 -04:00
SteelT	17bccc671d	Merge CMakeLists.txt and src/CMakeLists.txt	2020-08-06 01:08:42 -04:00
SteelT	23736017ec	Merge screen.h	2020-08-05 15:11:15 -04:00
Sally Coolatta	d27f16c4d5	A bunch of easy files (1-5 conflicts) ... g_state.h, hu_stuff.h, lua_hud.h, m_misc.h, p_polyobj.c, p_telept.c, r_draw.c, r_draw8.c, r_sky.c	2020-08-05 14:34:17 -04:00
Sally Coolatta	54f442d2fd	Merge lua_skinlib.c	2020-08-05 14:16:17 -04:00
Sally Coolatta	7f94fe0d93	Merge lua_playerlib.c	2020-08-05 14:15:21 -04:00
Sally Coolatta	40558a6824	Merge lua_hudlib.c	2020-08-05 14:07:26 -04:00
Sally Coolatta	bb2fe60e0e	Merge lua_mathlib.c	2020-08-05 14:04:34 -04:00
Sally Coolatta	3ad209a366	Merge lua_maplib.c	2020-08-05 14:04:13 -04:00
Sally Coolatta	cc1afaa838	Merge lua_script.h	2020-08-05 14:03:53 -04:00
Sally Coolatta	9a9f7b8b1f	Merge lua_hooklib.c	2020-08-05 14:03:24 -04:00
Sally Coolatta	9b778d6ce6	Merge lua_baselib.c	2020-08-05 14:00:35 -04:00
Sally Coolatta	c7d4be30f0	Merge m_cond.c/h	2020-08-05 10:15:04 -04:00
Sally Coolatta	7e9efd4e29	Merge lua_consolelib.c ... Properly supports 3P/4P commands while we're at it too	2020-08-05 09:58:12 -04:00
Sally Coolatta	b546f7d188	Merge g_input.c/h	2020-08-04 01:41:00 -04:00
SteelT	6d850b51d9	Handle doomdef.h a bit	2020-08-04 01:06:15 -04:00
SteelT	11671aa6d8	Merge doomdata.h	2020-08-04 01:05:57 -04:00
SteelT	c5f9a586a0	Merge lua_hook.h	2020-08-04 00:58:37 -04:00
SteelT	1b6dbc5ee8	Merge lua_mobjlib.c	2020-08-04 00:53:06 -04:00
SteelT	a7f2ab7dea	Merge lua_script.c	2020-08-04 00:45:49 -04:00
Sally Coolatta	5788c98f3c	Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge	2020-08-03 10:13:52 -04:00
SteelT	23f6dc63d6	Merge screen.c	2020-08-02 18:58:11 -04:00
SteelT	7d5b0adc87	Merge p_saveg.c	2020-08-02 18:37:58 -04:00
SteelT	fa4fc40dd6	Merge filesrch.c	2020-08-02 18:03:59 -04:00
Sally Coolatta	4208d22129	Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge	2020-08-02 17:30:19 -04:00
Sally Coolatta	94e85a7bb6	Merge f_wipe.c	2020-08-02 17:24:44 -04:00
SteelT	7417e95dcb	Merge m_cheat.c	2020-08-02 17:06:27 -04:00
Sally Coolatta	cfb9c92ec9	Merge dehacked.c/h	2020-08-02 16:59:24 -04:00
Sally Coolatta	70692f4c3f	Merge d_netfil.c	2020-08-02 16:40:22 -04:00
Sally Coolatta	b156899390	More d_netcmd.h	2020-08-02 16:36:40 -04:00
Sally Coolatta	178087289e	Merge d_netcmd.c/h	2020-08-02 15:38:53 -04:00
Sally Coolatta	c1b1641f35	Merge d_main.c	2020-08-02 14:45:23 -04:00
Sally Coolatta	6ddae4728f	Merge d_net.c	2020-08-02 14:15:29 -04:00