RingRacers/src
toaster 9ad5b9da80 Merge branch 'master' into 'chat-changes'
# Conflicts:
#   src/hu_stuff.c
2018-10-21 08:27:28 -04:00
..
android Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
blua
djgppdos Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
dummy Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
hardware Final weather stuff. 2018-10-14 22:32:34 +01: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 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
sdl12 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
win32 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01: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
am_map.h
Android.mk
asm_defs.inc
b_bot.c
b_bot.h
byteptr.h
CMakeLists.txt
command.c Hard Mode is an unlockable 2018-10-13 17:54:53 -04:00
command.h Address review 2018-09-20 17:11:11 -04:00
comptime.c
config.h.in DevEXE version 1.1.00: Added some MD5 checks, increased md2 triagle limit, temporarily disabled magnet 2017-02-20 20:08:24 -05:00
console.c Merge branch 'master' into 'chat-changes' 2018-10-21 08:27:28 -04:00
console.h Brown text colormap instead of teal, revert sky-blue 2018-10-04 18:07:56 -04:00
d_clisrv.c Merge branch 'master' into 'chat-changes' 2018-10-21 08:27:28 -04:00
d_clisrv.h Fix all of the joining ghost issues or desyncing 2018-09-30 16:20:01 -04:00
d_event.h A lot lol 2017-12-16 22:32:43 -05:00
d_main.c Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen 2018-10-16 22:13:45 +01:00
d_main.h Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
d_net.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
d_net.h
d_netcmd.c Merge branch 'master' into 'chat-changes' 2018-10-21 08:27:28 -04:00
d_netcmd.h Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
d_netfil.c Addons menu. 2018-08-28 21:08:47 +01:00
d_netfil.h Addons menu. 2018-08-28 21:08:47 +01:00
d_player.h New engine sounds 2018-10-08 21:31:55 -04:00
d_think.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
d_ticcmd.h Lots of cmd restructuring. 2018-06-05 17:12:42 -04:00
dehacked.c Merge branch 'sweet-new-kicks' into 'master' 2018-10-19 15:49:51 -04:00
dehacked.h
doomdata.h Hundreds of tweaks 2018-06-19 20:20:06 -04:00
doomdef.h Merge branch 'noclip-cam' into 'master' 2018-10-07 23:15:06 -04:00
doomstat.h Merge branch 'master' into no-spectate-griefing 2018-10-16 16:38:35 -04:00
doomtype.h Mirror Mode 2017-12-12 00:07:14 -05:00
endian.h
f_finale.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
f_finale.h Merge branch 'master' into sonicitems 2018-07-08 17:51:44 -04:00
f_wipe.c Do Oni's suggested changes to the wipe-based level intro fade. https://cdn.discordapp.com/attachments/270211093761097728/470690865279401994/kart0019.gif 2018-07-22 21:49:17 +01:00
fastcmp.h
filesrch.c Fix Sryder's crash (incorrect setting of dir_on when searching in subfolders). 2018-09-23 13:23:03 +01:00
filesrch.h * Add support for .kart files. 2018-08-29 14:19:08 +01:00
g_game.c Merge branch 'master' into 'chat-changes' 2018-10-21 08:27:28 -04:00
g_game.h Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
g_input.c Minor whitespace 2018-10-15 20:34:53 -04:00
g_input.h New bindable keys 2018-09-27 16:55:21 -04:00
g_state.h
hu_stuff.c Merge branch 'master' into 'chat-changes' 2018-10-21 08:27:28 -04:00
hu_stuff.h Merge branch 'master' into 'chat-changes' 2018-10-21 08:27:28 -04:00
i_addrinfo.c Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably: 2018-07-07 16:52:01 +01:00
i_addrinfo.h
i_joy.h Fix splitscreen joystick 2018-07-03 15:32:26 -04:00
i_net.h
i_sound.h Add an int to I_PlaySound to tell an interface which channel number SRB2 is using. 2018-10-13 23:01:11 +01:00
i_system.h
i_tcp.c SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general 2018-09-03 20:53:40 +01:00
i_tcp.h
i_video.h
info.c Merge branch 'sweet-new-kicks' into 'master' 2018-10-19 15:49:51 -04:00
info.h Last batch of tweaks 2018-10-10 14:56:50 -04:00
k_kart.c Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
k_kart.h Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
keys.h
lua_baselib.c Merge branch 'master' into 'chat-changes' 2018-10-21 08:27:28 -04:00
lua_consolelib.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 2018-08-07 21:20:27 +01:00
lua_hook.h Chat Manager 2018-06-15 05:20:01 -05:00
lua_hooklib.c Chat Manager 2018-06-15 05:20:01 -05:00
lua_hud.h
lua_hudlib.c Fade-in intro 2018-06-26 10:14:59 -04:00
lua_infolib.c
lua_libs.h
lua_maplib.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
lua_mathlib.c Hundreds of tweaks 2018-06-19 20:20:06 -04:00
lua_mobjlib.c Linked list bananas, hnext/hprev fixes 2018-06-16 19:57:08 -04:00
lua_playerlib.c Lots of cmd restructuring. 2018-06-05 17:12:42 -04:00
lua_script.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
lua_script.h
lua_skinlib.c
lua_thinkerlib.c
lzf.c
lzf.h
m_aatree.c
m_aatree.h m_aatree: add newline 2016-12-22 19:39:37 -05:00
m_anigif.c Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
m_anigif.h
m_argv.c
m_argv.h
m_bbox.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_bbox.h
m_cheat.c Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows. 2018-10-03 17:04:41 +01:00
m_cheat.h Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows. 2018-10-03 17:04:41 +01:00
m_cond.c Hard Mode is an unlockable 2018-10-13 17:54:53 -04:00
m_cond.h Hard Mode is an unlockable 2018-10-13 17:54:53 -04:00
m_dllist.h
m_fixed.c Correct C FixedMul() off-by-one errors 2018-05-20 22:55:21 +03:00
m_fixed.h
m_menu.c Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
m_menu.h Addons menu. 2018-08-28 21:08:47 +01:00
m_misc.c Don't allow non-keyboard keys to screenshot/gif in menus 2018-10-04 22:06:56 -04:00
m_misc.h Merge branch 'upstream/next' into zarrotsu_vanillamerge 2017-02-17 20:14:55 +00:00
m_queue.c
m_queue.h
m_random.c
m_random.h Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
m_swap.h
Makefile Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
Makefile.cfg
md5.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
md5.h
mserv.c
mserv.h
p5prof.h
p_ceilng.c
p_enemy.c Merge branch 'fix-mixed-declarations' into 'master' 2018-10-09 14:09:33 -04:00
p_floor.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
p_inter.c Merge branch 'no-spectate-griefing' into 'master' 2018-10-19 15:50:18 -04:00
p_lights.c
p_local.h Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
p_map.c Merge branch 'thinkerclean' into 'master' 2018-10-07 23:14:53 -04:00
p_maputl.c
p_maputl.h
p_mobj.c Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
p_mobj.h Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
p_polyobj.c
p_polyobj.h
p_pspr.h
p_saveg.c Merge branch 'master' into no-spectate-griefing 2018-10-16 16:38:35 -04:00
p_saveg.h
p_setup.c Merge branch 'no-spectate-griefing' into 'master' 2018-10-19 15:50:18 -04:00
p_setup.h One last thing - make the OpenGL level loading bar screen have the correct background colour. 2018-09-22 12:43:54 +01:00
p_sight.c
p_slopes.c Flip dynamic slope toggle. 2018-09-28 12:58:07 +01:00
p_slopes.h
p_spec.c Merge branch 'no-spectate-griefing' into 'master' 2018-10-19 15:50:18 -04:00
p_spec.h
p_telept.c Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows. 2018-10-03 17:04:41 +01:00
p_tick.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
p_tick.h
p_user.c Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
r_bsp.c Merge branch 'noclip-cam' into 'master' 2018-10-07 23:15:06 -04:00
r_bsp.h ssplayer -> viewnumber 2018-06-27 13:14:22 -04:00
r_data.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
r_data.h Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
r_defs.h
r_draw.c Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists... 2018-07-02 13:20:04 +01:00
r_draw.h
r_draw8.c Merge branch 'sonicitems' into encore 2018-08-10 23:22:28 +01:00
r_draw16.c
r_local.h
r_main.c Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
r_main.h Final weather stuff. 2018-10-14 22:32:34 +01:00
r_plane.c Revamp flat alignment to be consistent across all renderer functions except for the software slope renderer, which me and fickle tried our best at but couldn't get to work. (This is a backport of 2.2 code that slightly postdates the improved flat alignment Kart's had for a while.) 2018-09-27 18:11:43 +01:00
r_plane.h Encore mode - a fresh take on mirror mode! 2018-07-23 23:50:41 +01:00
r_segs.c Don't need thissec 2018-10-06 23:37:27 -04:00
r_segs.h
r_sky.c
r_sky.h
r_splats.c
r_splats.h Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably: 2018-07-07 16:52:01 +01:00
r_state.h Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
r_things.c Some token efforts to make singleplayer mode (accessible only via -warp and map mapxx -force) not COMPLETELY broken. 2018-10-17 13:40:17 +01:00
r_things.h Merge branch 'master' into sonicitems 2018-07-08 17:51:44 -04:00
s_sound.c Merge branch 'nextmerge_plus_rain' into 'master' 2018-10-16 16:36:18 -04:00
s_sound.h Don't look at this commit too closely until after netgame, I want to surprise yalls!! 2018-06-30 23:18:13 +01:00
screen.c Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably: 2018-07-07 16:52:01 +01:00
screen.h
sounds.c 1 minor, non-engine related change I wanted to make while I was at it: 2018-10-16 12:48:46 -04:00
sounds.h New engine sounds 2018-10-08 21:31:55 -04:00
st_stuff.c Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
st_stuff.h Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably: 2018-07-07 16:52:01 +01:00
string.c Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
t_facon.c
t_fsin.c
t_ftan.c
t_tan2a.c remove blank lines at EOF of new files 2016-05-13 00:12:51 -04:00
tables.c
tables.h
tmap.nas
tmap.s
tmap_asm.s Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
tmap_mmx.nas
tmap_vc.nas Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
v_video.c Merge branch 'master' into 'chat-changes' 2018-10-21 08:27:28 -04:00
v_video.h Brown text colormap instead of teal, revert sky-blue 2018-10-04 18:07:56 -04:00
vid_copy.s
w_wad.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 2018-10-14 21:52:05 +01:00
w_wad.h Addons menu. 2018-08-28 21:08:47 +01:00
y_inter.c < 2018-10-17 13:38:31 -04:00
y_inter.h
z_zone.c
z_zone.h