RingRacers/src
Sryder 2d6c7959ed Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge
# Conflicts:
#	.gitignore
#	libs/zlib/projects/visualc10/zlib.vcxproj
#	src/Makefile
#	src/am_map.c
#	src/d_main.c
#	src/dehacked.c
#	src/doomdef.h
#	src/g_game.c
#	src/hardware/hw_main.c
#	src/hardware/hw_md2.c
#	src/info.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_bsp.c
#	src/r_plane.c
#	src/r_segs.c
#	src/r_things.c
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/win32/Srb2win-vc10.vcxproj
#	src/win32/Srb2win.ico
#	src/y_inter.c
2017-02-17 20:03:10 +00:00
..
android Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
blua Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
djgppdos Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
dummy SRB2 2.1 release 2014-03-15 13:11:35 -04:00
hardware Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
locale SRB2 2.1 release 2014-03-15 13:11:35 -04:00
nds Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
sdl Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
sdl12 Some position code 2017-02-12 23:25:06 -05:00
win32 Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
win32ce Some position code 2017-02-12 23:25:06 -05:00
.gitignore SRB2 2.1 release 2014-03-15 13:11:35 -04:00
am_map.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
am_map.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
Android.mk SRB2 2.1 release 2014-03-15 13:11:35 -04:00
asm_defs.inc SRB2 2.1 release 2014-03-15 13:11:35 -04:00
b_bot.c Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
b_bot.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
byteptr.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
CMakeLists.txt Remove p_fab.c 2016-03-31 20:42:01 -05:00
command.c Some position code 2017-02-12 23:25:06 -05:00
command.h Some position code 2017-02-12 23:25:06 -05:00
comptime.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
config.h.in update patch stuff again. 2016-05-04 05:43:05 -07:00
console.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
console.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
d_clisrv.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
d_clisrv.h Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
d_event.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
d_main.c Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
d_main.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
d_net.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
d_net.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
d_netcmd.c Some position code 2017-02-12 23:25:06 -05:00
d_netcmd.h Some position code 2017-02-12 23:25:06 -05:00
d_netfil.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
d_netfil.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
d_player.h Some position code 2017-02-12 23:25:06 -05:00
d_think.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
d_ticcmd.h Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
dehacked.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
dehacked.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
doomdata.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
doomdef.h Fixed position code, added some item numbers 2017-02-16 21:33:15 -05:00
doomstat.h Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
doomtype.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
endian.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
f_finale.c Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
f_finale.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
f_wipe.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
fastcmp.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
filesrch.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
filesrch.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
g_game.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
g_game.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
g_input.c Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
g_input.h Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
g_state.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
hu_stuff.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
hu_stuff.h S_PLAY states, HUD stuff 2016-08-14 23:51:25 -04:00
i_addrinfo.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
i_addrinfo.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
i_joy.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
i_net.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
i_sound.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
i_system.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
i_tcp.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
i_tcp.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
i_video.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
info.c Fixed position code, added some item numbers 2017-02-16 21:33:15 -05:00
info.h Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
k_kart.c Finished the item roulette numbers, thank god. 2017-02-17 10:26:41 -05:00
k_kart.h Fixed position code, added some item numbers 2017-02-16 21:33:15 -05:00
keys.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_baselib.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_consolelib.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_hook.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_hooklib.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_hud.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_hudlib.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_infolib.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_libs.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_maplib.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_mathlib.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_mobjlib.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_playerlib.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
lua_script.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_script.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lua_skinlib.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
lua_thinkerlib.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
lzf.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
lzf.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_anigif.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_anigif.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_argv.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_argv.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_bbox.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_bbox.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_cheat.c Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
m_cheat.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_cond.c Some Color code, Kart powers 2016-08-11 21:42:16 -04:00
m_cond.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_dllist.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_fixed.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_fixed.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_menu.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
m_menu.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_misc.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_misc.h Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
m_queue.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_queue.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_random.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_random.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_swap.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
Makefile Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
Makefile.cfg Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
md5.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
md5.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
mserv.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
mserv.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p5prof.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_ceilng.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_enemy.c Updates done a while ago... Not 100% sure what they were. :x 2016-11-20 23:23:10 -05:00
p_floor.c Updates done a while ago... Not 100% sure what they were. :x 2016-11-20 23:23:10 -05:00
p_inter.c Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
p_lights.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_local.h Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
p_map.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
p_maputl.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_maputl.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_mobj.c Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
p_mobj.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_polyobj.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_polyobj.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_pspr.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_saveg.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
p_saveg.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_setup.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
p_setup.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_sight.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_slopes.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_slopes.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_spec.c Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
p_spec.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_telept.c S_PLAY states, HUD stuff 2016-08-14 23:51:25 -04:00
p_tick.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_tick.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
p_user.c Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
r_bsp.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_bsp.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_data.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_data.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_defs.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_draw.c Some Color code, Kart powers 2016-08-11 21:42:16 -04:00
r_draw.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_draw8.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_draw16.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_local.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_main.c Finished the item roulette numbers, thank god. 2017-02-17 10:26:41 -05:00
r_main.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_plane.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_plane.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_segs.c Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
r_segs.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_sky.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_sky.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_splats.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_splats.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_state.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
r_things.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
r_things.h Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
s_sound.c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
s_sound.h Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
screen.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
screen.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
sounds.c Updates done a while ago... Not 100% sure what they were. :x 2016-11-20 23:23:10 -05:00
sounds.h Some position code 2017-02-12 23:25:06 -05:00
st_stuff.c S_PLAY states, HUD stuff 2016-08-14 23:51:25 -04:00
st_stuff.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
string.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
t_facon.c remove blank lines at EOF of new files 2016-05-13 00:12:51 -04:00
t_fsin.c remove blank lines at EOF of new files 2016-05-13 00:12:51 -04:00
t_ftan.c remove blank lines at EOF of new files 2016-05-13 00:12:51 -04:00
t_tan2a.c remove blank lines at EOF of new files 2016-05-13 00:12:51 -04:00
tables.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
tables.h Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
tmap.nas Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
tmap.s Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
tmap_asm.s Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
tmap_mmx.nas Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
tmap_vc.nas Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
v_video.c S_PLAY states, HUD stuff 2016-08-14 23:51:25 -04:00
v_video.h S_PLAY states, HUD stuff 2016-08-14 23:51:25 -04:00
vid_copy.s Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
w_wad.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
w_wad.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
y_inter.c Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 2017-02-17 20:03:10 +00:00
y_inter.h Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
z_zone.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
z_zone.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00