blankart/src
James R 9abdb855f9 Check that top of sprite is above plane or bottom is below
This fixes slightly raised fofs drawing on top of sprites that should be in
front of them. Previously would check that the bottom of the object was above
the plane. Now also uses sprite offsets like the fof seg sorting does.
2020-11-02 03:37:00 -08:00
..
android Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
blua Merge branch 'lua-polyobjects' into 'next' 2020-10-15 19:08:54 -04:00
dummy Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
hardware Put back in the improvements to HWR_CreateBlendedTexture 2020-10-28 16:20:11 -04:00
locale Cheese mode activate! 2020-07-01 16:37:36 -07:00
nds The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
sdl Fix module and chip music being SRB2 LOUD 2020-10-26 04:19:41 -07:00
sdl12 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
win32 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
win32ce The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
.gitignore
am_map.c Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
am_map.h
Android.mk
apng.c
apng.h
asm_defs.inc
byteptr.h Fuck you macro 2020-07-04 12:52:01 -07:00
CMakeLists.txt Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
command.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
command.h Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
comptime.c
config.h.in Update patch.pk3 2020-10-02 16:07:15 -07:00
console.c Use enum for better maintainability & error checking 2020-10-25 11:34:15 -04:00
console.h Use enum for better maintainability & error checking 2020-10-25 11:34:15 -04:00
d_clisrv.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
d_clisrv.h Merge master 2020-09-25 12:00:50 -04:00
d_event.h Another round of fixing up 2020-08-11 16:13:17 -04:00
d_main.c Use music.pk3 2020-10-27 17:20:57 -07:00
d_main.h
d_net.c YAY, round 2 2020-08-09 21:02:56 -04:00
d_net.h Use a random port when connecting 2020-08-19 18:16:53 -07:00
d_netcmd.c Fix cvars 2020-10-24 21:32:07 -04:00
d_netcmd.h Fix cvars 2020-10-24 21:32:07 -04:00
d_netfil.c Merge master 2020-09-25 12:00:50 -04:00
d_netfil.h Merge master 2020-09-25 12:00:50 -04:00
d_player.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
d_think.h
d_ticcmd.h Turning code overhaul 2020-09-22 00:35:44 -04:00
dehacked.c Add missing MFD_TRANSSUB to dehacked 2020-10-26 11:22:27 +00:00
dehacked.h Merge dehacked.c/h 2020-08-02 16:59:24 -04:00
discord.c Fix cvars 2020-10-24 21:32:07 -04:00
discord.h Dedicated servers can change discordinvites without needing RPC support 2020-08-30 23:20:06 -04:00
doomdata.h Merge master 2020-09-25 12:00:50 -04:00
doomdef.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
doomstat.h Merge master 2020-10-24 18:34:07 -04:00
doomtype.h Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
endian.h
f_finale.c Merge branch 'loading-screen' into 'the-scary-22-merge' 2020-10-25 13:53:28 -04:00
f_finale.h Cleanup 2020-08-15 08:32:56 -04:00
f_wipe.c A bunch of serious heavy lifting to fix title cards and closely related. 2020-09-22 18:27:47 +01:00
fastcmp.h
filesrch.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
filesrch.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
font.c
font.h
g_demo.c This RNG thing was removed, so it doesn't need to be in demo code anymore either 2020-10-31 02:39:30 -04:00
g_demo.h Fix G_WriteStandings 2020-08-18 05:08:21 -04:00
g_game.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
g_game.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
g_input.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
g_input.h g_game and g_input now compile 2020-08-13 00:05:44 -04:00
g_splitscreen.c Lua stuff is done 2020-08-15 07:47:18 -04:00
g_state.h A bunch of easy files (1-5 conflicts) 2020-08-05 14:34:17 -04:00
http-mserv.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
hu_stuff.c Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps" 2020-10-26 11:07:17 +00:00
hu_stuff.h hu_stuff & y_inter 2020-08-14 01:06:55 -04:00
i_addrinfo.c
i_addrinfo.h
i_joy.h g_game and g_input now compile 2020-08-13 00:05:44 -04:00
i_net.h
i_sound.h Merge master 2020-10-24 18:34:07 -04:00
i_system.h Just SetCurrentDirectory to the exe's folder on windoze 2020-08-31 01:23:56 -07:00
i_tcp.c -clientport (it's back!) and -serverport, which is an alias to -port 2020-08-19 18:16:54 -07:00
i_tcp.h
i_threads.h Strip a few more instances of SONIC ROBO BLAST 2 KART 2020-08-14 22:18:51 -07:00
i_video.h
info.c Merge branch 'the-scary-22-merge' of git@git.do.srb2.org:KartKrew/Kart.git into additive-transmap 2020-10-25 14:43:44 +00:00
info.h Error icon for when a map is missing its signpost 2020-09-30 06:00:13 -04:00
k_battle.c Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps" 2020-10-26 11:07:17 +00:00
k_battle.h Fixes to Battle Mode capsules 2020-09-27 04:51:08 -04:00
k_bheap.c Fix the cause of the waypoint debug message spam in Canyon Rush. 2020-07-08 21:36:28 +01:00
k_bheap.h
k_bot.c Use scale 1 instead of 0 for player oblivion shrink 2020-09-27 10:36:44 -04:00
k_bot.h Add comments for functions 2020-06-04 17:14:14 -04:00
k_botitem.c Fix some of the dehacked tables, change doomednums of haunted heights stuff to not conflict with items/waypoints, use "rings" variable instead of "kartstuff[k_rings]" 2020-08-16 01:46:54 -04:00
k_botsearch.c Restructure how damage works in kart COMPLETELY 2020-08-19 00:55:36 -04:00
k_collide.c Restructure how damage works in kart COMPLETELY 2020-08-19 00:55:36 -04:00
k_collide.h
k_color.c Restructure how damage works in kart COMPLETELY 2020-08-19 00:55:36 -04:00
k_color.h NOW we make it past p_mobj 2020-08-14 22:28:49 -04:00
k_grandprix.c Makes it through all kart files 2020-08-15 04:42:56 -04:00
k_grandprix.h Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player 2020-06-06 19:45:13 -04:00
k_hud.c Fix a few instances of rainbow things going through invalid skincolors 2020-09-25 12:54:35 -04:00
k_hud.h Makes it through all kart files 2020-08-15 04:42:56 -04:00
k_kart.c Make sneaker panels push you in spinout AGAIN LOL 2020-10-26 02:05:14 -07:00
k_kart.h Make sneaker panels push you in spinout AGAIN LOL 2020-10-26 02:05:14 -07:00
k_pathfind.c Fix shadowed declaration in pathfind code 2020-07-10 01:32:46 +01:00
k_pathfind.h
k_pwrlv.c NOW we make it past p_mobj 2020-08-14 22:28:49 -04:00
k_pwrlv.h
k_respawn.c Merge master 2020-10-24 18:34:07 -04:00
k_respawn.h Correct player angle when respawning from crushing 2020-09-26 03:12:22 -04:00
k_waypoint.c Makes it through all kart files 2020-08-15 04:42:56 -04:00
k_waypoint.h
keys.h
lua_baselib.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
lua_blockmaplib.c lua_blockmaplib.c: added "polyobjs" option to searchBlockmap function 2020-09-09 16:56:48 +01:00
lua_consolelib.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
lua_hook.h Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
lua_hooklib.c Fix cvars 2020-10-24 21:32:07 -04:00
lua_hud.h Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
lua_hudlib.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
lua_infolib.c Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
lua_libs.h Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
lua_maplib.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
lua_mathlib.c m_anigif, m_cheat, m_cond, m_fixed 2020-08-14 01:31:37 -04:00
lua_mobjlib.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
lua_playerlib.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
lua_polyobjlib.c Use FIELDFROM in lua polyobject code 2020-10-15 16:17:51 -07:00
lua_script.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
lua_script.h Fix pointers on LUA_Archive and LUA_UnArchive 2020-08-21 19:47:53 -07:00
lua_skinlib.c * Introduce SPR2_XTRA for face graphics, since the current system is prone to plenty of conflicts with modders if you're not careful. 2020-09-23 23:46:54 +01:00
lua_thinkerlib.c
lzf.c
lzf.h
m_aatree.c
m_aatree.h
m_anigif.c Fix OpenGL GIF recording crashing with gif_localcolortable disabled 2020-10-15 01:14:16 -03:00
m_anigif.h Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with 2020-06-27 10:56:15 -05:00
m_argv.c
m_argv.h
m_bbox.c
m_bbox.h
m_cheat.c Fix flashing tics 2020-10-25 09:57:51 -04:00
m_cheat.h actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V 2020-08-14 21:21:17 -04:00
m_cond.c Add a mechanism where in DEVELOP builds, you can use any feature that doesn't have an unlockable in the listings attached to it. 2020-09-22 18:10:49 +01:00
m_cond.h m_anigif, m_cheat, m_cond, m_fixed 2020-08-14 01:31:37 -04:00
m_dllist.h
m_fixed.c m_anigif, m_cheat, m_cond, m_fixed 2020-08-14 01:31:37 -04:00
m_fixed.h Deprecate FixedRem. 2020-05-18 11:29:56 -05:00
m_menu.c Fix cvars 2020-10-24 21:32:07 -04:00
m_menu.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
m_misc.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
m_misc.h YAY, round 2 2020-08-09 21:02:56 -04:00
m_perfstats.c Performance stats 2020-10-10 22:12:34 +03:00
m_perfstats.h Put newline to end of m_perfstats.h 2020-10-10 22:23:33 +03:00
m_queue.c
m_queue.h
m_random.c
m_random.h
m_swap.h
Makefile Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Makefile.cfg Merge master 2020-09-25 12:00:50 -04:00
md5.c
md5.h
mserv.c Fix cvars 2020-10-24 21:32:07 -04:00
mserv.h Merge master 2020-09-25 12:00:50 -04:00
p5prof.h
p_ceilng.c The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
p_enemy.c Stupid P_MapStart crash because of flicky teleport before map load 2020-10-28 22:35:31 -07:00
p_floor.c Restructure how damage works in kart COMPLETELY 2020-08-19 00:55:36 -04:00
p_inter.c Fix flashing tics 2020-10-25 09:57:51 -04:00
p_lights.c
p_local.h Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
p_map.c Revert step down changes 2020-10-26 20:20:04 -07:00
p_maputl.c Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
p_maputl.h Condense variables, rename 'diff' to 'step' 2020-10-15 14:23:02 -07:00
p_mobj.c Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps" 2020-10-26 11:07:17 +00:00
p_mobj.h Subtractive translation map 2020-10-19 11:57:12 +01:00
p_polyobj.c Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum 2020-10-26 11:18:53 +00:00
p_polyobj.h Added the functions Polyobj_moveXY and Polyobj_rotate to Lua as polyobj.moveXY and polyobj.rotate 2020-09-09 19:38:56 +01:00
p_pspr.h Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum 2020-10-26 11:18:53 +00:00
p_saveg.c Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
p_saveg.h Get up to p_user 2020-08-14 23:23:14 -04:00
p_setup.c Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps" 2020-10-26 11:07:17 +00:00
p_setup.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
p_sight.c Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
p_slopes.c More buttered slope speed 2020-10-17 21:47:04 -07:00
p_slopes.h Merge master 2020-09-25 12:00:50 -04:00
p_spec.c Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum 2020-10-26 11:18:53 +00:00
p_spec.h Fix slope spawning; let polyobjects spawn again 2020-09-25 13:35:56 -07:00
p_telept.c Get up to p_user 2020-08-14 23:23:14 -04:00
p_tick.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
p_tick.h
p_user.c Don't reset drift off springs 2020-10-26 20:49:39 -07:00
r_bsp.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
r_bsp.h Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
r_data.c Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
r_data.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
r_defs.h Support for additive/subtractive translation maps on FOFs and Polyobjects 2020-10-22 23:13:51 +01:00
r_draw.c Subtractive translation map 2020-10-19 11:57:12 +01:00
r_draw.h SPLITSCREEN FOV 2020-09-23 17:50:47 -07:00
r_draw8.c SPLITSCREEN FOV 2020-09-23 17:50:47 -07:00
r_draw8_npo2.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
r_draw16.c
r_local.h
r_main.c Fix splitscreen fov being fucked on first R_ExecuteSetViewSize 2020-10-26 18:57:32 -07:00
r_main.h Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
r_picformats.c Use leftoffset and topoffset, not loffs and toffs 2020-10-02 20:40:42 -03:00
r_picformats.h Fix PNG issue in OpenGL + optimize PNG sprite loading 2020-10-02 19:48:13 -03:00
r_plane.c Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum 2020-10-26 11:18:53 +00:00
r_plane.h Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
r_portal.c
r_portal.h
r_segs.c Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum 2020-10-26 11:18:53 +00:00
r_segs.h Additive/Subtractive translation map support on midtextures 2020-10-22 22:27:14 +01:00
r_skins.c Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
r_skins.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
r_sky.c SPLITSCREEN FOV 2020-09-23 17:50:47 -07:00
r_sky.h SPLITSCREEN FOV 2020-09-23 17:50:47 -07:00
r_splats.c
r_splats.h
r_state.h SPLITSCREEN FOV 2020-09-23 17:50:47 -07:00
r_textures.c Fix PNG issue in OpenGL + optimize PNG sprite loading 2020-10-02 19:48:13 -03:00
r_textures.h
r_things.c Check that top of sprite is above plane or bottom is below 2020-11-02 03:37:00 -08:00
r_things.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
s_sound.c Load multiple musicdef lumps from a single wad 2020-10-27 15:45:10 -07:00
s_sound.h Merge master 2020-10-24 18:34:07 -04:00
screen.c Fix cvars 2020-10-24 21:32:07 -04:00
screen.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
slope_anchors.c Offset slope anchors from regular slopes 2020-10-16 16:40:57 -07:00
sounds.c Merge master 2020-09-25 12:00:50 -04:00
sounds.h Merge master 2020-09-25 12:00:50 -04:00
st_stuff.c Merge master 2020-09-25 12:00:50 -04:00
st_stuff.h Merge master 2020-09-25 12:00:50 -04:00
strcasestr.c
string.c
t_facon.c
t_fsin.c
t_ftan.c
t_tan2a.c
tables.c Deprecate FixedRem. 2020-05-18 11:29:56 -05:00
tables.h The start of the scary 2.2 merge 2020-05-29 13:43:38 -04:00
tmap.nas
tmap.s
tmap_asm.s
tmap_mmx.nas
tmap_vc.nas
v_video.c Fix cvars 2020-10-24 21:32:07 -04:00
v_video.h Fix cvars 2020-10-24 21:32:07 -04:00
version.h Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
vid_copy.s
w_wad.c Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
w_wad.h Add wads from the -file parameter after netvars are registered 2020-10-01 16:50:31 -07:00
y_inter.c Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
y_inter.h Merge y_inter.c/h 2020-08-10 15:14:03 -04:00
z_zone.c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
z_zone.h Remove these 2 calls to HWR_UnlockCachedPatch 2020-10-28 15:16:05 -04:00