SRB2/src
Alam Ed Arias c4ac9643ad Merge branch 'goop-dampen' into 'next'
Goo Water (THZ Goop) adjustements

At Nev3r's request:
Adjusted goop so that you spend less time bouncing around in it. The goop will become a walkable surface with a higher velocity threshold.

The actual goop physics haven't been altered as far as the initial entrance and underwater time is concerned, only leaving goop and subsequent bounces has been dampened significantly.

See merge request !7
2015-06-18 10:11:27 -04:00
..
android Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
blua SRB2 2.1.12 release 2014-11-11 19:55:07 -05: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 whitespace fixup 2015-06-18 10:05:51 -04: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 'public_todo_next' into next 2015-04-01 12:32:34 -04:00
sdl12 New HD SRB2 icon by VAdaPEga. 2015-03-01 20:07:56 -05:00
win32 Merge branch 'public_todo_next' into next 2015-04-01 12:32:34 -04: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 SRB2 2.1.5 release 2014-03-23 12:00:29 -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 SRB2 2.1 release 2014-03-15 13:11:35 -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 Fix compilation and debugging on Windows. 2015-03-24 19:32:58 -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 cmake: Configure source via cmake 2015-01-28 18:03:41 -06:00
config.h.in Refactor CMake to allow source grouping and separation of interfaces. 2015-03-08 03:26:54 -05:00
console.c SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
console.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
d_clisrv.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05: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 Fixed WGL code "device mode" breaking. 2015-03-01 20:44:32 -05:00
d_main.h SRB2 2.1 release 2014-03-15 13:11:35 -04: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 gametype command now prints gametype NAMES instead of numbers. Even prints "Single player" when appropriate! 2015-03-01 20:42:12 -05: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 branch 'hotfix-pltz' into 'next' 2015-06-18 10:04:54 -04: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 Not sure how these things work, but presumably this was meant to be here 2015-03-31 18:00:13 -04:00
doomstat.h SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
doomtype.h cmake: Fix compilation for MSVC 2015 2015-02-01 19:02:08 -06:00
endian.h Make endianess detection more flexible 2014-04-25 02:40:19 +04:00
f_finale.c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
f_finale.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
f_wipe.c cmake: Configure source via cmake 2015-01-28 18:03:41 -06: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 Changed super colors to make them pulse instead of flash. Removed alt. supercolors from replay ghost stuff, because that's stupid. :/ 2015-03-01 20:43:11 -05:00
g_game.h SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
g_input.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05: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 Crawlas now use only one state for looking each 2015-03-31 17:56:06 -04:00
info.h Crawlas now use only one state for looking each 2015-03-31 17:56:06 -04:00
keys.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
lua_baselib.c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
lua_consolelib.c SRB2 2.1.8 release 2014-04-19 13:41:29 -04:00
lua_hook.h SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
lua_hooklib.c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
lua_hud.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
lua_hudlib.c Removed Lua's access to subsector/linedef validcounts and camera viewheight/startangle, since they are all useless for Lua purposes 2015-03-31 18:00:13 -04:00
lua_infolib.c SRB2 2.1.4 release 2014-03-21 19:21:06 +00:00
lua_libs.h SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
lua_maplib.c Removed Lua's access to subsector/linedef validcounts and camera viewheight/startangle, since they are all useless for Lua purposes 2015-03-31 18:00:13 -04:00
lua_mathlib.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
lua_mobjlib.c Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into hotfix-pltz 2015-06-09 07:38:21 -04:00
lua_playerlib.c SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
lua_script.c SRB2 2.1.10 release 2014-08-05 19:59:40 -04:00
lua_script.h SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
lua_skinlib.c SRB2 2.1.9 release 2014-08-03 23:49:33 -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 Fixed WGL code "device mode" breaking. 2015-03-01 20:44:32 -05: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 SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_fixed.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_menu.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
m_menu.h SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
m_misc.c it was me, Duo! 2015-02-06 10:22:16 -05: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 fixup cmake merge 2015-02-02 14:58:51 -05:00
Makefile.cfg evil changes 2014-08-27 22:43:10 -04:00
md5.c Make endianess detection more flexible 2014-04-25 02:40:19 +04:00
md5.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
mserv.c SRB2 2.1 release 2014-03-15 13:11:35 -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 Make A_SetObjectFlags only reset sector/bmap links if needed 2015-04-17 12:10:40 -05:00
p_fab.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
p_floor.c No more stupidity for No More Enemies special plz NME special now acts similarly to Each Time, checking all sectors sharing the same tag as itself for any enemies/bosses hiding within. This also supports cases where the tagged sectors are FOF control sectors. When the situation is asitsaysonthetin, NME acts like a normal trigger linedef should and executes all linedef execs around the sector it's located in. 2015-03-31 18:00:12 -04:00
p_inter.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
p_lights.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_local.h tmfloorthing and tmhitthing are set to NULL at the start of P_MobjThinker, preventing any weird cases of carrying over the previous mobj's floor object or such. 2015-05-31 13:57:27 +01:00
p_map.c Merge branch 'goop-dampen' into 'next' 2015-06-18 10:11:27 -04:00
p_maputl.c Revert "Guess what major breaking-news bug I just fixed B)" 2015-04-08 20:50:49 -05:00
p_maputl.h SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
p_mobj.c Merge branch 'goop-dampen' into 'next' 2015-06-18 10:11:27 -04:00
p_mobj.h Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into hotfix-pltz 2015-06-09 07:38:21 -04:00
p_polyobj.c Merge branch 'actual-blockmap-fix' into 'next' 2015-04-14 20:22:25 -04: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 SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
p_saveg.c tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) 2015-03-31 18:00:13 -04:00
p_saveg.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_setup.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05: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_spec.c Revert "Guess what major breaking-news bug I just fixed B)" 2015-04-08 20:50:49 -05:00
p_spec.h SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
p_telept.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_tick.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
p_tick.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_user.c Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into hotfix-pltz 2015-06-09 07:38:21 -04:00
r_bsp.c 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
r_bsp.h SRB2 2.1.12 release 2014-11-11 19:55:07 -05: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 SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
r_draw.c SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
r_draw.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
r_draw8.c SRB2 2.1 release 2014-03-15 13:11:35 -04: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 Red's last commit should have been using "pgl", not "gl" for function name prefixes, so the compiler would be happy. Also, more simplicity in my camera code please! Simplified some of the checks for whether a camera should chase or not etc 2015-03-31 18:00:14 -04:00
r_main.h SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
r_plane.c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
r_plane.h SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
r_segs.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05: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 SRB2 2.1 release 2014-03-15 13:11:35 -04: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 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
r_things.h SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
s_sound.c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
s_sound.h change SDL into HAVE_SDL 2014-07-25 19:10:24 -04: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 SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
sounds.h SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
st_stuff.c Well that shows you how much we care about the old special stages *or* race! 2015-03-01 19:38:00 -05:00
st_stuff.h SRB2 2.1.6 release 2014-03-24 22:17:59 -04:00
string.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
tables.c Applied new finesine table. 2015-06-10 12:07:08 -04:00
tables.h SRB2 2.1 release 2014-03-15 13:11:35 -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 SRB2 2.1.12 release 2014-11-11 19:55:07 -05: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 Make sure lump name is zeroed out before writing so it always ends in a terminating char 2015-03-31 18:00:14 -04:00
w_wad.h SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
y_inter.c SRB2 2.1.14 release 2015-01-01 14:50:31 -05: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