RingRacers/src
2020-08-09 20:45:29 -04:00
..
android The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
blua Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
djgppdos The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
dummy The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
hardware Merge r_opengl.c/h 2020-08-09 20:45:29 -04:00
locale
nds The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
sdl Resolve conflicts on the SDL interface files. 2020-05-29 16:17:26 -04:00
sdl12 The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
win32 Easy conflicts - src/win32/win_dll.c and src/win32/win_vid.c 2020-08-06 18:10:16 -04:00
win32ce The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
.gitignore
am_map.c Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
am_map.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Android.mk
apng.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
apng.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
asm_defs.inc Update copyright year to 2020 2020-02-19 14:08:45 -08:00
b_bot.c Remove instances of HAVE_BLUA that actually disable Lua now 2020-05-10 19:59:56 -07:00
b_bot.h Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
byteptr.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
CMakeLists.txt Merge CMakeLists.txt and src/CMakeLists.txt 2020-08-06 01:08:42 -04:00
command.c Merge conflict resolution for command.c 2020-05-31 23:42:59 +01:00
command.h Merge lua_consolelib.c 2020-08-05 09:58:12 -04:00
comptime.c
config.h.in Merge config.h.in 2020-08-06 01:17:22 -04:00
console.c Merge conflict resolution for console.c/h 2020-06-01 00:10:44 +01:00
console.h Merge conflict resolution for console.c/h 2020-06-01 00:10:44 +01:00
d_clisrv.c Utilize SendKick more 2020-08-02 14:07:02 -04:00
d_clisrv.h Merge d_clisrv.c/h 2020-08-02 13:56:43 -04:00
d_event.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
d_main.c Merge d_main.c 2020-08-02 14:45:23 -04:00
d_main.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
d_net.c Merge d_net.c 2020-08-02 14:15:29 -04:00
d_net.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
d_netcmd.c Merge d_netcmd.c/h 2020-08-02 15:38:53 -04:00
d_netcmd.h More d_netcmd.h 2020-08-02 16:36:40 -04:00
d_netfil.c Merge d_netfil.c 2020-08-02 16:40:22 -04:00
d_netfil.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
d_player.h Merge d_player.h 2020-08-08 19:29:30 -04:00
d_think.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
d_ticcmd.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
dehacked.c Merge y_inter.c/h 2020-08-09 15:47:37 -04:00
dehacked.h Merge dehacked.c/h 2020-08-02 16:59:24 -04:00
doomdata.h Merge doomdata.h 2020-08-04 01:05:57 -04:00
doomdef.h Merge doomdef.h 2020-08-06 17:42:29 -04:00
doomstat.h Merge doomstat.h 2020-08-06 17:53:35 -04:00
doomtype.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
endian.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
f_finale.c Merge f_finale.c/h 2020-08-06 15:35:07 -04:00
f_finale.h Merge f_finale.c/h 2020-08-06 15:35:07 -04:00
f_wipe.c Merge f_wipe.c 2020-08-02 17:24:44 -04:00
fastcmp.h
filesrch.c Merge filesrch.c 2020-08-02 18:03:59 -04:00
filesrch.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
g_demo.c Finish removals properly 2020-08-09 14:46:03 -04:00
g_demo.h Finish removals properly 2020-08-09 14:46:03 -04:00
g_game.c Merge g_game.c/h 2020-08-09 14:43:13 -04:00
g_game.h Merge g_game.c/h 2020-08-09 14:43:13 -04:00
g_input.c Merge g_input.c/h 2020-08-04 01:41:00 -04:00
g_input.h Merge g_input.c/h 2020-08-04 01:41:00 -04:00
g_splitscreen.c Replace even more ints with INT32 2020-03-21 13:18:17 -07:00
g_state.h A bunch of easy files (1-5 conflicts) 2020-08-05 14:34:17 -04:00
hu_stuff.c Merge hu_stuff.c/h 2020-08-06 10:52:00 -04:00
hu_stuff.h Merge hu_stuff.c/h 2020-08-06 10:52:00 -04:00
i_addrinfo.c Tested to be compile with Mingw64 9.1.0 2020-05-11 18:43:24 -07:00
i_addrinfo.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
i_joy.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
i_net.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
i_sound.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
i_system.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
i_tcp.c -clientport (it's back!) and -serverport, which is an alias to -port 2020-05-03 18:35:52 -07:00
i_tcp.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
i_video.h Merge branch 'sdlglcontext' into 'master' 2020-04-09 19:51:20 -04:00
info.c Merge info.c/h 2020-08-06 17:38:29 -04:00
info.h Merge info.c/h 2020-08-06 17:38:29 -04:00
k_battle.c toaster suggestions 2020-03-22 20:29:58 -04:00
k_battle.h Move item box counter stuff into k_battle 2020-03-22 16:23:56 -04:00
k_bheap.c void out heap after done asserting, to fix an unused variable compile error I get 2020-03-21 23:09:05 -04:00
k_bheap.h Include license/copyright headers on new files. 2020-03-22 00:16:32 +00:00
k_bot.c Minimum prediction distance 2020-05-28 18:46:33 -04:00
k_bot.h Make K_BotTopSpeedRubberband a function 2020-05-28 16:46:21 -04:00
k_botitem.c Split bot code into multiple files & clean up 2020-05-24 15:08:10 -04:00
k_botsearch.c Rewrite K_BotHatesThisSector slightly 2020-05-28 17:58:35 -04:00
k_collide.c Fix items vs springs crash 2020-05-03 20:12:01 -04:00
k_collide.h
k_color.c Merge info.c/h 2020-08-06 17:38:29 -04:00
k_color.h Skincolor code cleanup 2020-05-11 02:28:25 -04:00
k_kart.c Make K_BotTopSpeedRubberband a function 2020-05-28 16:46:21 -04:00
k_kart.h Merge branch 'master' into pet-robo 2020-05-18 15:18:37 -04:00
k_pathfind.c Include license/copyright headers on new files. 2020-03-22 00:16:32 +00:00
k_pathfind.h Include license/copyright headers on new files. 2020-03-22 00:16:32 +00:00
k_pwrlv.c No modify power level for beating/losing to players with no power level set 2020-05-28 13:42:11 -04:00
k_pwrlv.h Use PWRLVRECORD_START instead of PWRLVRECORD_DEF to encourage more spread 2020-03-21 23:01:51 -04:00
k_waypoint.c Merge branch 'master' into pet-robo 2020-05-18 15:18:37 -04:00
k_waypoint.h Multiply the default radius of 384 by mobjscale, but not user set radiuses 2020-05-04 17:54:43 -07:00
keys.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
lua_baselib.c Merge lua_baselib.c 2020-08-05 14:00:35 -04:00
lua_blockmaplib.c Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
lua_consolelib.c Merge lua_consolelib.c 2020-08-05 09:58:12 -04:00
lua_hook.h Merge lua_hook.h 2020-08-04 00:58:37 -04:00
lua_hooklib.c Merge lua_hooklib.c 2020-08-05 14:03:24 -04:00
lua_hud.h A bunch of easy files (1-5 conflicts) 2020-08-05 14:34:17 -04:00
lua_hudlib.c Merge lua_hudlib.c 2020-08-05 14:07:26 -04:00
lua_infolib.c The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
lua_libs.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
lua_maplib.c Merge lua_maplib.c 2020-08-05 14:04:13 -04:00
lua_mathlib.c Merge lua_mathlib.c 2020-08-05 14:04:34 -04:00
lua_mobjlib.c Merge lua_mobjlib.c 2020-08-04 00:53:06 -04:00
lua_playerlib.c Merge lua_playerlib.c 2020-08-05 14:15:21 -04:00
lua_script.c Merge lua_script.c 2020-08-04 00:45:49 -04:00
lua_script.h Merge lua_script.h 2020-08-05 14:03:53 -04:00
lua_skinlib.c Merge lua_skinlib.c 2020-08-05 14:16:17 -04:00
lua_thinkerlib.c Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
lzf.c
lzf.h
m_aatree.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
m_aatree.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
m_anigif.c Resolve m_anigif.c conflicts. 2020-05-31 19:39:42 -04:00
m_anigif.h Local Color Table for GIF movie mode 2020-03-23 17:47:08 -07:00
m_argv.c Forgot includes 2020-03-24 15:48:42 -07:00
m_argv.h Add support for srb2:// URL handler (server links) 2020-03-21 01:36:39 -05:00
m_bbox.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
m_bbox.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
m_cheat.c Merge m_cheat.c 2020-08-02 17:06:27 -04:00
m_cheat.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
m_cond.c Merge m_cond.c/h 2020-08-05 10:15:04 -04:00
m_cond.h Merge r_things.c/h 2020-08-08 19:08:19 -04:00
m_dllist.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
m_fixed.c The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
m_fixed.h use ATTRINLINE rather than inline to match some of the other functions in this file, though I'm told modern compilers ignore inlining info as they actually decide themselves now 2020-03-30 20:25:56 +01:00
m_menu.c Replace m_menu with ours 2020-08-09 20:08:11 -04:00
m_menu.h Merge m_menu.h 2020-08-09 20:36:59 -04:00
m_misc.c Resolve m_misc.c and z_zone.c 2020-06-03 20:16:48 -04:00
m_misc.h A bunch of easy files (1-5 conflicts) 2020-08-05 14:34:17 -04:00
m_queue.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
m_queue.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
m_random.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
m_random.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
m_swap.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Makefile Merge Makefile 2020-08-09 15:54:36 -04:00
Makefile.cfg Merge Makefile.cfg 2020-08-09 15:52:32 -04:00
md5.c
md5.h
mserv.c The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
mserv.h added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case) 2020-05-12 18:42:16 +01:00
p5prof.h
p_ceilng.c The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
p_enemy.c Merge p_enemy.c 2020-08-06 11:00:49 -04:00
p_floor.c Merge p_floor.c 2020-08-06 11:07:33 -04:00
p_inter.c Merge p_inter.c 2020-08-09 15:15:52 -04:00
p_lights.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
p_local.h Merge p_local.h 2020-08-08 17:57:45 -04:00
p_map.c p_map & p_maputl merge conflicts 2020-05-30 13:53:30 -04:00
p_maputl.c p_map & p_maputl merge conflicts 2020-05-30 13:53:30 -04:00
p_maputl.h Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
p_mobj.c Merge p_mobj.c/h 2020-08-08 15:22:29 -04:00
p_mobj.h Merge p_mobj.c/h 2020-08-08 15:22:29 -04:00
p_polyobj.c A bunch of easy files (1-5 conflicts) 2020-08-05 14:34:17 -04:00
p_polyobj.h polywaypointdata_t: Turn reverse and continuous into flags 2020-05-16 09:49:30 +02:00
p_pspr.h Merge p_pspr.h 2020-08-08 18:11:19 -04:00
p_saveg.c Merge p_saveg.c 2020-08-02 18:37:58 -04:00
p_saveg.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
p_setup.c Missed this in p_setup.c 2020-08-06 17:55:36 -04:00
p_setup.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
p_sight.c Merge p_sight.c 2020-08-06 11:12:19 -04:00
p_slopes.c Merge p_slopes.c 2020-08-06 17:58:30 -04:00
p_slopes.h Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
p_spec.c Merge p_spec.c/h 2020-08-09 15:31:23 -04:00
p_spec.h Merge p_spec.c/h 2020-08-09 15:31:23 -04:00
p_telept.c A bunch of easy files (1-5 conflicts) 2020-08-05 14:34:17 -04:00
p_tick.c Merge p_tick.c 2020-08-08 15:40:24 -04:00
p_tick.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
p_user.c Merge p_user.c 2020-08-09 19:11:46 -04:00
r_bsp.c Merge r_bsp.c/h 2020-08-06 19:33:01 -04:00
r_bsp.h Merge r_bsp.c/h 2020-08-06 19:33:01 -04:00
r_data.c Merge r_data.c/h 2020-08-06 19:20:51 -04:00
r_data.h Merge r_data.c/h 2020-08-06 19:20:51 -04:00
r_defs.h Merge src/r_defs.h 2020-08-06 18:36:30 -04:00
r_draw.c A bunch of easy files (1-5 conflicts) 2020-08-05 14:34:17 -04:00
r_draw.h Merge r_draw.h 2020-08-08 16:20:10 -04:00
r_draw8.c A bunch of easy files (1-5 conflicts) 2020-08-05 14:34:17 -04:00
r_draw8_npo2.c Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
r_draw16.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
r_local.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
r_main.c Merge r_main.c/h 2020-08-08 16:58:48 -04:00
r_main.h Merge r_main.c/h 2020-08-08 16:58:48 -04:00
r_patch.c Fix drop shadow and rotsprite code to use SHORT() 2020-05-02 17:13:16 +01:00
r_patch.h :) 2020-02-19 14:44:22 -08:00
r_plane.c Merge r_plane.c 2020-08-08 17:04:26 -04:00
r_plane.h Merge r_plane.c 2020-08-08 17:04:26 -04:00
r_portal.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
r_portal.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
r_segs.c Merge r_segs.c 2020-08-08 17:10:46 -04:00
r_segs.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
r_skins.c Merge r_things.c/h 2020-08-08 19:08:19 -04:00
r_skins.h Merge r_things.c/h 2020-08-08 19:08:19 -04:00
r_sky.c A bunch of easy files (1-5 conflicts) 2020-08-05 14:34:17 -04:00
r_sky.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
r_splats.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
r_splats.h Update copyright year to 2020 2020-02-19 14:08:45 -08:00
r_state.h Merge src/r_state.h 2020-08-06 18:17:12 -04:00
r_things.c Merge r_things.c/h 2020-08-08 19:08:19 -04:00
r_things.h Merge r_things.c/h 2020-08-08 19:08:19 -04:00
s_sound.c Merge src/s_sound.c/h 2020-08-06 16:56:41 -04:00
s_sound.h Merge src/s_sound.c/h 2020-08-06 16:56:41 -04:00
screen.c Merge screen.c 2020-08-02 18:58:11 -04:00
screen.h Merge screen.h 2020-08-05 15:11:15 -04:00
sounds.c Merge sounds.c/h 2020-08-09 19:02:53 -04:00
sounds.h Merge sounds.c/h 2020-08-09 19:02:53 -04:00
st_stuff.c Merge st_stuff.c/h 2020-08-09 20:23:09 -04:00
st_stuff.h Merge st_stuff.c/h 2020-08-09 20:23:09 -04:00
strcasestr.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
string.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
t_facon.c
t_fsin.c
t_ftan.c
t_tan2a.c
tables.c Update copyright year to 2020 2020-02-19 14:08:45 -08:00
tables.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
tmap.nas Update copyright year to 2020 2020-02-19 14:08:45 -08:00
tmap.s Update copyright year to 2020 2020-02-19 14:08:45 -08:00
tmap_asm.s Update copyright year to 2020 2020-02-19 14:08:45 -08:00
tmap_mmx.nas Update copyright year to 2020 2020-02-19 14:08:45 -08:00
tmap_vc.nas Update copyright year to 2020 2020-02-19 14:08:45 -08:00
v_video.c Merge v_video.c/h 2020-08-09 16:04:57 -04:00
v_video.h and h 2020-08-09 16:05:06 -04:00
vid_copy.s Update copyright year to 2020 2020-02-19 14:08:45 -08:00
w_wad.c Merge src/w_wad.c/h 2020-08-06 18:52:39 -04:00
w_wad.h Merge src/w_wad.c/h 2020-08-06 18:52:39 -04:00
y_inter.c Merge y_inter.c/h 2020-08-09 15:47:37 -04:00
y_inter.h Merge y_inter.c/h 2020-08-09 15:47:37 -04:00
z_zone.c Resolve m_misc.c and z_zone.c 2020-06-03 20:16:48 -04:00
z_zone.h Merge branch 'update-copyright-year' into 'master' 2020-02-21 20:59:56 -05:00