toasterbabe 0a1e055ba1 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop ... # Conflicts: # src/m_menu.c		2017-08-05 22:13:14 +01:00
..
android
blua	Created lua_blockmaplib.c, for Lua's blockmap library	2016-10-27 18:10:30 +01:00
djgppdos
dummy
hardware
locale
nds
sdl
sdl12	Merge branch 'public_next'	2017-05-31 15:18:05 +01:00
win32	Merge branch 'public_next'	2017-05-31 15:18:05 +01:00
win32ce
.gitignore
am_map.c
am_map.h
Android.mk	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
asm_defs.inc
b_bot.c
b_bot.h
byteptr.h
CMakeLists.txt
command.c
command.h
comptime.c
config.h.in
console.c	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into addfile_menu	2017-05-06 23:24:21 +01:00
console.h	make console back color use just one section of memory	2016-11-02 14:26:35 -07:00
d_clisrv.c
d_clisrv.h
d_event.h
d_main.c
d_main.h
d_net.c
d_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
d_netcmd.c
d_netcmd.h
d_netfil.c
d_netfil.h
d_player.h
d_think.h
d_ticcmd.h
dehacked.c
dehacked.h
doomdata.h
doomdef.h
doomstat.h
doomtype.h
endian.h
f_finale.c	Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame	2017-05-18 16:54:58 +01:00
f_finale.h	FUNCMATH fun	2016-06-12 16:08:48 -04:00
f_wipe.c
fastcmp.h
filesrch.c
filesrch.h
g_game.c
g_game.h	Merge branch 'public_next'	2017-06-23 17:19:06 +01:00
g_input.c
g_input.h
g_state.h
hu_stuff.c	Exiting icon on the tab menu! (Requires new patch.dta)	2017-07-08 11:41:32 +01:00
hu_stuff.h
i_addrinfo.c	MSVC: fixed up MSVC project	2016-05-21 23:53:04 -04:00
i_addrinfo.h
i_joy.h
i_net.h
i_sound.h
i_system.h
i_tcp.c
i_tcp.h
i_video.h
info.c
info.h
keys.h
lua_baselib.c	* Per Mystic's request, made lives for 100 rings individual.	2017-05-29 22:18:02 +01:00
lua_blockmaplib.c
lua_consolelib.c
lua_hook.h
lua_hooklib.c
lua_hud.h
lua_hudlib.c
lua_infolib.c	There are now captions for specific types of music! (Currently signified with an M, but I'll change that in a bit...) A whole lotta things needed to be modified for this, though.	2017-04-29 16:27:52 +01:00
lua_libs.h
lua_maplib.c
lua_mathlib.c
lua_mobjlib.c
lua_playerlib.c
lua_script.c
lua_script.h
lua_skinlib.c
lua_thinkerlib.c
lzf.c	define SRTICT_ALIGN to - if the system is x86/x64 system	2016-07-23 23:26:08 -04:00
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
m_cheat.h
m_cond.c
m_cond.h
m_dllist.h
m_fixed.c
m_fixed.h
m_menu.c
m_menu.h	Good:	2017-05-07 17:14:57 +01:00
m_misc.c
m_misc.h
m_queue.c
m_queue.h
m_random.c
m_random.h
m_swap.h
Makefile
Makefile.cfg
md5.c
md5.h
mserv.c
mserv.h
p5prof.h
p_ceilng.c
p_enemy.c
p_floor.c
p_inter.c
p_lights.c
p_local.h	* Who wore it better? https://cdn.discordapp.com/attachments/293238104096112641/338696939774279680/srb20037.png	2017-07-23 17:49:19 +01:00
p_map.c
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_mobj.c
p_mobj.h
p_polyobj.c
p_polyobj.h
p_pspr.h
p_saveg.c	Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today!	2017-03-22 18:51:30 +00:00
p_saveg.h
p_setup.c
p_setup.h
p_sight.c
p_slopes.c
p_slopes.h
p_spec.c
p_spec.h
p_telept.c	Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion.	2017-03-14 18:11:17 +00:00
p_tick.c
p_tick.h
p_user.c
r_bsp.c
r_bsp.h	Remove unused drawfunc_t function typedef	2016-05-24 14:38:31 +01:00
r_data.c
r_data.h
r_defs.h
r_draw.c
r_draw.h
r_draw8.c
r_draw16.c
r_local.h
r_main.c
r_main.h	Remove all traces of SSN's old port of ZDoom's secplanes for slopes, since our slopes do not need them	2017-01-02 19:12:09 +00:00
r_plane.c
r_plane.h
r_segs.c
r_segs.h
r_sky.c
r_sky.h
r_splats.c
r_splats.h
r_state.h
r_things.c
r_things.h
s_sound.c
s_sound.h
screen.c
screen.h
sounds.c	Clean up the event and caption when a life is transferred.	2017-07-08 19:42:01 +01:00
sounds.h
st_stuff.c
st_stuff.h
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
v_video.h
vid_copy.s
w_wad.c
w_wad.h	Store importance (nmuslumps check) to prevent having to do it again when doing d_netfil stuff.	2017-05-27 14:01:26 +01:00
y_inter.c
y_inter.h
z_zone.c
z_zone.h