| .. |
|
android
|
Merge remote-tracking branch 'srb2public/next'
|
2018-11-07 16:15:14 -05:00 |
|
blua
|
Build: kill GCC 7's implicit-fallthrough warning
|
2017-09-28 09:39:47 -04:00 |
|
djgppdos
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
dummy
|
Merge remote-tracking branch 'srb2public/next'
|
2018-11-07 16:15:14 -05:00 |
|
hardware
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
locale
|
|
|
|
nds
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
sdl
|
AXISBRAKE, take out GameController stuff for now
|
2018-12-02 19:33:09 -06:00 |
|
sdl12
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
win32
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
win32ce
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
.gitignore
|
|
|
|
am_map.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
am_map.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
Android.mk
|
|
|
|
asm_defs.inc
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
b_bot.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -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
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
command.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
command.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
comptime.c
|
|
|
|
config.h.in
|
Update the patch.kart hash. Again.
|
2018-12-03 00:21:11 -05:00 |
|
console.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
console.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
d_clisrv.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
d_clisrv.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
d_event.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
d_main.c
|
Update GPL notice
|
2018-11-30 00:15:14 -05:00 |
|
d_main.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
d_net.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
d_net.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
d_netcmd.c
|
Do 800 instead
|
2018-11-30 03:36:44 -05:00 |
|
d_netcmd.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
d_netfil.c
|
Fixes to merge process
|
2018-11-29 10:07:35 -05:00 |
|
d_netfil.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
d_player.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
d_think.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
d_ticcmd.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
dehacked.c
|
Forgotten include
|
2018-11-30 17:07:30 -05:00 |
|
dehacked.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
doomdata.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
doomdef.h
|
Merge branch 'master' into merge-next
|
2018-11-29 09:46:46 -05:00 |
|
doomstat.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
doomtype.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
endian.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
f_finale.c
|
Fixes to merge process
|
2018-11-29 10:07:35 -05:00 |
|
f_finale.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
f_wipe.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
fastcmp.h
|
|
|
|
filesrch.c
|
Enable pk3 in addons menu
|
2018-11-29 10:07:53 -05:00 |
|
filesrch.h
|
Enable pk3 in addons menu
|
2018-11-29 10:07:53 -05:00 |
|
g_game.c
|
AXISBRAKE, take out GameController stuff for now
|
2018-12-02 19:33:09 -06:00 |
|
g_game.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
g_input.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
g_input.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
g_state.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
hu_stuff.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
hu_stuff.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
i_addrinfo.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
i_addrinfo.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
i_joy.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -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
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
i_tcp.c
|
Merge branch 'master' into next
|
2018-11-25 20:39:17 +00: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
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
info.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
k_kart.c
|
Back to numstarposts/2
|
2018-12-02 02:29:47 -05:00 |
|
k_kart.h
|
Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s
|
2018-11-28 19:41:01 +01:00 |
|
keys.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
lua_baselib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_consolelib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_hook.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_hooklib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_hud.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_hudlib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_infolib.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
lua_libs.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_maplib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_mathlib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_mobjlib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_playerlib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_script.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_script.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
lua_skinlib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
lua_thinkerlib.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -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
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
m_anigif.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_argv.c
|
Do not remove newlines from the end of files
|
2018-11-24 17:30:49 -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
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
m_cheat.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
m_cond.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
m_cond.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
m_dllist.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_fixed.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_fixed.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_menu.c
|
Enable pk3 in addons menu
|
2018-11-29 10:07:53 -05:00 |
|
m_menu.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
m_misc.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
m_misc.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -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
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
Makefile.cfg
|
Makefile: disable implicit-fallthroug warnings
|
2018-11-26 19:38:14 -05:00 |
|
md5.c
|
|
|
|
md5.h
|
|
|
|
mserv.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -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
|
Un-nerf Mines on activation tic
|
2018-11-30 03:09:49 -05:00 |
|
p_floor.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_inter.c
|
Back to numstarposts/2
|
2018-12-02 02:29:47 -05:00 |
|
p_lights.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
p_local.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_map.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -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
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_mobj.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_polyobj.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_polyobj.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
p_pspr.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_saveg.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_saveg.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
p_setup.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_setup.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_sight.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
p_slopes.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_slopes.h
|
Merge branch 'master' into next
|
2018-11-25 20:39:17 +00:00 |
|
p_spec.c
|
Back to numstarposts/2
|
2018-12-02 02:29:47 -05:00 |
|
p_spec.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_telept.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_tick.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
p_tick.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
p_user.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_bsp.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_bsp.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_data.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_data.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_defs.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_draw.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_draw.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_draw8.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -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
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_main.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_plane.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_plane.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_segs.c
|
Colormap crash fix
|
2018-11-30 03:09:01 -05:00 |
|
r_segs.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
r_sky.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_sky.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
r_splats.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
r_splats.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
r_state.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_things.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
r_things.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
s_sound.c
|
Fixes to merge process
|
2018-11-29 10:07:35 -05:00 |
|
s_sound.h
|
Fixes to merge process
|
2018-11-29 10:07:35 -05:00 |
|
screen.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
screen.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
sounds.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
sounds.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
st_stuff.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
st_stuff.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -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
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
tables.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
tmap.nas
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
tmap.s
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
tmap_asm.s
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
tmap_mmx.nas
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
tmap_vc.nas
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
v_video.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
v_video.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
vid_copy.s
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
w_wad.c
|
Fix this memory freeing
|
2018-11-29 22:31:20 -05:00 |
|
w_wad.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
y_inter.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
y_inter.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
|
z_zone.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
z_zone.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
