SRB2/src
toaster 97072d9faa Merge branch 'snaptoground-fix' into 'master'
Snap to ground fix

Closes #165

See merge request STJr/SRB2Internal!274
2019-08-03 16:22:47 -04:00
..
android Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
blua Merge errors for compile 2019-01-07 17:05:20 -05:00
djgppdos Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
dummy Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
hardware Correct some extant fuckups. 2019-07-14 14:21:32 +01:00
locale WIP 20190101 merge 2019-01-02 01:09:15 -05:00
sdl Fix building with MSVC 2019-07-29 19:02:45 -04:00
win32 Fix building with MSVC 2019-07-29 19:02:45 -04:00
.gitignore
am_map.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
am_map.h Remove MINIAUTOMAP code 2018-12-12 18:53:13 -03:00
Android.mk
apng.c Merge branch 'apng-oh-shit-fixes' into 'master' 2019-02-28 12:00:58 -08:00
apng.h Merge branch 'apng-oh-shit-fixes' into 'master' 2019-02-28 12:00:58 -08:00
asm_defs.inc Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
b_bot.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
b_bot.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
byteptr.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
CMakeLists.txt Merge branch 'public-notpublic-libopenmpt' into 'master' 2019-06-21 17:03:53 -04:00
command.c Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
command.h Don't count down wait timer when executing a command 2019-04-14 15:17:47 -07:00
comptime.c
config.h.in Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD 2019-02-03 11:05:22 +01:00
console.c Fix console back color not being correct. 2019-06-26 22:08:17 -04:00
console.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_clisrv.c Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 2019-07-13 01:42:03 +02:00
d_clisrv.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_event.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
d_main.c Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
d_main.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
d_net.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_net.h Remove double define 2019-02-27 16:05:43 -05:00
d_netcmd.c Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 2019-07-13 01:42:03 +02:00
d_netcmd.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_netfil.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_netfil.h Merge branch 'addons_menu' into 'master' 2018-12-15 20:46:42 -05:00
d_player.h Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup 2019-06-26 20:43:37 +01:00
d_think.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
d_ticcmd.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
dehacked.c Add a blue variant of the pole banner & change some doomednums. 2019-07-14 17:30:33 +02:00
dehacked.h Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD 2019-02-03 11:05:22 +01:00
doomdata.h Remove character-specific flags, replace them with net-only/no-net flags 2019-07-03 00:10:22 +02:00
doomdef.h Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready. 2019-07-04 14:09:38 +01:00
doomstat.h Merge branch 'public_next' 2019-06-29 20:55:58 +01:00
doomtype.h Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt 2019-06-11 17:48:00 -04:00
endian.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
f_finale.c On second thoughts I'll go back to 8 for length in these variables, since as far as I can tell the code doesn't need it to be longer anyway 2019-07-20 16:30:30 +01:00
f_finale.h Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168). 2019-07-30 17:48:13 +01:00
f_wipe.c Merge remote-tracking branch 'origin/master' into menu-execs 2019-05-02 18:47:43 -04:00
fastcmp.h
filesrch.c Resolved filesrch.c conflicts (20190101 public merge) 2019-01-07 02:54:26 -05:00
filesrch.h Hide kart-specific addons behavior behind USE_KART 2018-12-16 16:07:47 -05:00
g_game.c * Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated. 2019-07-30 17:24:21 +01:00
g_game.h * Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated. 2019-07-30 17:24:21 +01:00
g_input.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
g_input.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
g_state.h Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168). 2019-07-30 17:48:13 +01:00
hu_stuff.c Remove some more 2.1-related ringslinger offsets to the chat. 2019-06-22 20:17:09 +01:00
hu_stuff.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
i_addrinfo.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
i_addrinfo.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
i_joy.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
i_net.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
i_sound.h Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:14:49 -05:00
i_system.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
i_tcp.c Merge branch 'public_next' 2019-03-28 14:19:02 +00:00
i_tcp.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
i_video.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
info.c Make MANIASPHERES' #define'd away stuff also recreatable with SOC, since I want to release it publically if the team don't want it. 2019-07-29 21:06:17 +01:00
info.h Add a blue variant of the pole banner & change some doomednums. 2019-07-14 17:30:33 +02:00
keys.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
lua_baselib.c Merge branch 'titlemaplua' into 'master' 2019-08-03 13:14:46 -04:00
lua_blockmaplib.c I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here. 2019-07-13 13:43:22 +01:00
lua_consolelib.c * Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases. 2019-07-30 17:57:57 +01:00
lua_hook.h "PlayerCanDamage" hook! 2019-06-19 12:55:05 +01:00
lua_hooklib.c "PlayerCanDamage" hook! 2019-06-19 12:55:05 +01:00
lua_hud.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_hudlib.c With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it): 2019-06-18 17:55:57 +01:00
lua_infolib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_libs.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_maplib.c * Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases. 2019-07-30 17:57:57 +01:00
lua_mathlib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_mobjlib.c * Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases. 2019-07-30 17:57:57 +01:00
lua_playerlib.c * Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases. 2019-07-30 17:57:57 +01:00
lua_script.c Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 2019-07-13 01:42:03 +02:00
lua_script.h * Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases. 2019-07-30 17:57:57 +01:00
lua_skinlib.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_thinkerlib.c * Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases. 2019-07-30 17:57:57 +01:00
lzf.c
lzf.h
m_aatree.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_aatree.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_anigif.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_anigif.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_argv.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_argv.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_bbox.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_bbox.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_cheat.c Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 2019-07-13 01:42:03 +02:00
m_cheat.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_cond.c Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD 2019-02-03 11:05:22 +01:00
m_cond.h In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC 2019-02-03 14:32:07 +01:00
m_dllist.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_fixed.c bland 2018-12-20 18:52:51 -03:00
m_fixed.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_menu.c Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead. 2019-07-15 20:25:57 +01:00
m_menu.h On second thoughts I'll go back to 8 for length in these variables, since as far as I can tell the code doesn't need it to be longer anyway 2019-07-20 16:30:30 +01:00
m_misc.c Merge branch 'public_next' 2019-06-21 22:13:39 +01:00
m_misc.h Merge branch 'public_next' 2019-06-09 20:04:08 +01:00
m_queue.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_queue.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_random.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_random.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_swap.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Makefile Merge branch 'public-notpublic-libopenmpt' into 'master' 2019-06-21 17:03:53 -04:00
Makefile.cfg Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
md5.c
md5.h
mserv.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
mserv.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
p5prof.h
p_ceilng.c Basic multiple thinker list implementation 2019-04-20 22:39:22 +02:00
p_enemy.c Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 2019-07-13 01:42:03 +02:00
p_floor.c Fix !150, too 2019-07-18 00:16:01 +01:00
p_inter.c Merge branch 'anglestuff' into 'master' 2019-08-02 13:10:23 -04:00
p_lights.c Basic multiple thinker list implementation 2019-04-20 22:39:22 +02:00
p_local.h Fix spindash being broken in quicksand 2019-07-17 21:33:18 +01:00
p_map.c Merge branch 'master' into snaptoground-fix 2019-08-03 18:23:09 +01:00
p_maputl.c Whoops the second 2019-08-01 20:48:24 +01:00
p_maputl.h Add openfloorrover and openceilingrover vars so that PIT_CheckLine can update tmfloorrover and tmceilingrover properly via P_LineOpening 2019-08-01 18:56:00 +01:00
p_mobj.c Merge branch 'bustables_misc' into 'master' 2019-08-02 13:16:53 -04:00
p_mobj.h With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it): 2019-06-18 17:55:57 +01:00
p_polyobj.c Remove commented out P_CheckSector calls and add extra comments explaining the situation 2019-08-03 19:06:45 +01:00
p_polyobj.h Implement displacement-based polyobject rotation. 2019-04-05 11:50:59 +02:00
p_pspr.h Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
p_saveg.c Fix building with MSVC 2019-07-29 19:02:45 -04:00
p_saveg.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_setup.c Merge branch 'emeraldfixes' into 'master' 2019-08-02 13:08:20 -04:00
p_setup.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_sight.c Whoops, forgot to make P_CheckSight support slopes for same-sector FOF plane checking. 2019-05-27 21:18:02 +01:00
p_slopes.c Remove character-specific flags, replace them with net-only/no-net flags 2019-07-03 00:10:22 +02:00
p_slopes.h Add back the p_slopes.h header guard 2019-04-21 18:05:16 +02:00
p_spec.c Merge branch 'linedef-award-rings' into 'master' 2019-08-03 16:21:58 -04:00
p_spec.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_telept.c Realised I forgot to do this. Without this commit, the drawangle update stuff is useless :V 2019-06-22 17:33:37 +01:00
p_tick.c * Fix "exitlevel" being counted as a special stage success despite not giving you an emerald by inverting stagefailed's default value, since there's only a limited number of ways you can WIN at a special stage. 2019-07-30 16:44:40 +01:00
p_tick.h Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 2019-07-13 01:42:03 +02:00
p_user.c Merge branch 'bustables_misc' into 'master' 2019-08-02 13:16:53 -04:00
r_bsp.c Remove remnants of portalcullsector. 2019-06-10 17:13:04 +02:00
r_bsp.h viewx/viewy also need to be stored/restored. 2019-06-06 13:31:48 +02:00
r_data.c Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 2019-07-13 01:42:03 +02:00
r_data.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_defs.h Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2019-05-06 20:20:57 +01:00
r_draw.c Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'"" 2019-07-03 00:58:02 +01:00
r_draw.h With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it): 2019-06-18 17:55:57 +01:00
r_draw8.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_draw16.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_local.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_main.c Improve rain/weather. 2019-06-22 16:50:30 +01:00
r_main.h Improve rain/weather. 2019-06-22 16:50:30 +01:00
r_plane.c Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane. 2019-06-09 22:48:54 +02:00
r_plane.h Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane. 2019-06-09 22:48:54 +02:00
r_portal.c Properly take skybox viewpoint angle into account. 2019-06-11 14:47:58 +02:00
r_portal.h Remove remnants of portalcullsector. 2019-06-10 17:13:04 +02:00
r_segs.c Fixed crash regarding opening reallocating. A thousand thanks go for MonsterIestyn for figuring this out. 2019-06-09 20:04:07 +02:00
r_segs.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_sky.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
r_sky.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_splats.c Software plane fixes 2018-12-14 14:08:25 -03:00
r_splats.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
r_state.h Moving away more portal-related global vars to r_portal. 2019-06-03 13:33:12 +02:00
r_things.c Fix building with MSVC 2019-07-29 19:02:45 -04:00
r_things.h viewx/viewy also need to be stored/restored. 2019-06-06 13:31:48 +02:00
s_sound.c Fix building with MSVC 2019-07-29 19:02:45 -04:00
s_sound.h Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt 2019-06-11 17:48:00 -04:00
screen.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
screen.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
sounds.c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 2019-07-09 19:52:52 +01:00
sounds.h Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 2019-07-09 19:52:52 +01:00
st_stuff.c Add a condition to bail on the HUD's ring counting down calculation if nummaprings is 0 or -1. 2019-08-03 12:25:46 +01:00
st_stuff.h Merge branch 'public_next' 2019-06-09 20:04:08 +01:00
string.c Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
t_facon.c
t_fsin.c
t_ftan.c
t_tan2a.c
tables.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tables.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tmap.nas WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tmap.s WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tmap_asm.s Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
tmap_mmx.nas WIP 20190101 merge 2019-01-02 01:09:15 -05:00
tmap_vc.nas Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
v_video.c Fix console back color not being correct. 2019-06-26 22:08:17 -04:00
v_video.h Merge errors for compile 2019-01-07 17:05:20 -05:00
vid_copy.s Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
w_wad.c Merge branch 'public_next' 2019-06-29 20:55:58 +01:00
w_wad.h Merge branch 'public_next' 2019-06-29 20:55:58 +01:00
y_inter.c Have the ring bonus in MP Special Stages be based on the shared sum of all players'. 2019-08-02 23:56:25 +01:00
y_inter.h Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
z_zone.c WIP 20190101 merge 2019-01-02 01:09:15 -05:00
z_zone.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00