..
android
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
blua
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
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 https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
2018-11-18 18:26:50 +00:00
locale
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
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_again
2018-11-18 18:26:50 +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 branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
2018-11-18 18:26:50 +00: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
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
am_map.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
am_map.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Android.mk
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
asm_defs.inc
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
b_bot.c
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
b_bot.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
config.h.in
Update ASSET_HASH_PATCH_KART for the latest patch.kart
2018-11-18 18:28:46 +00:00
console.c
forgot whitespaces....
2018-11-17 22:23:23 +01: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 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
2018-11-18 18:26:50 +00:00
d_clisrv.h
Move the player 3 and 4 CMD defines to the correct place.
2018-11-18 12:32:59 +00:00
d_event.h
A lot lol
2017-12-16 22:32:43 -05:00
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
Change splitscreen into UINT8, fix HUD slightly more
2017-12-18 20:59:04 -05:00
d_netcmd.c
Change defaults of these
2018-11-22 20:54:28 -05:00
d_netcmd.h
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
2018-11-18 18:26:50 +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
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
Fix SKINCOLOR_ prefix not registering in Lua
2018-11-19 22:38:54 -05:00
dehacked.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
doomdata.h
Hundreds of tweaks
2018-06-19 20:20:06 -04:00
doomdef.h
v1.0.1 prep
2018-11-18 04:00:05 -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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
f_finale.c
Fix for waiting player screen animation
2018-11-18 06:34:29 -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
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
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
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
Allow turning while respawning
2018-11-21 20:29:21 -05:00
g_game.h
Title demos don't interrupt the music
2018-11-13 21:01:59 -05:00
g_input.c
Swap gc_lookback and gc_brake's default binded keys on controllers. (see the first issue in http://mb.srb2.org/showpost.php?p=802758&postcount=30 )
2018-11-18 19:31:07 +00:00
g_input.h
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
g_state.h
Getting there.
2018-01-27 20:59:29 -05:00
hu_stuff.c
Fix the player in 16th not being visible in rankings
2018-11-18 20:05:17 +00: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
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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
i_joy.h
Fix splitscreen joystick
2018-07-03 15:32:26 -04:00
i_net.h
-Added a timeout for game state downloading to prevent definitive join freezes in some cases. The timeout has a minimum value of "jointimeout" and gets higher as the game state grows in size
2017-01-13 20:53:52 +01:00
i_sound.h
Clean up warnings
2018-11-14 10:52:16 -05:00
i_system.h
some joystick fixes
2017-12-24 08:20:58 -05:00
i_tcp.c
Merge branch 'master' into next
2018-11-08 20:50:58 +00:00
i_tcp.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
i_video.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
info.c
Remove duplicate/removed objects
2018-11-18 03:43:33 -05:00
info.h
Remove duplicate/removed objects
2018-11-18 03:43:33 -05:00
k_kart.c
Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately
2018-11-21 19:30:00 -05:00
k_kart.h
Merge branch 'master' into lua-improvement
2018-11-08 14:50:30 -05:00
keys.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
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
Hundreds of tweaks
2018-06-19 20:20:06 -04:00
lua_mobjlib.c
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
lua_playerlib.c
Lots of cmd restructuring.
2018-06-05 17:12:42 -04:00
lua_script.c
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
lua_script.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
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
Rewrote thinkers.iterate
to handle invalid pointers elegantly.
2017-05-27 14:03:27 -05:00
lzf.c
define SRTICT_ALIGN to - if the system is x86/x64 system
2016-07-23 23:26:08 -04:00
lzf.h
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
m_aatree.c
Split AA trees code from m_misc.c/.h into m_aatree.c/.h
2016-06-05 21:29:40 +01:00
m_aatree.h
m_aatree: add newline
2016-12-22 19:39:37 -05:00
m_anigif.c
Squash various warnings
2018-11-14 21:53:57 +00:00
m_anigif.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
m_argv.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
m_argv.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
m_bbox.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
m_bbox.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
m_fixed.c
Correct C FixedMul() off-by-one errors
2018-05-20 22:55:21 +03:00
m_fixed.h
Comment out sdl12/SRB2CE/cehelp.h include in m_fixed.h
2017-09-14 21:29:38 +01:00
m_menu.c
Updated the one important modified game print that most people see to be more descriptive
2018-11-18 05:48:10 -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
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
2018-11-18 18:26:50 +00:00
m_misc.h
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
m_queue.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
m_queue.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
m_random.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
m_random.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
m_swap.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Makefile
Add Kart files to Makefile
2018-11-15 19:17:49 -05:00
Makefile.cfg
Build: do not error on FALLTHURs
2017-10-27 19:49:55 -04:00
md5.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
md5.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
mserv.c
Merge remote-tracking branch 'refs/remotes/srb2public/master'
2018-01-02 22:59:43 -05:00
mserv.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
p5prof.h
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
p_ceilng.c
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
p_enemy.c
Make SPB slightly fairer on conveyors
2018-11-21 22:26:33 -05:00
p_floor.c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
2018-11-18 18:26:50 +00:00
p_inter.c
Move countdown setting to P_CheckRacers
2018-11-19 22:37:24 -05:00
p_lights.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
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
Fix squishing on mobj scale maps
2018-11-21 19:40:56 -05:00
p_maputl.c
Created R_GetTextureNum to make sure top/bottom/midtexture texture ids are always valid in rendering code for both software and OpenGL (and also for the Solid Midtexture effect physics code)
2016-12-16 21:38:53 +00:00
p_maputl.h
P_LineOpening now takes a mobj_t argument, instead of relying on tmthing
2016-08-13 21:41:18 +01:00
p_mobj.c
Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately
2018-11-21 19:30:00 -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
A lot lol
2017-12-16 22:32:43 -05:00
p_polyobj.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
p_pspr.h
Chee wanted paper sprites' code, so here it is for the public to see.
2016-08-22 22:54:30 +01:00
p_saveg.c
The motherload: all of my Lua is hardcoded
2018-10-29 05:00:08 -04:00
p_saveg.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
p_setup.c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
2018-11-18 18:26:50 +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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
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
Remove drift & pogo spring on hit and a few other places
2018-11-21 19:00:14 -05:00
p_spec.h
v1.3.04 - The Bouncy One
2017-04-17 13:20:52 -04:00
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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
p_user.c
Move countdown setting to P_CheckRacers
2018-11-19 22:37:24 -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
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
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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
r_local.h
what is this bullshit?!
2018-03-12 01:21:35 -04:00
r_main.c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
2018-11-18 18:26:50 +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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
r_sky.c
Rendering fixes ahoy!
2017-12-29 14:50:16 -05:00
r_sky.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
r_splats.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
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
Be more consistent with how we lock kartspeed/kartweight
2018-11-20 02:59:10 -05: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
Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy
2018-11-13 18:14:59 +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
Make level white fade use timeinmap instead of leveltime
2018-11-17 16:54:56 +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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
t_facon.c
remove blank lines at EOF of new files
2016-05-13 00:12:51 -04:00
t_fsin.c
remove blank lines at EOF of new files
2016-05-13 00:12:51 -04:00
t_ftan.c
remove blank lines at EOF of new files
2016-05-13 00:12:51 -04:00
t_tan2a.c
remove blank lines at EOF of new files
2016-05-13 00:12:51 -04:00
tables.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
tables.h
Merge branch 'upstream/next' into zarrotsu_vanillamerge
2017-02-17 20:14:55 +00:00
tmap.nas
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
tmap.s
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
tmap_asm.s
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
tmap_mmx.nas
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
tmap_vc.nas
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
v_video.c
Default gr_md2 to on
2018-11-17 20:55:12 -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
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
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
Allow yeah in splitscreen
2018-11-20 00:10:54 -05:00
y_inter.h
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
z_zone.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
z_zone.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00