14537 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sally Coolatta	0de25ce771	Merge p_inter.c	2020-08-09 15:15:52 -04:00
Sally Coolatta	153492c20c	Finish removals properly	2020-08-09 14:46:03 -04:00
Sally Coolatta	20dcd07fa4	Merge g_game.c/h ... Also includes required changes to g_demo.c/h	2020-08-09 14:43:13 -04:00
Sally Coolatta	7e644a5de3	Merge d_player.h	2020-08-08 19:29:30 -04:00
Sally Coolatta	f4b98baef1	Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge	2020-08-08 19:08:22 -04:00
Sally Coolatta	3f1d58754e	Merge r_things.c/h ... Includes r_skins, obviously, but also a little bit of m_cond to make availabilities better for kart's purposes	2020-08-08 19:08:19 -04:00
SteelT	fe938117fd	Merge p_pspr.h	2020-08-08 18:11:19 -04:00
SteelT	ed91ca6244	Merge p_local.h	2020-08-08 17:57:45 -04:00
Sally Coolatta	4b5c7d7510	Merge r_segs.c	2020-08-08 17:10:46 -04:00
Sally Coolatta	2af68a5fe7	Merge r_plane.c	2020-08-08 17:04:26 -04:00
Sally Coolatta	6bf6b16ff7	Merge r_main.c/h	2020-08-08 16:58:48 -04:00
SteelT	f897061629	Merge r_draw.h	2020-08-08 16:20:10 -04:00
SteelT	9cfe5513c2	Merge p_tick.c	2020-08-08 15:40:24 -04:00
Sally Coolatta	7accb3f8d2	Merge p_mobj.c/h	2020-08-08 15:22:29 -04:00
Sally Coolatta	e502ff9a0a	Merge r_bsp.c/h	2020-08-06 19:33:01 -04:00
Sally Coolatta	5ec387451a	Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge	2020-08-06 19:21:04 -04:00
Sally Coolatta	9f869ec466	Merge r_data.c/h	2020-08-06 19:20:51 -04:00
SteelT	6106589507	Merge src/w_wad.c/h	2020-08-06 18:52:39 -04:00
SteelT	30fd6f5db5	Merge src/r_defs.h	2020-08-06 18:36:30 -04:00
SteelT	ef8fd7b671	Merge src/r_state.h	2020-08-06 18:17:12 -04:00
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