| .. |
|
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
|
As requested by Jeck:
|
2018-10-27 21:16:19 +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
|
|
|
|
console.c
|
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
|
2018-10-25 13:21:44 +02: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
|
|
|
|
d_main.c
|
Felt like cleaning up the character frame list. Definitely won't merge conflict with anything else.
|
2018-10-27 15:43:33 +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
|
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
|
2018-10-25 13:21:44 +02:00 |
|
d_netcmd.h
|
Merge branch 'master' into net-screen
|
2018-10-19 15:59:13 -04:00 |
|
d_netfil.c
|
|
|
|
d_netfil.h
|
|
|
|
d_player.h
|
Merge branch 'master' into fz-time-over
|
2018-10-24 21:20:51 -04:00 |
|
d_think.h
|
|
|
|
d_ticcmd.h
|
|
|
|
dehacked.c
|
Merge branch 'master' into fz-time-over
|
2018-10-24 21:39:02 -04:00 |
|
dehacked.h
|
|
|
|
doomdata.h
|
|
|
|
doomdef.h
|
Merge branch 'noclip-cam' into 'master'
|
2018-10-07 23:15:06 -04:00 |
|
doomstat.h
|
Resolved conflict
|
2018-10-25 01:35:55 +02:00 |
|
doomtype.h
|
|
|
|
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
|
|
|
|
f_wipe.c
|
|
|
|
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
|
|
|
|
g_game.c
|
Merge branch 'master' into chat-changes
|
2018-10-25 11:14:49 +02: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
|
Make the horizontal line at the bottom of the tab rankings use the duptweaks.
|
2018-10-30 22:09:04 +00:00 |
|
hu_stuff.h
|
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
|
2018-10-28 16:27:55 +00:00 |
|
i_addrinfo.c
|
|
|
|
i_addrinfo.h
|
|
|
|
i_joy.h
|
|
|
|
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
|
|
|
|
i_tcp.h
|
|
|
|
i_video.h
|
|
|
|
info.c
|
toaster: not good at stuff (signpost z offset fix)
|
2018-10-27 22:23:44 +01:00 |
|
info.h
|
Merge branch 'master' into fz-time-over
|
2018-10-24 21:39:02 -04:00 |
|
k_kart.c
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup
|
2018-10-30 22:08:17 +00:00 |
|
k_kart.h
|
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
|
2018-10-28 16:27:55 +00:00 |
|
keys.h
|
|
|
|
lua_baselib.c
|
Merge branch 'master' into chat-changes
|
2018-10-25 11:14:49 +02:00 |
|
lua_consolelib.c
|
|
|
|
lua_hook.h
|
|
|
|
lua_hooklib.c
|
|
|
|
lua_hud.h
|
|
|
|
lua_hudlib.c
|
|
|
|
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
|
|
|
|
lua_mobjlib.c
|
|
|
|
lua_playerlib.c
|
|
|
|
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
|
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
|
2018-10-28 16:27:55 +00:00 |
|
lua_thinkerlib.c
|
|
|
|
lzf.c
|
|
|
|
lzf.h
|
|
|
|
m_aatree.c
|
|
|
|
m_aatree.h
|
|
|
|
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
|
|
|
|
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
|
|
|
|
m_fixed.h
|
|
|
|
m_menu.c
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup
|
2018-10-30 22:08:17 +00:00 |
|
m_menu.h
|
Fixed the menu highlight thing
|
2018-10-25 19:41:14 +02: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
|
|
|
|
m_queue.c
|
|
|
|
m_queue.h
|
|
|
|
m_random.c
|
|
|
|
m_random.h
|
|
|
|
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
|
|
|
|
md5.h
|
|
|
|
mserv.c
|
|
|
|
mserv.h
|
|
|
|
p5prof.h
|
|
|
|
p_ceilng.c
|
|
|
|
p_enemy.c
|
Fix merges
|
2018-10-24 21:51:43 -04:00 |
|
p_floor.c
|
Two scale things I noticed.
|
2018-10-19 21:32:29 +01:00 |
|
p_inter.c
|
Merge branch 'karma-touchups' into 'master'
|
2018-10-25 14:06:22 -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 'master' into fz-time-over
|
2018-10-24 21:20:51 -04:00 |
|
p_maputl.c
|
|
|
|
p_maputl.h
|
|
|
|
p_mobj.c
|
Higher default scale, WANTED indicator scales properly
|
2018-10-27 20:56:11 -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 'new-spb' into 'master'
|
2018-10-24 16:04:29 -04:00 |
|
p_saveg.h
|
|
|
|
p_setup.c
|
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
|
2018-10-28 16:27:55 +00: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
|
New SPB
|
2018-10-18 04:43:50 -04:00 |
|
p_tick.h
|
|
|
|
p_user.c
|
Merge branch 'splitscreen-tuneup' into 'master'
|
2018-10-29 05:30:49 -04:00 |
|
r_bsp.c
|
Merge branch 'noclip-cam' into 'master'
|
2018-10-07 23:15:06 -04:00 |
|
r_bsp.h
|
|
|
|
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
|
|
|
|
r_draw.h
|
|
|
|
r_draw8.c
|
|
|
|
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
|
|
|
|
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
|
|
|
|
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
|
Fix Sonic's minimap icon not being properly initialised. (Experimenting with the online editor, since I'm low on time, but this is 100% correct and I'll make a new exe later.)
|
2018-10-29 06:57:45 -04:00 |
|
r_things.h
|
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
|
2018-10-28 16:27:55 +00:00 |
|
s_sound.c
|
Preface with splitscreen checks
|
2018-10-29 05:26:17 -04:00 |
|
s_sound.h
|
|
|
|
screen.c
|
|
|
|
screen.h
|
|
|
|
sounds.c
|
Merge branch 'master' into fz-time-over
|
2018-10-24 21:39:02 -04:00 |
|
sounds.h
|
Mementos hardcode
|
2018-10-20 21:17:13 +02:00 |
|
st_stuff.c
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup
|
2018-10-30 22:08:17 +00:00 |
|
st_stuff.h
|
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
|
2018-10-28 16:27:55 +00:00 |
|
string.c
|
|
|
|
t_facon.c
|
|
|
|
t_fsin.c
|
|
|
|
t_ftan.c
|
|
|
|
t_tan2a.c
|
|
|
|
tables.c
|
|
|
|
tables.h
|
|
|
|
tmap.nas
|
|
|
|
tmap.s
|
|
|
|
tmap_asm.s
|
|
|
|
tmap_mmx.nas
|
|
|
|
tmap_vc.nas
|
|
|
|
v_video.c
|
As requested by Jeck:
|
2018-10-27 21:16:19 +01: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
|
|
|
|
y_inter.c
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup
|
2018-10-30 22:08:17 +00:00 |
|
y_inter.h
|
|
|
|
z_zone.c
|
|
|
|
z_zone.h
|
|
|
