RingRacers/src
wolfy852 2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
2019-05-06 22:40:12 -05:00
..
android Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
blua
djgppdos Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
dummy Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
hardware Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
locale
nds
sdl Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
sdl12 Merge branch 'next' into md3-vanilla-kart 2019-03-20 19:50:20 -05:00
win32 Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
win32ce
.gitignore
am_map.c
am_map.h
Android.mk
apng.c Merge branch 'apng-oh-shit-fixes' into 'master' 2019-02-28 12:00:58 -08:00
apng.h Merge branch 'apng-oh-shit-fixes' into 'master' 2019-02-28 12:00:58 -08:00
asm_defs.inc
b_bot.c
b_bot.h
byteptr.h
CMakeLists.txt Merge branch 'next' into md3-vanilla-kart 2019-03-20 19:50:20 -05:00
command.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
command.h Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
comptime.c
config.h.in Update patch.kart hash again 2019-03-16 00:35:13 -05:00
console.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
console.h Deduplicate character shifting code 2019-03-10 18:09:15 -05:00
d_clisrv.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
d_clisrv.h "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
d_event.h
d_main.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
d_main.h
d_net.c Replace ping command with a condensed and sorted version 2019-04-08 15:57:23 -07:00
d_net.h
d_netcmd.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
d_netcmd.h "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
d_netfil.c
d_netfil.h
d_player.h Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD 2019-03-11 21:59:45 -05:00
d_think.h
d_ticcmd.h
dehacked.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
dehacked.h
doomdata.h
doomdef.h Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
doomstat.h Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
doomtype.h
endian.h
f_finale.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
f_finale.h
f_wipe.c
fastcmp.h
filesrch.c
filesrch.h
g_game.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
g_game.h Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
g_input.c Clear P3 and P4 controls too when clearing all controls 2019-03-24 17:31:04 -05:00
g_input.h
g_state.h
hu_stuff.c Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa 2019-03-18 22:00:23 +00:00
hu_stuff.h
i_addrinfo.c
i_addrinfo.h
i_joy.h
i_net.h
i_sound.h
i_system.h
i_tcp.c Prettyify code. 2019-04-28 22:02:25 -04:00
i_tcp.h
i_video.h
info.c Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD 2019-03-11 21:59:45 -05:00
info.h uncommited change... 2019-03-05 21:25:37 -05:00
k_kart.c Update k_kart.c 2019-04-10 03:16:46 -04:00
k_kart.h Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD 2019-03-11 21:59:45 -05:00
keys.h
lua_baselib.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
lua_blockmaplib.c
lua_consolelib.c
lua_hook.h New IntermissionThinker hook 2019-04-22 00:29:47 -04:00
lua_hooklib.c New IntermissionThinker hook 2019-04-22 00:29:47 -04:00
lua_hud.h
lua_hudlib.c
lua_infolib.c
lua_libs.h
lua_maplib.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
lua_mathlib.c
lua_mobjlib.c
lua_playerlib.c Allow reading ticcmd latency 2019-03-16 02:19:43 -05:00
lua_script.c
lua_script.h
lua_skinlib.c Fix my fuckups 2019-03-06 22:28:06 -06:00
lua_thinkerlib.c
lzf.c
lzf.h
m_aatree.c
m_aatree.h
m_anigif.c
m_anigif.h
m_argv.c
m_argv.h
m_bbox.c
m_bbox.h
m_cheat.c Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
m_cheat.h
m_cond.c
m_cond.h
m_dllist.h
m_fixed.c
m_fixed.h
m_menu.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
m_menu.h Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
m_misc.c
m_misc.h
m_queue.c
m_queue.h
m_random.c
m_random.h
m_swap.h
Makefile Merge branch 'next' into md3-vanilla-kart 2019-03-20 19:50:20 -05:00
Makefile.cfg TravisCI: add option for GCC 8.1 2019-03-09 19:41:56 -05:00
md5.c
md5.h Use consts in place of some 16s 2019-03-09 16:46:55 -06:00
mserv.c Fix differing signedness compare 2019-04-30 13:03:13 -07:00
mserv.h
p5prof.h
p_ceilng.c
p_enemy.c Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
p_floor.c
p_inter.c Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
p_lights.c
p_local.h Remove P_CanRunOnWater 2019-03-11 00:28:30 -05:00
p_map.c Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
p_maputl.c Remove P_CanRunOnWater 2019-03-11 00:28:30 -05:00
p_maputl.h
p_mobj.c Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
p_mobj.h Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
p_polyobj.c
p_polyobj.h
p_pspr.h Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
p_saveg.c Fix bad merge in map data archiving code 2019-03-16 14:56:56 -05:00
p_saveg.h
p_setup.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
p_setup.h
p_sight.c
p_slopes.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
p_slopes.h
p_spec.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
p_spec.h
p_telept.c
p_tick.c
p_tick.h
p_user.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
r_bsp.c
r_bsp.h
r_data.c
r_data.h
r_defs.h Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
r_draw.c
r_draw.h Cache colormaps everywhere to avoid memory leaks 2019-03-16 00:39:52 -05:00
r_draw8.c
r_draw16.c
r_local.h
r_main.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
r_main.h
r_plane.c Use long double suffix 2019-03-02 15:56:44 -08:00
r_plane.h
r_segs.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
r_segs.h
r_sky.c
r_sky.h
r_splats.c
r_splats.h
r_state.h
r_things.c Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
r_things.h Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
s_sound.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
s_sound.h Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
screen.c
screen.h
sounds.c
sounds.h
st_stuff.c
st_stuff.h
string.c
t_facon.c
t_fsin.c
t_ftan.c
t_tan2a.c
tables.c
tables.h
tmap.nas
tmap.s
tmap_asm.s
tmap_mmx.nas
tmap_vc.nas
v_video.c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 2019-05-06 22:40:12 -05:00
v_video.h
vid_copy.s
w_wad.c Merge branch 'master' into next 2019-03-25 18:08:36 +00:00
w_wad.h Move modified check on -file addons later in startup 2019-03-10 19:44:31 -05:00
y_inter.c Merge branch 'intermission-think' into 'next' 2019-04-26 19:25:18 -04:00
y_inter.h
z_zone.c
z_zone.h