.. |
android
|
Merge remote-tracking branch 'srb2public/next'
|
2018-11-07 16:15:14 -05:00 |
blua
|
Backport the Blockmap library I made two years ago
|
2018-11-30 17:11:11 +00: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
|
Missed (unused?) viewpoint strings
|
2018-12-03 12:20:19 -05:00 |
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
|
JoyInfo1 -> JoyInfo
|
2018-12-29 13:55:58 -06:00 |
sdl12
|
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug' into unfuck-gamepads
|
2018-12-06 13:07:39 -06:00 |
win32
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-12-03 00:31:23 -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
|
Edited even more things to say "SRB2Kart"
|
2018-12-05 20:40:58 -05:00 |
command.c
|
Register execversion and remove CV_SAVE because we write manually
|
2018-12-06 12:28:30 -05:00 |
command.h
|
Implement EXECVERSION consvar to invalidate previous versions' default config values
|
2018-12-06 06:28:34 -05:00 |
comptime.c
|
|
|
config.h.in
|
Merge remote-tracking branch 'srb2public/master' into merge-next
|
2018-12-05 19:21:13 -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
|
Turns out we don't need this
|
2019-01-02 14:47:24 -06:00 |
d_clisrv.h
|
Merge branch 'next' into 21-version
|
2018-12-02 15:45:07 +00: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
|
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks
|
2018-12-27 16:21:51 -06:00 |
d_netcmd.h
|
Merge branch 'next' into 21-version
|
2018-12-02 15:45:07 +00: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
|
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug' into unfuck-gamepads
|
2018-12-06 13:07:39 -06: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
|
Disable DEVELOP, since this is ready to merge
|
2018-12-27 21:23:32 -06:00 |
doomstat.h
|
Merge branch 'next' into 21-version
|
2018-12-02 15:45:07 +00: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
|
Add Miku's author to credits.
|
2018-12-05 21:58:26 -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
|
Print GameController info when detected, use proper 360 controller defaults for triggers
|
2018-12-14 11:50:53 -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
|
Kill default d-pad bindings aside from "Show Rankings"
|
2018-12-24 21:30:42 -06:00 |
g_input.h
|
Add gc_viewpoint from Kart
|
2018-12-03 11:50:57 -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 branch 'next' into 21-version
|
2018-12-02 15:45:07 +00: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
|
Buff item hitbox size
|
2018-12-03 17:30:27 -05:00 |
info.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-11-29 08:49:50 -05:00 |
k_kart.c
|
Actually, best of both:
|
2018-12-05 23:28:44 -05:00 |
k_kart.h
|
Revert "Add player taunt functions to Lua"
|
2018-12-04 11:39:45 -05:00 |
keys.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
lua_baselib.c
|
Revert "Add player taunt functions to Lua"
|
2018-12-04 11:39:45 -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
|
Merge branch 'next' into 21-version
|
2018-12-02 15:45:07 +00:00 |
lua_hook.h
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-12-03 00:31:23 -05:00 |
lua_hooklib.c
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-12-03 00:31:23 -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-12-03 00:31:23 -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-12-03 00:31:23 -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
|
Fix 2 of the Unsuffixed Float Constant warnings
|
2018-11-29 22:12:14 +00: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
|
Fix an issue where gamepad options for player 4 ended up binding settings for player 3 instead.
|
2018-12-27 18:13:13 -06:00 |
m_menu.h
|
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug' into unfuck-gamepads
|
2018-12-06 13:07:39 -06:00 |
m_misc.c
|
Register execversion and remove CV_SAVE because we write manually
|
2018-12-06 12:28:30 -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
|
Merge branch 'master' into tiny-makefile-fix
|
2018-11-29 21:57:47 +00: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
|
Actually, best of both:
|
2018-12-05 23:28:44 -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
|
Buff item hitbox size
|
2018-12-03 17:30:27 -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 branch 'next' into 21-version
|
2018-12-02 15:45:07 +00: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-12-05 20:46:48 -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
|
Merge remote-tracking branch 'srb2public/next' into merge-next
|
2018-12-03 00:31:23 -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 |