SRB2/src
Monster Iestyn 11c24f5ab6 Merge branch 'next' into gl-slopes
# Conflicts:
#	src/hardware/hw_main.c
2016-04-09 22:12:29 +01:00
..
android Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
blua Change int32_t to __int32 on MSC. 2015-06-10 07:41:44 -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 Merge branch 'next' into gl-slopes 2016-04-09 22:12:29 +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 Fixed frustrating MIDI stuff 2016-04-06 08:16:13 -07:00
sdl12 New HD SRB2 icon by VAdaPEga. 2015-03-01 20:07:56 -05:00
win32 Merge branch 'master' into next 2016-02-25 18:33:29 -05: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 removed/remline ununsed code 2016-03-30 14:05:07 -04:00
am_map.h SRB2 2.1 release 2014-03-15 13:11:35 -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 switich to do the angle math in signed, then run it thur abs() 2016-03-30 11:47:27 -04:00
b_bot.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
byteptr.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
CMakeLists.txt Remove p_fab.c 2016-03-31 20:42:01 -05:00
command.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
command.h SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
comptime.c Branch and revision information in builds 2016-03-14 12:43:08 -04:00
config.h.in patch.dta officially in use. Version number updated. 2016-03-09 18:30:11 -08:00
console.c fix bind out of bounds / keystring misreading 2016-01-28 08:15:34 -08:00
console.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
d_clisrv.c Splitscreen fixes 2016-04-06 18:28:43 -07:00
d_clisrv.h SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
d_event.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
d_main.c Some drawing code cleanup 2016-04-06 18:01:01 -07:00
d_main.h Removed unused "supdate" variable 2016-03-15 21:18:25 +00:00
d_net.c SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
d_net.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
d_netcmd.c Branch and revision information in builds 2016-03-14 12:43:08 -04:00
d_netcmd.h SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
d_netfil.c SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
d_netfil.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
d_player.h SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
d_think.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
d_ticcmd.h SRB2 2.1.5 release 2014-03-23 12:00:29 -04:00
dehacked.c Merge pull request #68 from Yukitty/revert-Lua-angles 2016-03-09 11:58:51 -05:00
dehacked.h SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
doomdata.h SRB2 2.1.4 release 2014-03-21 19:21:06 +00:00
doomdef.h Fix M_PI not being defined for Visual Studio 2016-04-02 20:09:00 +01:00
doomstat.h The concept of "music slots" doesn't exist anymore. 2016-02-09 02:48:33 -08:00
doomtype.h cmake: remove fixed HWRENDER define 2016-03-25 20:21:56 -04:00
endian.h Make endianess detection more flexible 2014-04-25 02:40:19 +04:00
f_finale.c Merge branch 'master' into portal-fix 2016-03-07 16:22:41 -05:00
f_finale.h Attempt 2 at special stage fades. 2016-02-09 02:43:24 -08:00
f_wipe.c Attempt 2 at special stage fades. 2016-02-09 02:43:24 -08: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 whitespace clean 2016-04-07 16:34:36 -04:00
g_game.h SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
g_input.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-02-03 18:09:08 -08:00
g_input.h SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
g_state.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
hu_stuff.c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
hu_stuff.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
i_addrinfo.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
i_addrinfo.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
i_joy.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
i_net.h SRB2 2.1.3 release 2014-03-18 13:56:54 -04:00
i_sound.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
i_system.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
i_tcp.c Further fix IPv4 when IPv6 is available 2015-02-05 15:36:07 -06:00
i_tcp.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
i_video.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
info.c I don't think we need the BLUE_SPHERES define anymore... 2016-03-09 00:49:35 -08:00
info.h I don't think we need the BLUE_SPHERES define anymore... 2016-03-09 00:49:35 -08:00
keys.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
lua_baselib.c Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into closestpointonline 2016-03-26 18:32:51 +00:00
lua_consolelib.c SRB2 2.1.8 release 2014-04-19 13:41:29 -04:00
lua_hook.h whitespace clean 2016-04-07 16:34:36 -04:00
lua_hooklib.c Merge branch 'playerspawn-hook' into 'next' 2016-03-04 10:19:18 -05:00
lua_hud.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
lua_hudlib.c Merge branch 'master' into next 2016-03-30 20:15:08 -04:00
lua_infolib.c Move garbage collection out of Lua hooks. 2015-06-10 13:42:45 -04:00
lua_libs.h Starting work for getting sector.lines in Lua: it WORKS at the least, but I have no way to determine the size of the array itself as of yet 2015-06-17 21:00:10 +01:00
lua_maplib.c Merge branch 'lua-sector-lines' into 'next' 2016-03-04 10:23:42 -05:00
lua_mathlib.c Use modulo, not bitwise AND. My fault once again, whoops. 2016-01-18 19:46:00 +00:00
lua_mobjlib.c backport state-animations from internal master to public next 2016-02-09 02:39:16 -08:00
lua_playerlib.c Change LUA_NUMBER to fixed_t, change angle_t handling in Lua. 2015-05-20 23:54:04 -04:00
lua_script.c Cleanup LUAh_NetArchiveHook prototype mess. 2016-03-03 17:30:10 -05:00
lua_script.h Merge pull request #68 from Yukitty/revert-Lua-angles 2016-03-09 11:58:51 -05:00
lua_skinlib.c Change LUA_NUMBER to fixed_t, change angle_t handling in Lua. 2015-05-20 23:54:04 -04:00
lua_thinkerlib.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
lzf.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
lzf.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_anigif.c SRB2 2.1.8 release 2014-04-19 13:41:29 -04:00
m_anigif.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_argv.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_argv.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_bbox.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_bbox.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_cheat.c Merge branch 'master' into next 2016-03-30 20:15:08 -04:00
m_cheat.h SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
m_cond.c SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
m_cond.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_dllist.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_fixed.c remove NEED_FIXED_VECTOR and fix angelchk testcase 2015-08-21 21:27:20 -04:00
m_fixed.h remove NEED_FIXED_VECTOR and fix angelchk testcase 2015-08-21 21:27:20 -04:00
m_menu.c Some drawing code cleanup 2016-04-06 18:01:01 -07:00
m_menu.h SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
m_misc.c Branch and revision information in builds 2016-03-14 12:43:08 -04:00
m_misc.h SRB2 2.1.3 release 2014-03-18 13:56:54 -04:00
m_queue.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_queue.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_random.c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
m_random.h SRB2 2.1.2 release 2014-03-17 08:13:16 -04:00
m_swap.h Make endianess detection more flexible 2014-04-25 02:40:19 +04:00
Makefile Remove p_fab.c 2016-03-31 20:42:01 -05:00
Makefile.cfg move disabled warning out of mingw 2016-01-28 12:06:00 -05:00
md5.c build: more mac fixes 2016-03-25 20:37:14 -04:00
md5.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
mserv.c removed/remline ununsed code 2016-03-30 14:05:07 -04:00
mserv.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p5prof.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_ceilng.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_enemy.c Fix typo in A_ChangeAngleAbsolute 2016-03-07 21:16:02 +00:00
p_floor.c Revert "No more stupidity for No More Enemies special plz" 2016-03-08 22:22:30 -08:00
p_inter.c Better CTF in splitscreen, no death message for spectators 2016-04-06 19:55:58 -07:00
p_lights.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_local.h backport state-animations from internal master to public next 2016-02-09 02:39:16 -08:00
p_map.c Merge branch 'polyobj-teeter-fix' into 'next' 2016-03-31 20:55:28 -04:00
p_maputl.c Merge branch 'master' into next 2016-03-30 20:15:08 -04:00
p_maputl.h Store the slope an object is resting on (if applicable) 2015-04-29 00:33:04 -05:00
p_mobj.c Better CTF in splitscreen, no death message for spectators 2016-04-06 19:55:58 -07:00
p_mobj.h Revert "MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh" 2016-03-09 06:22:40 -08:00
p_polyobj.c Fixed that odd bug where PolyObjects sometimes leave a vertex or two in their control sectors 2016-01-31 13:05:30 -06:00
p_polyobj.h Insert polyobject planes into their proper spot in the draw list; replace related hack with other hacks 2015-04-06 11:22:27 -05:00
p_pspr.h backport state-animations from internal master to public next 2016-02-09 02:39:16 -08:00
p_saveg.c Merge branch 'backport_unslot-music' into 'next' 2016-03-03 22:31:21 -05:00
p_saveg.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_setup.c removed unused "total" variable in P_GroupLines 2016-04-02 17:01:58 +01:00
p_setup.h SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
p_sight.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_slopes.c Make internal slope functions static and remove from header 2016-01-03 10:33:45 -06:00
p_slopes.h Make internal slope functions static and remove from header 2016-01-03 10:33:45 -06:00
p_spec.c Better CTF in splitscreen, no death message for spectators 2016-04-06 19:55:58 -07:00
p_spec.h Removing unused cruft 2015-04-26 22:20:03 -05:00
p_telept.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_tick.c backport state-animations from internal master to public next 2016-02-09 02:39:16 -08:00
p_tick.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_user.c Better CTF in splitscreen, no death message for spectators 2016-04-06 19:55:58 -07:00
r_bsp.c Merge branch 'master' into gl-slopes 2016-02-22 00:15:26 -05:00
r_bsp.h Fixed div-by-zero crash relating to portals, drawsegs and midtextures 2016-02-06 18:57:26 +00:00
r_data.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
r_data.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
r_defs.h Merge branch 'next' into portal-fix 2016-03-25 18:43:07 -04:00
r_draw.c Slope planes work again. I hacked an alignment fix in too. 2015-05-23 01:19:38 -05:00
r_draw.h We can compile the slopes code now, yay! My brain hurts. 2016-01-03 10:30:36 -06:00
r_draw8.c We can compile the slopes code now, yay! My brain hurts. 2016-01-03 10:30:36 -06:00
r_draw16.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
r_local.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
r_main.c Splitscreen fixes 2016-04-06 18:28:43 -07:00
r_main.h SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
r_plane.c Partial undo of what I did last commit to make Inu happy again. 2016-01-14 16:40:55 +00:00
r_plane.h Make FOF planes render slopedly if set 2015-05-16 22:32:12 -05:00
r_segs.c Fix lighting parity between resolutions for sprites and FOFs 2016-04-05 15:33:55 +01:00
r_segs.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
r_sky.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
r_sky.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
r_splats.c Partial undo of what I did last commit to make Inu happy again. 2016-01-14 16:40:55 +00:00
r_splats.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
r_state.h SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
r_things.c Fix lighting parity between resolutions for sprites and FOFs 2016-04-05 15:33:55 +01:00
r_things.h large dispoffset values no longer cause sprites to be distorted 2016-01-13 22:50:14 -08:00
s_sound.c Fixed frustrating MIDI stuff 2016-04-06 08:16:13 -07:00
s_sound.h Backwards compatibility. 2016-03-03 02:54:07 -08:00
screen.c OpenGL Patch Fill Fix 2014-03-24 20:06:13 +00:00
screen.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
sounds.c The concept of "music slots" doesn't exist anymore. 2016-02-09 02:48:33 -08:00
sounds.h The concept of "music slots" doesn't exist anymore. 2016-02-09 02:48:33 -08:00
st_stuff.c Some drawing code cleanup 2016-04-06 18:01:01 -07:00
st_stuff.h Some drawing code cleanup 2016-04-06 18:01:01 -07:00
string.c build: more mac fixes 2016-03-25 20:37:14 -04:00
tables.c From what I can tell, correcting this one value in finetangent[] shouldn't cause any harm at all, so... 2016-01-14 16:41:10 +00:00
tables.h remove NEED_FIXED_VECTOR and fix angelchk testcase 2015-08-21 21:27:20 -04:00
tmap.nas SRB2 2.1 release 2014-03-15 13:11:35 -04:00
tmap.s SRB2 2.1 release 2014-03-15 13:11:35 -04:00
tmap_asm.s SRB2 2.1 release 2014-03-15 13:11:35 -04:00
tmap_mmx.nas SRB2 2.1 release 2014-03-15 13:11:35 -04:00
tmap_vc.nas SRB2 2.1 release 2014-03-15 13:11:35 -04:00
v_video.c wrap prevention code now takes flipped patches into account 2016-03-25 20:04:49 +00:00
v_video.h SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
vid_copy.s SRB2 2.1 release 2014-03-15 13:11:35 -04:00
w_wad.c "Loading SOC from" console message now also displays the name of the SOC_ lump 2016-03-03 18:31:17 +00:00
w_wad.h Removed void typedef for GLPatch_t used when HWRENDER is undefined 2016-01-12 15:42:36 +00:00
y_inter.c I meant to extend this to 4 seconds but forgot 2016-03-31 06:57:11 -07:00
y_inter.h SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
z_zone.c SRB2 2.1.10 release 2014-08-05 19:59:40 -04:00
z_zone.h SRB2 2.1.10 release 2014-08-05 19:59:40 -04:00