..
android
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
blua
djgppdos
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
dummy
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
hardware
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00: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
Squash various warnings
2018-11-14 21:53:57 +00:00
sdl12
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
win32
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -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
am_map.h
Android.mk
asm_defs.inc
b_bot.c
b_bot.h
byteptr.h
byteptr.h: include endian.h to help define WRITE/READ macros correctly according to endianness
2018-11-08 17:16:54 +00:00
CMakeLists.txt
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
command.c
Bugfixes:
2018-11-14 15:28:17 +00:00
command.h
Address review
2018-09-20 17:11:11 -04:00
comptime.c
config.h.in
maps.kart quick patch
2018-11-14 04:16:13 -05:00
console.c
Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1.
2018-11-05 12:49:28 +00:00
console.h
Brown text colormap instead of teal, revert sky-blue
2018-10-04 18:07:56 -04:00
d_clisrv.c
Ensure MS packets are sent correctly
2018-11-16 12:01:57 -05:00
d_clisrv.h
Ensure MS packets are sent correctly
2018-11-16 12:01:57 -05:00
d_event.h
d_main.c
Remove music.dta from loading
2018-11-15 19:17:06 -05:00
d_main.h
D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function.
2018-11-07 21:21:36 +00: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' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge
2018-11-10 22:29:37 +00:00
d_netcmd.h
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
d_netfil.c
Don't allow kart files to be downloaded
2018-11-15 19:18:04 -05:00
d_netfil.h
Addons menu.
2018-08-28 21:08:47 +01:00
d_player.h
Merge branch 'master' into brake-drift
2018-11-01 17:37:10 -04:00
d_think.h
d_ticcmd.h
dehacked.c
add TOL_TV to dehacked
2018-11-16 12:04:24 -05:00
dehacked.h
doomdata.h
doomdef.h
Remove "Kart" in front of the version number
2018-11-14 01:12:58 -05:00
doomstat.h
add TOL_TV to dehacked
2018-11-16 12:04:24 -05:00
doomtype.h
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
endian.h
f_finale.c
Minor credits issues
2018-11-16 12:05:57 -05:00
f_finale.h
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
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
* Add support for .kart files.
2018-08-29 14:19:08 +01:00
g_game.c
Skip errors for staff ghosts
2018-11-14 05:20:51 -05:00
g_game.h
Title demos don't interrupt the music
2018-11-13 21:01:59 -05:00
g_input.c
Minor whitespace
2018-10-15 20:34:53 -04:00
g_input.h
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
g_state.h
hu_stuff.c
Merge branch 'master' into lua-hudlib
2018-11-03 22:25:33 +01:00
hu_stuff.h
HU_Start should not have FUNCMATH, it has side effects
2018-11-07 21:37:42 +00:00
i_addrinfo.c
i_addrinfo.h
i_joy.h
i_net.h
i_sound.h
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
i_system.h
i_tcp.c
Merge branch 'master' into next
2018-11-08 20:50:58 +00:00
i_tcp.h
i_video.h
info.c
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
2018-11-11 17:30:30 -05:00
info.h
MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone.
2018-11-05 23:06:28 +00:00
k_kart.c
Fix Eggman shrink bug.
2018-11-17 14:41:08 +00:00
k_kart.h
Merge branch 'master' into lua-improvement
2018-11-08 14:50:30 -05:00
keys.h
lua_baselib.c
Add S_StopSoundByID to Lua
2018-11-14 15:35:16 -05: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
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
lua_hooklib.c
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
lua_hud.h
Resolved merge conflict and renamed gamerankings to minirankings
2018-10-31 15:18:05 +01:00
lua_hudlib.c
Merge branch 'master' into 'lua-hudlib'
2018-11-07 16:57:11 -05:00
lua_infolib.c
lua_libs.h
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
lua_maplib.c
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
lua_mathlib.c
lua_mobjlib.c
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
lua_playerlib.c
lua_script.c
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05: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
Squash various warnings
2018-11-14 21:53:57 +00: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
Hide SMK Cup until you've unlocked the Chao Cup on EXTRAS unless you've unlocked the Chao Cup. Fits with our modus operandi of minimising Mario exposure, while still having it for the committed.
2018-11-14 15:29:32 +00: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
Squash various warnings
2018-11-14 21:53:57 +00:00
m_menu.h
* Add numbers to the staff name strings as Sryder requested.
2018-11-07 21:42:10 +00: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 remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
m_queue.c
m_queue.h
m_random.c
m_random.h
m_swap.h
Makefile
Add Kart files to Makefile
2018-11-15 19:17:49 -05:00
Makefile.cfg
md5.c
md5.h
mserv.c
mserv.h
p5prof.h
p_ceilng.c
p_enemy.c
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
2018-11-11 17:30:30 -05:00
p_floor.c
Two scale things I noticed.
2018-10-19 21:32:29 +01:00
p_inter.c
Fix Eggman shrink bug.
2018-11-17 14:41:08 +00: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
MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone.
2018-11-05 23:06:28 +00:00
p_maputl.c
p_maputl.h
p_mobj.c
Squash various warnings
2018-11-14 21:53:57 +00:00
p_mobj.h
P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway)
2018-11-07 21:00:38 +00:00
p_polyobj.c
p_polyobj.h
p_pspr.h
p_saveg.c
The motherload: all of my Lua is hardcoded
2018-10-29 05:00:08 -04:00
p_saveg.h
p_setup.c
Squash various warnings
2018-11-14 21:53:57 +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
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
p_slopes.h
Merge branch 'next' into lua-slopes
2018-10-20 18:31:06 +01:00
p_spec.c
Squash various warnings
2018-11-14 21:53:57 +00: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
Double spectator movement speed to keep up with action better, scale it with map size
2018-11-14 14:41:28 -05:00
r_bsp.c
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
r_bsp.h
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00: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
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
r_draw.c
r_draw.h
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
r_draw8.c
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
r_draw16.c
r_local.h
r_main.c
Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1.
2018-11-05 12:49:28 +00: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
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
r_segs.c
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
r_segs.h
r_sky.c
r_sky.h
r_splats.c
r_splats.h
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00: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
Set stats to what we want them to be for R2 anyway
2018-10-30 20:11:15 -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
Title demos don't interrupt the music
2018-11-13 21:01:59 -05:00
s_sound.h
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
screen.c
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
screen.h
Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency
2018-10-11 17:05:13 +01:00
sounds.c
Title demos don't interrupt the music
2018-11-13 21:01:59 -05:00
sounds.h
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
2018-11-11 17:30:30 -05: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
ST_Ticker also should not have FUNCMATH, as it also has side effects
2018-11-07 21:45:27 +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
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05: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 remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
w_wad.h
Addons menu.
2018-08-28 21:08:47 +01:00
y_inter.c
Realign YOU ARE THIS PLAYER highlight on non-green-res voting
2018-11-11 14:36:24 +00:00
y_inter.h
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
z_zone.c
z_zone.h