stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 02:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
SRB2/src
History
Wolfy 484bb9535c Merge branch 'more-slope-fixes' into 'next' 
More slope fixes (aka sorry guys I made another quick SUGOI fix)

Another slopes fix branch!

This branch currently includes a fix for:
* Knuckles gliding into a slope while in 2D mode causes him to try to "climb" on air above them, if the original non-sloped height is higher. Unfortunately he still tries to grab onto places that he can't really climb on, but at least now it's on the slope itself and not in mid-air lol. This issue is encountered in SUGOI's Retro Hill Zone, if you want to check for yourselves.
* Bustable FOF-busting code for both players AND pushables not accounting for slopes
* (Unrelated to slopes): Fix FF_SHATTERBOTTOM FOFs acting like THZ goop when stood on; I added this fix as a bonus because I encountered it in a test map of mine for the bustables fix

(Other fixes may or may not appear here in the near future, I haven't decided yet. Don't wait on me to get in any further fixes before merging, that said)

See merge request !110
2016-09-04 19:34:29 -04:00
..
android Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
blua NULL checks 2016-06-13 10:07:10 -04:00
djgppdos Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
dummy SRB2 2.1 release 2014-03-15 13:11:35 -04:00
hardware Take out fixedheight-based hacks for checking if floor or ceiling! Use an "isceiling" boolean for that instead 2016-07-27 19:56:21 +01:00
locale SRB2 2.1 release 2014-03-15 13:11:35 -04:00
nds Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
sdl Merge branch 'master' into next 2016-07-21 18:49:33 -04:00
sdl12 Revert "Merge branch 'RemoveINetC' into 'master'" 2016-07-21 14:42:00 -04:00
win32 Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
win32ce New HD SRB2 icon by VAdaPEga. 2015-03-01 20:07:56 -05:00
.gitignore SRB2 2.1 release 2014-03-15 13:11:35 -04:00
am_map.c gcc: clear uninitialized warnings in am_map.c 2016-05-27 14:22:02 -04:00
am_map.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07: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 copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
b_bot.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
byteptr.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
CMakeLists.txt Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
command.c NULL checks 2016-06-13 10:07:10 -04:00
command.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
comptime.c Branch and revision information in builds 2016-03-14 12:43:08 -04:00
config.h.in update patch stuff again. 2016-05-04 05:43:05 -07:00
console.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
console.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_clisrv.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_clisrv.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_event.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_main.c Detect if -warp's parm is actually a valid map name (MAPxx or plain number), and print an "invalid map name" message if not 2016-07-28 16:07:26 +01:00
d_main.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
d_net.c Revert "Merge branch 'RemoveINetC' into 'master'" 2016-07-21 14:42:00 -04:00
d_net.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_netcmd.c D_MD5PasswordPass, fixup 2016-05-28 19:51:10 -04:00
d_netcmd.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_netfil.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_netfil.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_player.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_think.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_ticcmd.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
dehacked.c Merge branch 'master' into next 2016-07-11 16:10:40 -04:00
dehacked.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
doomdata.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
doomdef.h Disable netplay for DirectDraw builds 2016-08-13 10:03:17 -04:00
doomstat.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
doomtype.h Merge branch 'macosx-hacking' into 'master' 2016-07-21 15:38:46 -04:00
endian.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
f_finale.c F_EndCutScene now sets cutsceneover to true BEFORE running Y_EndGame and the like, not AFTER 2016-08-25 17:58:54 +01:00
f_finale.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
f_wipe.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
fastcmp.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
filesrch.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
filesrch.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
g_game.c If the game becomes modified during a record attack run, end it 2016-08-19 22:18:43 -07:00
g_game.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
g_input.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
g_input.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
g_state.h Remove extern for unused "oncontinuescreen" variable 2016-05-18 17:41:11 +01:00
hu_stuff.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
hu_stuff.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
i_addrinfo.c MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
i_addrinfo.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_joy.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_net.h Revert "Merge branch 'RemoveINetC' into 'master'" 2016-07-21 14:42:00 -04:00
i_sound.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_system.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_tcp.c NONET should also disable UPNP support 2016-08-13 10:12:14 -04:00
i_tcp.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_video.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
info.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
info.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
keys.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_baselib.c Reinforcing encapsulation I originally broke down to allow for P_GetMobjGravity. 2016-06-09 18:16:13 +01:00
lua_consolelib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_hook.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_hooklib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_hud.h More consistent comment. 2016-08-19 00:07:32 +01:00
lua_hudlib.c The ability to disable weapon rings, as heavily requested by Lat and Speedwagon for their high effort character .wads and selfishly also desired to make thokker less hacky. 2016-08-19 00:06:12 +01:00
lua_infolib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_libs.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_maplib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_mathlib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_mobjlib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_playerlib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_script.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_script.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_skinlib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_thinkerlib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07: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 Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
m_anigif.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_anigif.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_argv.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_argv.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_bbox.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_bbox.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_cheat.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_cheat.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_cond.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_cond.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_dllist.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_fixed.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_fixed.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_menu.c If the game becomes modified during a record attack run, end it 2016-08-19 22:18:43 -07:00
m_menu.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_misc.c Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
m_misc.h Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
m_queue.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_queue.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_random.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_random.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_swap.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
Makefile Merge branch 'master' into next 2016-07-21 18:49:33 -04:00
Makefile.cfg Merge branch 'macosx-hacking' into 'master' 2016-07-21 15:38:46 -04:00
md5.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
md5.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
mserv.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
mserv.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p5prof.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_ceilng.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_enemy.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_floor.c Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. 2016-06-09 14:16:02 +01:00
p_inter.c strings return by M_GetText() can not be changed 2016-06-13 11:11:02 -04:00
p_lights.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_local.h Merge branch 'master' into next 2016-07-11 16:10:40 -04:00
p_map.c BONUS UNRELATED FIX: Fix FF_SHATTERBOTTOM FOFs acting like THZ goop when stood on 2016-09-02 22:53:55 +01:00
p_maputl.c Solid midtextures now account for "infinite" repeats 2016-08-27 17:14:21 +01: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 Merge branch 'more-slope-fixes' into 'next' 2016-09-04 19:34:29 -04:00
p_mobj.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
p_polyobj.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_polyobj.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_pspr.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_saveg.c P_NetUnArchivePlayers doesn't like having "inline" either 2016-05-27 14:49:11 +01:00
p_saveg.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_setup.c clean up warning done in setup-fixes 2016-06-19 12:48:35 -04:00
p_setup.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_sight.c Added P_LoadReject function to properly check if REJECT lump is valid or not when loading it, so P_CheckSight can avoid accessing it if not. 2016-06-11 18:45:56 +01:00
p_slopes.c ...completely misunderstood the reasons we weren't merging toast_slopes, mom holy fuck i'm stupid and bad 2016-06-20 00:20:20 +01:00
p_slopes.h P_ReverseQuantiseMomentumToSlope is now a function. (I was thinking about a macro, but couldn't get it down.) 2016-06-12 19:27:34 +01:00
p_spec.c Leave a note to anyone foolish enough to try to fix this 2016-08-07 12:17:31 -05:00
p_spec.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_telept.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_tick.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_tick.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_user.c Fix players and pushables not accounting for slopes on bustable FOFs 2016-09-02 21:41:45 +01:00
r_bsp.c MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
r_bsp.h Remove unused drawfunc_t function typedef 2016-05-24 14:38:31 +01:00
r_data.c MSVC: kill level 3 warnings 2016-05-22 00:44:12 -04:00
r_data.h wad and lumps are unsigned, not signed 2016-07-23 23:02:10 -04:00
r_defs.h Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. 2016-06-09 14:16:02 +01:00
r_draw.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_draw.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_draw8.c Fix R_DrawColumnShadowed_8 crash encountered in FuriousFox's map 2016-07-24 18:54:01 +01:00
r_draw16.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_local.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_main.c expanded comment for future generations 2016-08-13 15:07:40 +01:00
r_main.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_plane.c MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
r_plane.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
r_segs.c Fixed typo of mine that lead to the ceiling part of GFZ2's tunnel section being rendered wrongly 2016-07-20 15:11:36 +01:00
r_segs.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_sky.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_sky.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_splats.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_splats.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
r_state.h Fix player 1 and player 2 affecting whether the other can see skyboxes or not 2016-05-18 18:20:56 +01:00
r_things.c Merge branch 'sprite-loading-tweaks' into 'master' 2016-08-07 16:33:15 -04:00
r_things.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
s_sound.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
s_sound.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
screen.c FUNCMATH fun 2016-06-12 16:08:48 -04:00
screen.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
sounds.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
sounds.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
st_stuff.c Merge branch 'nights_bugfixes_i_almost_put_in_internal' into 'next' 2016-09-04 19:27:12 -04:00
st_stuff.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
string.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07: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 copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
tables.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
tmap.nas copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
tmap.s copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
tmap_asm.s copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
tmap_mmx.nas copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
tmap_vc.nas copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
v_video.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
v_video.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
vid_copy.s copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
w_wad.c Fix crash reported by FuriousFox at http://mb.srb2.org/showthread.php?t=41536 2016-06-02 20:16:25 +01:00
w_wad.h Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
y_inter.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
y_inter.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
z_zone.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
z_zone.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00