..
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
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +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
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
command.h
comptime.c
config.h.in
Add textures.kart, re-define DEVELOP mode,
2018-11-03 03:17:20 -04: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
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
d_clisrv.h
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
d_event.h
d_main.c
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00: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
d_netfil.h
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
Some tweaking
2018-11-12 17:09:37 -05:00
dehacked.h
doomdata.h
doomdef.h
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
doomstat.h
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -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
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -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
filesrch.h
g_game.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
g_game.h
Merge branch 'master' into staff_names
2018-11-08 14:47:38 -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
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
k_kart.h
Merge branch 'master' into lua-improvement
2018-11-08 14:50:30 -05:00
keys.h
lua_baselib.c
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
lua_consolelib.c
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
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
Some tweaking
2018-11-12 17:09:37 -05: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
Some tweaking
2018-11-12 17:09:37 -05: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
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00: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
Prevent using kartdebug cvars in Time Attack.
2018-11-09 20:16:12 +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
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05: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
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
2018-11-10 21:14:53 +00:00
p_setup.h
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
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -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 'sfx-clean'
2018-11-12 04:26:02 -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
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
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -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
Use S2 rips on the title screen
2018-11-11 19:22:15 -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
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