RingRacers/src
Inuyasha e62b0f219f Merge branch 'damage-control' into 'master'
Damage control + Match rebalancing

This is two branches in one since while I was working on damage-control's changes months back, I felt it was best Match rebalancing was merged in here too (thanks JTE for helping me do so).

Changes from damage-control:
* `player->health` (formerly the "HUD copy" of `player->mo->health`) is now `player->rings`, and is also now the player's actual ring count.
* `player->mo->health` (formerly rings + 1) is now always 1 when alive, regardless of ring count; if player with rings is damaged, this is untouched.
* P_RingDamage now includes ring spilling code.
* P_ShieldDamage now has a damagetype argument, allowing me to remove the last MT_NULL hack left in from the pre-damagetype days that I forgot about.
* The old "switch-to-seestate" enemy damaging behavior in P_DamageMobj has been removed. This was a Doom left-over and doesn't really affect SRB2's enemies anyway - see, Doom enemies had a random chance of using seestate or painstate, SRB2 enemies always use painstate.
* Other minor efforts to reorganise damaging code and have it make more sense, but otherwise nothing that should affect gameplay in general.

Changes from match-rebalancing:
* New weapon/ammo dropping behavior: if you have the weapon panel + ammo, you drop the panel (but not the ammo); if you don't, you just drop the ammo.
* New Match ammo consumption: Weapon rings can now be fired with no rings at double the ammo cost.
* New emerald behaviour: collecting all 7 emeralds no longer turns you super (read: Match super is dead now) but instead steal points from enemies and gives you and teammates invincibility + sneakers
* Tails ringslinger buff: Any character with CA_FLY will now throw rings 1.5x as fast.

See merge request !28
2016-11-13 16:47:05 -05:00
..
android
blua
djgppdos
dummy
hardware
locale Fixed forceskin to not always allow due to bad logic. 2016-07-14 13:24:57 +01:00
nds
sdl
sdl12
win32
win32ce
.gitignore SRB2 2.1 release 2014-03-15 13:11:35 -04:00
am_map.c
am_map.h
Android.mk
asm_defs.inc SRB2 2.1 release 2014-03-15 13:11:35 -04:00
b_bot.c
b_bot.h
byteptr.h
CMakeLists.txt
command.c
command.h
comptime.c
config.h.in
console.c
console.h
d_clisrv.c
d_clisrv.h
d_event.h
d_main.c
d_main.h
d_net.c
d_net.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_netcmd.c
d_netcmd.h
d_netfil.c
d_netfil.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_player.h Merge branch 'master' into damage-control 2016-09-30 21:05:44 +01:00
d_think.h
d_ticcmd.h
dehacked.c
dehacked.h
doomdata.h SUPERCOLOR BONANZA COMMIT. 2016-08-10 19:48:20 +01:00
doomdef.h
doomstat.h
doomtype.h
endian.h
f_finale.c
f_finale.h
f_wipe.c
fastcmp.h
filesrch.c
filesrch.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
g_game.c
g_game.h
g_input.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
g_input.h
g_state.h
hu_stuff.c
hu_stuff.h
i_addrinfo.c
i_addrinfo.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_joy.h
i_net.h
i_sound.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_system.h
i_tcp.c
i_tcp.h
i_video.h
info.c
info.h
keys.h
lua_baselib.c
lua_consolelib.c
lua_hook.h
lua_hooklib.c
lua_hud.h
lua_hudlib.c
lua_infolib.c Merge branch 'master' into spr2-freeslots 2016-07-11 15:26:39 -04:00
lua_libs.h
lua_maplib.c
lua_mathlib.c Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
lua_mobjlib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_playerlib.c
lua_script.c
lua_script.h
lua_skinlib.c
lua_thinkerlib.c
lzf.c
lzf.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_aatree.c
m_aatree.h
m_anigif.c
m_anigif.h
m_argv.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_argv.h
m_bbox.c
m_bbox.h
m_cheat.c Merge branch 'master' into damage-control 2016-10-29 17:05:59 +01:00
m_cheat.h
m_cond.c
m_cond.h
m_dllist.h
m_fixed.c
m_fixed.h
m_menu.c
m_menu.h
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 copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
mserv.c
mserv.h
p5prof.h
p_ceilng.c
p_enemy.c
p_floor.c
p_inter.c
p_lights.c
p_local.h
p_map.c
p_maputl.c Solid midtextures now account for "infinite" repeats 2016-08-27 17:14:21 +01:00
p_maputl.h
p_mobj.c Merge branch 'damage-control' into 'master' 2016-11-13 16:47:05 -05:00
p_mobj.h
p_polyobj.c
p_polyobj.h
p_pspr.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into animate_global 2016-10-03 00:27:49 -07:00
p_saveg.c Merge branch 'master' into damage-control 2016-09-30 21:05:44 +01:00
p_saveg.h
p_setup.c
p_setup.h
p_sight.c
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_spec.c
p_spec.h
p_telept.c
p_tick.c
p_tick.h
p_user.c
r_bsp.c MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
r_bsp.h
r_data.c
r_data.h
r_defs.h Making the flag value more obvious. 2016-08-08 14:35:18 +01:00
r_draw.c
r_draw.h
r_draw8.c
r_draw16.c
r_local.h
r_main.c
r_main.h
r_plane.c
r_plane.h
r_segs.c
r_segs.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
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 Merge branch 'master' into repeat-monitors 2016-07-11 15:29:06 -04:00
sounds.h
st_stuff.c
st_stuff.h
string.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
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 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-11-10 16:20:03 -08:00
v_video.h
vid_copy.s
w_wad.c
w_wad.h
y_inter.c
y_inter.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
z_zone.c
z_zone.h