SRB2/src
2019-01-07 21:45:41 -05:00
..
android Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
blua Merge errors for compile 2019-01-07 17:05:20 -05:00
djgppdos WIP 20190101 merge 2019-01-02 01:09:15 -05:00
dummy Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
hardware WIP 20190101 merge 2019-01-02 01:09:15 -05:00
locale WIP 20190101 merge 2019-01-02 01:09:15 -05:00
sdl WIP 20190101 merge 2019-01-02 01:09:15 -05:00
win32 WIP 20190101 merge 2019-01-02 01:09:15 -05:00
.gitignore
am_map.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
am_map.h Remove MINIAUTOMAP code 2018-12-12 18:53:13 -03:00
Android.mk
asm_defs.inc Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
b_bot.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
b_bot.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
byteptr.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
CMakeLists.txt Backport the Blockmap library I made two years ago 2018-11-30 17:11:11 +00:00
command.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
command.h Properly restrict EXECVERSION from cvar updates 2018-12-20 17:56:51 -05:00
comptime.c
config.h.in WIP 20190101 merge 2019-01-02 01:09:15 -05:00
console.c Merge errors for compile 2019-01-07 17:05:20 -05:00
console.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_clisrv.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_clisrv.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_event.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
d_main.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_main.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
d_net.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_net.h Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN 2018-12-22 20:52:32 -05:00
d_netcmd.c Merge errors for compile 2019-01-07 17:05:20 -05:00
d_netcmd.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_netfil.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_netfil.h Merge branch 'addons_menu' into 'master' 2018-12-15 20:46:42 -05:00
d_player.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_think.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
d_ticcmd.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
dehacked.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
dehacked.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
doomdata.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
doomdef.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
doomstat.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
doomtype.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
endian.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
f_finale.c Merge errors for compile 2019-01-07 17:05:20 -05:00
f_finale.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
f_wipe.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
fastcmp.h
filesrch.c Resolved filesrch.c conflicts (20190101 public merge) 2019-01-07 02:54:26 -05:00
filesrch.h Hide kart-specific addons behavior behind USE_KART 2018-12-16 16:07:47 -05:00
g_game.c Merge errors for compile 2019-01-07 17:05:20 -05:00
g_game.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
g_input.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
g_input.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
g_state.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
hu_stuff.c WIP hu_stuff merge fixes 2019-01-07 17:56:55 -05:00
hu_stuff.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
i_addrinfo.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
i_addrinfo.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
i_joy.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
i_net.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
i_sound.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
i_system.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
i_tcp.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
i_tcp.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
i_video.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
info.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
info.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
keys.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
lua_baselib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_blockmaplib.c Backport the Blockmap library I made two years ago 2018-11-30 17:11:11 +00:00
lua_consolelib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_hook.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_hooklib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_hud.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_hudlib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_infolib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_libs.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_maplib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_mathlib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_mobjlib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_playerlib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_script.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_script.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_skinlib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_thinkerlib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lzf.c
lzf.h
m_aatree.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_aatree.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_anigif.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_anigif.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_argv.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_argv.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_bbox.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_bbox.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_cheat.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_cheat.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_cond.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_cond.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_dllist.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_fixed.c bland 2018-12-20 18:52:51 -03:00
m_fixed.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_menu.c Addons menu merge fixes 2019-01-07 21:45:41 -05:00
m_menu.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_misc.c Merge errors for compile 2019-01-07 17:05:20 -05:00
m_misc.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_queue.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_queue.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_random.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_random.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_swap.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Makefile WIP 20190101 merge 2019-01-02 01:09:15 -05:00
Makefile.cfg WIP 20190101 merge 2019-01-02 01:09:15 -05:00
md5.c
md5.h
mserv.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
mserv.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
p5prof.h
p_ceilng.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
p_enemy.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_floor.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_inter.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_lights.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_local.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_map.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_maputl.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
p_maputl.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
p_mobj.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_mobj.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_polyobj.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_polyobj.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_pspr.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_saveg.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_saveg.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_setup.c Merge errors for compile 2019-01-07 17:05:20 -05:00
p_setup.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_sight.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_slopes.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_slopes.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_spec.c resolve the conflict in p_spec.c 2019-01-07 17:02:05 +00:00
p_spec.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_telept.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_tick.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_tick.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
p_user.c Merge errors for compile 2019-01-07 17:05:20 -05:00
r_bsp.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_bsp.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_data.c Resolve r_data.c colormap conflict 2019-01-07 15:29:37 -05:00
r_data.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_defs.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_draw.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_draw.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_draw8.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_draw16.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_local.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_main.c resolve conflict in r_main.c 2019-01-07 16:52:46 +00:00
r_main.h Large room fix 2018-12-09 19:34:17 -03:00
r_plane.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_plane.h Update r_plane.h 2018-12-14 15:49:32 -03:00
r_segs.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_segs.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_sky.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_sky.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_splats.c Software plane fixes 2018-12-14 14:08:25 -03:00
r_splats.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_state.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_things.c Solved conflicts related to PK3s 2019-01-07 19:00:31 +01:00
r_things.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
s_sound.c Menu merge fixes 2019-01-07 17:56:43 -05:00
s_sound.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
screen.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
screen.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
sounds.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
sounds.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
st_stuff.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
st_stuff.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
string.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
t_facon.c
t_fsin.c
t_ftan.c
t_tan2a.c
tables.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tables.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tmap.nas WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tmap.s WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tmap_asm.s Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
tmap_mmx.nas WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tmap_vc.nas Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
v_video.c Merge errors for compile 2019-01-07 17:05:20 -05:00
v_video.h Merge errors for compile 2019-01-07 17:05:20 -05:00
vid_copy.s Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
w_wad.c Solved conflicts related to PK3s 2019-01-07 19:00:31 +01:00
w_wad.h Solved conflicts related to PK3s 2019-01-07 19:00:31 +01:00
y_inter.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
y_inter.h Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
z_zone.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
z_zone.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00