| .. |
|
android
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
blua
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
djgppdos
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
dummy
|
|
|
|
hardware
|
Merge hw_md2.c
|
2020-08-09 19:35:13 -04:00 |
|
locale
|
|
|
|
nds
|
|
|
|
sdl
|
Resolve conflicts on the SDL interface files.
|
2020-05-29 16:17:26 -04:00 |
|
sdl12
|
|
|
|
win32
|
Easy conflicts - src/win32/win_dll.c and src/win32/win_vid.c
|
2020-08-06 18:10:16 -04:00 |
|
win32ce
|
|
|
|
.gitignore
|
|
|
|
am_map.c
|
|
|
|
am_map.h
|
|
|
|
Android.mk
|
|
|
|
apng.c
|
|
|
|
apng.h
|
|
|
|
asm_defs.inc
|
|
|
|
b_bot.c
|
Remove instances of HAVE_BLUA that actually disable Lua now
|
2020-05-10 19:59:56 -07:00 |
|
b_bot.h
|
|
|
|
byteptr.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
CMakeLists.txt
|
|
|
|
command.c
|
|
|
|
command.h
|
|
|
|
comptime.c
|
|
|
|
config.h.in
|
|
|
|
console.c
|
|
|
|
console.h
|
|
|
|
d_clisrv.c
|
|
|
|
d_clisrv.h
|
|
|
|
d_event.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
d_main.c
|
Merge d_main.c
|
2020-08-02 14:45:23 -04:00 |
|
d_main.h
|
|
|
|
d_net.c
|
|
|
|
d_net.h
|
|
|
|
d_netcmd.c
|
Merge d_netcmd.c/h
|
2020-08-02 15:38:53 -04:00 |
|
d_netcmd.h
|
|
|
|
d_netfil.c
|
|
|
|
d_netfil.h
|
|
|
|
d_player.h
|
Merge d_player.h
|
2020-08-08 19:29:30 -04:00 |
|
d_think.h
|
|
|
|
d_ticcmd.h
|
|
|
|
dehacked.c
|
Merge y_inter.c/h
|
2020-08-09 15:47:37 -04:00 |
|
dehacked.h
|
|
|
|
doomdata.h
|
|
|
|
doomdef.h
|
Merge doomdef.h
|
2020-08-06 17:42:29 -04:00 |
|
doomstat.h
|
Merge doomstat.h
|
2020-08-06 17:53:35 -04:00 |
|
doomtype.h
|
|
|
|
endian.h
|
|
|
|
f_finale.c
|
Merge f_finale.c/h
|
2020-08-06 15:35:07 -04:00 |
|
f_finale.h
|
Merge f_finale.c/h
|
2020-08-06 15:35:07 -04:00 |
|
f_wipe.c
|
Merge f_wipe.c
|
2020-08-02 17:24:44 -04:00 |
|
fastcmp.h
|
|
|
|
filesrch.c
|
|
|
|
filesrch.h
|
|
|
|
g_demo.c
|
Finish removals properly
|
2020-08-09 14:46:03 -04:00 |
|
g_demo.h
|
Finish removals properly
|
2020-08-09 14:46:03 -04:00 |
|
g_game.c
|
Merge g_game.c/h
|
2020-08-09 14:43:13 -04:00 |
|
g_game.h
|
Merge g_game.c/h
|
2020-08-09 14:43:13 -04:00 |
|
g_input.c
|
|
|
|
g_input.h
|
Merge g_input.c/h
|
2020-08-04 01:41:00 -04:00 |
|
g_splitscreen.c
|
|
|
|
g_state.h
|
|
|
|
hu_stuff.c
|
Merge hu_stuff.c/h
|
2020-08-06 10:52:00 -04:00 |
|
hu_stuff.h
|
Merge hu_stuff.c/h
|
2020-08-06 10:52:00 -04:00 |
|
i_addrinfo.c
|
|
|
|
i_addrinfo.h
|
|
|
|
i_joy.h
|
|
|
|
i_net.h
|
|
|
|
i_sound.h
|
|
|
|
i_system.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
i_tcp.c
|
|
|
|
i_tcp.h
|
|
|
|
i_video.h
|
|
|
|
info.c
|
Merge info.c/h
|
2020-08-06 17:38:29 -04:00 |
|
info.h
|
Merge info.c/h
|
2020-08-06 17:38:29 -04:00 |
|
k_battle.c
|
|
|
|
k_battle.h
|
|
|
|
k_bheap.c
|
|
|
|
k_bheap.h
|
|
|
|
k_bot.c
|
|
|
|
k_bot.h
|
|
|
|
k_botitem.c
|
|
|
|
k_botsearch.c
|
|
|
|
k_collide.c
|
|
|
|
k_collide.h
|
|
|
|
k_color.c
|
Merge info.c/h
|
2020-08-06 17:38:29 -04:00 |
|
k_color.h
|
|
|
|
k_kart.c
|
|
|
|
k_kart.h
|
|
|
|
k_pathfind.c
|
|
|
|
k_pathfind.h
|
|
|
|
k_pwrlv.c
|
No modify power level for beating/losing to players with no power level set
|
2020-05-28 13:42:11 -04:00 |
|
k_pwrlv.h
|
|
|
|
k_waypoint.c
|
|
|
|
k_waypoint.h
|
|
|
|
keys.h
|
|
|
|
lua_baselib.c
|
|
|
|
lua_blockmaplib.c
|
|
|
|
lua_consolelib.c
|
|
|
|
lua_hook.h
|
Merge lua_hook.h
|
2020-08-04 00:58:37 -04:00 |
|
lua_hooklib.c
|
|
|
|
lua_hud.h
|
|
|
|
lua_hudlib.c
|
Merge lua_hudlib.c
|
2020-08-05 14:07:26 -04:00 |
|
lua_infolib.c
|
|
|
|
lua_libs.h
|
|
|
|
lua_maplib.c
|
|
|
|
lua_mathlib.c
|
|
|
|
lua_mobjlib.c
|
|
|
|
lua_playerlib.c
|
|
|
|
lua_script.c
|
|
|
|
lua_script.h
|
|
|
|
lua_skinlib.c
|
|
|
|
lua_thinkerlib.c
|
|
|
|
lzf.c
|
|
|
|
lzf.h
|
|
|
|
m_aatree.c
|
|
|
|
m_aatree.h
|
|
|
|
m_anigif.c
|
|
|
|
m_anigif.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_argv.c
|
|
|
|
m_argv.h
|
|
|
|
m_bbox.c
|
|
|
|
m_bbox.h
|
|
|
|
m_cheat.c
|
|
|
|
m_cheat.h
|
|
|
|
m_cond.c
|
Merge m_cond.c/h
|
2020-08-05 10:15:04 -04:00 |
|
m_cond.h
|
Merge r_things.c/h
|
2020-08-08 19:08:19 -04:00 |
|
m_dllist.h
|
|
|
|
m_fixed.c
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
m_fixed.h
|
|
|
|
m_menu.c
|
Replace m_menu with ours
|
2020-08-09 20:08:11 -04:00 |
|
m_menu.h
|
|
|
|
m_misc.c
|
|
|
|
m_misc.h
|
|
|
|
m_queue.c
|
|
|
|
m_queue.h
|
|
|
|
m_random.c
|
|
|
|
m_random.h
|
|
|
|
m_swap.h
|
|
|
|
Makefile
|
Merge Makefile
|
2020-08-09 15:54:36 -04:00 |
|
Makefile.cfg
|
Merge Makefile.cfg
|
2020-08-09 15:52:32 -04:00 |
|
md5.c
|
|
|
|
md5.h
|
|
|
|
mserv.c
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
mserv.h
|
|
|
|
p5prof.h
|
|
|
|
p_ceilng.c
|
|
|
|
p_enemy.c
|
Merge p_enemy.c
|
2020-08-06 11:00:49 -04:00 |
|
p_floor.c
|
Merge p_floor.c
|
2020-08-06 11:07:33 -04:00 |
|
p_inter.c
|
Merge p_inter.c
|
2020-08-09 15:15:52 -04:00 |
|
p_lights.c
|
|
|
|
p_local.h
|
Merge p_local.h
|
2020-08-08 17:57:45 -04:00 |
|
p_map.c
|
|
|
|
p_maputl.c
|
|
|
|
p_maputl.h
|
|
|
|
p_mobj.c
|
Merge p_mobj.c/h
|
2020-08-08 15:22:29 -04:00 |
|
p_mobj.h
|
Merge p_mobj.c/h
|
2020-08-08 15:22:29 -04:00 |
|
p_polyobj.c
|
|
|
|
p_polyobj.h
|
|
|
|
p_pspr.h
|
Merge p_pspr.h
|
2020-08-08 18:11:19 -04:00 |
|
p_saveg.c
|
|
|
|
p_saveg.h
|
|
|
|
p_setup.c
|
Missed this in p_setup.c
|
2020-08-06 17:55:36 -04:00 |
|
p_setup.h
|
|
|
|
p_sight.c
|
Merge p_sight.c
|
2020-08-06 11:12:19 -04:00 |
|
p_slopes.c
|
Merge p_slopes.c
|
2020-08-06 17:58:30 -04:00 |
|
p_slopes.h
|
|
|
|
p_spec.c
|
Merge p_spec.c/h
|
2020-08-09 15:31:23 -04:00 |
|
p_spec.h
|
Merge p_spec.c/h
|
2020-08-09 15:31:23 -04:00 |
|
p_telept.c
|
|
|
|
p_tick.c
|
Merge p_tick.c
|
2020-08-08 15:40:24 -04:00 |
|
p_tick.h
|
|
|
|
p_user.c
|
Merge p_user.c
|
2020-08-09 19:11:46 -04:00 |
|
r_bsp.c
|
Merge r_bsp.c/h
|
2020-08-06 19:33:01 -04:00 |
|
r_bsp.h
|
Merge r_bsp.c/h
|
2020-08-06 19:33:01 -04:00 |
|
r_data.c
|
Merge r_data.c/h
|
2020-08-06 19:20:51 -04:00 |
|
r_data.h
|
Merge r_data.c/h
|
2020-08-06 19:20:51 -04:00 |
|
r_defs.h
|
Merge src/r_defs.h
|
2020-08-06 18:36:30 -04:00 |
|
r_draw.c
|
A bunch of easy files (1-5 conflicts)
|
2020-08-05 14:34:17 -04:00 |
|
r_draw.h
|
Merge r_draw.h
|
2020-08-08 16:20:10 -04:00 |
|
r_draw8.c
|
|
|
|
r_draw8_npo2.c
|
|
|
|
r_draw16.c
|
|
|
|
r_local.h
|
|
|
|
r_main.c
|
Merge r_main.c/h
|
2020-08-08 16:58:48 -04:00 |
|
r_main.h
|
Merge r_main.c/h
|
2020-08-08 16:58:48 -04:00 |
|
r_patch.c
|
Fix drop shadow and rotsprite code to use SHORT()
|
2020-05-02 17:13:16 +01:00 |
|
r_patch.h
|
|
|
|
r_plane.c
|
Merge r_plane.c
|
2020-08-08 17:04:26 -04:00 |
|
r_plane.h
|
Merge r_plane.c
|
2020-08-08 17:04:26 -04:00 |
|
r_portal.c
|
|
|
|
r_portal.h
|
|
|
|
r_segs.c
|
Merge r_segs.c
|
2020-08-08 17:10:46 -04:00 |
|
r_segs.h
|
|
|
|
r_skins.c
|
Merge r_things.c/h
|
2020-08-08 19:08:19 -04:00 |
|
r_skins.h
|
Merge r_things.c/h
|
2020-08-08 19:08:19 -04:00 |
|
r_sky.c
|
|
|
|
r_sky.h
|
|
|
|
r_splats.c
|
|
|
|
r_splats.h
|
|
|
|
r_state.h
|
Merge src/r_state.h
|
2020-08-06 18:17:12 -04:00 |
|
r_things.c
|
Merge r_things.c/h
|
2020-08-08 19:08:19 -04:00 |
|
r_things.h
|
Merge r_things.c/h
|
2020-08-08 19:08:19 -04:00 |
|
s_sound.c
|
Merge src/s_sound.c/h
|
2020-08-06 16:56:41 -04:00 |
|
s_sound.h
|
Merge src/s_sound.c/h
|
2020-08-06 16:56:41 -04:00 |
|
screen.c
|
|
|
|
screen.h
|
|
|
|
sounds.c
|
Merge sounds.c/h
|
2020-08-09 19:02:53 -04:00 |
|
sounds.h
|
Merge sounds.c/h
|
2020-08-09 19:02:53 -04:00 |
|
st_stuff.c
|
Merge st_stuff.c/h
|
2020-08-09 20:23:09 -04:00 |
|
st_stuff.h
|
Merge st_stuff.c/h
|
2020-08-09 20:23:09 -04:00 |
|
strcasestr.c
|
|
|
|
string.c
|
|
|
|
t_facon.c
|
|
|
|
t_fsin.c
|
remove blank lines at EOF of new files
|
2016-05-13 00:12:51 -04:00 |
|
t_ftan.c
|
|
|
|
t_tan2a.c
|
|
|
|
tables.c
|
|
|
|
tables.h
|
|
|
|
tmap.nas
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
tmap.s
|
|
|
|
tmap_asm.s
|
|
|
|
tmap_mmx.nas
|
|
|
|
tmap_vc.nas
|
|
|
|
v_video.c
|
Merge v_video.c/h
|
2020-08-09 16:04:57 -04:00 |
|
v_video.h
|
and h
|
2020-08-09 16:05:06 -04:00 |
|
vid_copy.s
|
|
|
|
w_wad.c
|
Merge src/w_wad.c/h
|
2020-08-06 18:52:39 -04:00 |
|
w_wad.h
|
Merge src/w_wad.c/h
|
2020-08-06 18:52:39 -04:00 |
|
y_inter.c
|
Merge y_inter.c/h
|
2020-08-09 15:47:37 -04:00 |
|
y_inter.h
|
Merge y_inter.c/h
|
2020-08-09 15:47:37 -04:00 |
|
z_zone.c
|
|
|
|
z_zone.h
|
|
|
