59 commits

Author	SHA1	Message	Date
Monster Iestyn	f9c4b877ca	Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into damage-control	2016-03-13 20:37:43 +00:00
Inuyasha	e7ff405c52	Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal ... # Conflicts: # src/hardware/hw_md2.c # src/p_mobj.c # src/p_mobj.h	2016-02-29 00:14:16 -08:00
Inuyasha	1bdd4cf641	backport state-animations from internal master to public next ... most other code in the branch did not come along for the ride.	2016-02-09 02:39:16 -08:00
Monster Iestyn	6bc1a5fdef	Okay, major overhaul time! ... *player->health (formerly the "HUD" health) is now to be known as player->rings, and now acts as 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 Damage in normal SP/Coop gameplay has been tested and still works fine; still a lot of mess to clear up though Tag damaging probably is broken now, I'll fix this later	2015-08-15 21:07:16 +01:00
MonsterIestyn	e83fa3dc43	Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? ... Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd	2015-02-24 02:09:18 -06:00
Alam Ed Arias	73b3287b19	SRB2 2.1.14 release	2015-01-01 14:50:31 -05:00
Alam Ed Arias	404b5f666c	SRB2 2.1.12 release	2014-11-11 19:55:07 -05:00
Alam Ed Arias	7cb77075d1	SRB2 2.1.11 release	2014-08-26 23:56:30 -04:00
Alam Ed Arias	b93cb1b65a	SRB2 2.1 release	2014-03-15 13:11:35 -04:00