zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 16:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity
3911 commits 131 branches 149 tags 198 MiB
Commit graph

149 commits

Author SHA1 Message Date
Christoph Oelckers
3e4678765b Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/thingdef/thingdef_codeptr.cpp
 2013-08-18 12:18:59 +02:00
Christoph Oelckers
e14590d8ce - moved NOTELESTOMP to flags7. When committing I was accidentally on maint instead of master and in master flags6 was already full. 2013-08-12 20:41:33 +02:00
Christoph Oelckers
a78ad3188b - added MF5_NOFORWARDFALL flag to prevent attacks from making its victim fall forward randomly. 2013-08-09 20:20:23 +02:00
Christoph Oelckers
bba092cc0b Merge branch 'master' into scripting 
Conflicts:
	src/d_player.h
	src/g_doom/a_archvile.cpp
	src/thingdef/thingdef.h
	src/thingdef/thingdef_properties.cpp
 2013-08-09 13:03:28 +02:00
Christoph Oelckers
3480d40484 - fixed: AActor::Die may only randomize the death state's duration if it is positive. Otherwise -1 (infinite) gets clobbered. 2013-07-30 16:52:36 +02:00
Christoph Oelckers
909ec2e35a Merge branch 'maint' into scripting 2013-07-28 10:47:17 +02:00
Christoph Oelckers
992ba0bbf4 - added handling of MF3_FOILINVUL for A_BFGSpray. This function needs special treatment because the shooting player is considered the inflictor of the spray damage. 2013-07-26 00:52:12 +02:00
Randy Heit
9c86f1c220 Merge branch 'master' into scripting for plugged userinfo memory leak 
Conflicts:
	src/d_player.h
	src/p_interaction.cpp
	src/thingdef/thingdef_codeptr.cpp
 2013-07-23 21:01:13 -05:00
Christoph Oelckers
f1dff6c9d3 - fixed: The new XDeath code forgot to move the assignment of the flags4 variable. Also renamed the variable to avoid conflicts. 2013-07-02 22:01:54 +02:00
Christoph Oelckers
7e6a5c1448 - added damage type specific extreme death and extreme crash states. Order of labels is 'Death.extreme.damagetype' ('XDeath.damagetype') and 'Crash.extreme.damagetype'. 
- fixed: Damage of type 'extreme' did not get recorded as an extreme death for the mugshot code.
- changed: extreme deaths now only get recorded when an extreme death state was actually used, to ensure that the crash state being used is the correct one associated with the death state.
 2013-07-01 11:02:35 +02:00
Randy Heit
4deeb8d8ae Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/p_local.h
	src/p_map.cpp
	src/sdl/i_main.cpp
	src/thingdef/thingdef_codeptr.cpp
 2013-06-25 19:28:25 -05:00
Christoph Oelckers
394f21f71e - fixed: Draining health from a victim must check for damage reduction before awarding the health to the player. This affected Heretic's gauntlets, A_Saw and A_CustomPunch. 
- added a DONTDRAIN flag that prevents the above attacks from draining any health at all.
 2013-06-24 16:42:43 +02:00
Christoph Oelckers
9f253ccae3 - fixed: Application of inflictor's death damage type was done too late and missed a few spots where it needed. 
- fixed: DamageTypeReceived was not serialized.
- fixed: The check for unhandled damage type was rendered ineffective by the old code handling the DeathType.
 2013-06-24 15:40:17 +02:00
Randy Heit
459ad5abff - Updated scripting branch to latest version in trunk. 
SVN r4337 (scripting)
 2013-06-07 03:31:30 +00:00
Christoph Oelckers
0bca41c202 - replaced unused RNGs with pr_damagemobj for consistency checksum. 
SVN r4297 (trunk)
 2013-05-30 10:18:46 +00:00
Randy Heit
2668988870 - Switched to a genericly extensible representation for userinfo. 
- Fixed: The playerinfo CCMD did not range check the player number.

SVN r4253 (trunk)
 2013-05-12 18:27:03 +00:00
Randy Heit
a50e670c0c - Use tests less prone to overflow on very steep slopes when detecting which side of a plane 
the camera is on. Mostly, this means testing the distance of the camera to the plane rather
  than computing the plane's Z at the camera and comparing that with the camera's Z.

SVN r4220 (trunk)
 2013-04-17 01:32:40 +00:00
Randy Heit
c116453158 - When doing kickback in P_DamageMobj(), choose a random direction if the target and origin are in the exact same spot. 
SVN r4069 (trunk)
 2013-02-07 21:02:26 +00:00
Randy Heit
47cb2ad6bc - In P_PoisonPlayer(), keep track of the source as the poisoner, so you can get accurate kill 
accounting. Also, if the poisoner is a missile, remembering it is pretty pointless, since it's
  likely to be gone before the player ever dies from the poison.

SVN r4040 (trunk)
 2013-01-25 02:35:11 +00:00
Randy Heit
814cb4d135 - Move NULL player check earlier in P_PoisonDamage, before player is accessed. 
SVN r4016 (trunk)
 2013-01-03 03:05:44 +00:00
Randy Heit
549712e719 - P_DamageMobj() now returns the amount of damage actually done so that the bleed functions 
can perform based on the amount of damage actually taken after all modifications are done to
  it. However, if the damage is canceled away, blood will still spawn for the original damage
  amount rather than the modified amount.

SVN r4012 (trunk)
 2013-01-02 04:39:59 +00:00
Randy Heit
e7efa1d802 - Update to latest version in trunk. 
SVN r3890 (scripting)
 2012-10-17 04:24:54 +00:00
Randy Heit
ebc4e5b4e1 - Fixed: P_TouchSpecialThing() considered all pickup items to be 32 units tall for the sake 
of touching, even if they were taller.

SVN r3814 (trunk)
 2012-08-10 02:17:16 +00:00
Randy Heit
562cf04db2 - Update scripting branch to trunk. 
SVN r3758 (scripting)
 2012-07-14 03:04:41 +00:00
Randy Heit
1346f136f2 - Added inventory-based damage modification to APoisonCloud::DoSpecialDamage() and P_PoisonDamage(). 
SVN r3718 (trunk)
 2012-06-30 01:06:30 +00:00
Randy Heit
e1641da881 - Make APoisonCloud::DoSpecialDamage() and P_PoisonDamage() respect damage factors. 
- Pass the damage type to AActor::DoSpecialDamage().

SVN r3717 (trunk)
 2012-06-29 04:21:31 +00:00
Randy Heit
cbebc12fd0 - Players are no longer affected by the skill property NoPain. 
SVN r3654 (trunk)
 2012-05-15 21:51:02 +00:00
Christoph Oelckers
0f8e2441a1 - changed spectral missiles to use FriendPlayer instead of health to distinguish between player spawned and monster spawned versions. Also moved most of this into the basic missile spawning functions instead of littering all spectral missile spawning functions with these initializations. 
SVN r3651 (trunk)
 2012-05-13 11:17:27 +00:00
Christoph Oelckers
ddf1af455b - moved identical damage checks in P_DamageMobj into an inline function. 
SVN r3650 (trunk)
 2012-05-13 08:04:58 +00:00
Christoph Oelckers
3a24790056 - fixed: The newly added checks for printing weapon obituaries failed if the weapon used a puff with a special damage type. To handle this, P_DamageMobj will now pass the damage flags to AActor::Die and from there to ClientObituary so that P_LineAttack - which is a better place to decide this - can flag an attack as coming from a player weapon. 
- fixed: The same rules that are used for deciding if a weapon attack took place should be used when checking the PIERCEARMOR flag in P_LineAttack: It should be ignored if the attack doesn't originate from the weapon.

SVN r3649 (trunk)
 2012-05-13 07:54:44 +00:00
Randy Heit
44932a6c56 - Added OB_MPDEFAULT string for being killed by a player for an unknown reason. This can be 
overridden in custom player classes by changing their Obituary property to something else.
- ClientObituary() now only looks up the obituary message from the killing player's weapon if the
  damage type was 'Melee' or 'Hitscan'.
- Gave P_GunShot() and A_FireBullets the new damage type 'Hitscan'.
- Switched A_Saw and A_CustomPunch to the 'Melee' damage type.

SVN r3646 (trunk)
 2012-05-13 01:06:28 +00:00
Christoph Oelckers
898232be61 - fixed: Suicides could count towards multikills (patch by edward850) 
SVN r3632 (trunk)
 2012-05-08 12:27:01 +00:00
Randy Heit
b94607dc7e - Being killed by a voodoo doll now has its own obituary, rather than trying to come up with one 
by treating it as a real player.

SVN r3574 (trunk)
 2012-04-19 04:03:42 +00:00
Randy Heit
b036ef63e9 - Fixed: The 0-damage FORCEPAIN checks in P_DamageMobj() also need to check the PAINLESS and NOPAIN flags. 
SVN r3573 (trunk)
 2012-04-19 03:40:27 +00:00
Randy Heit
c03be3b43b - Fixed: Don't ignore FORCEPAIN if damage modification takes the damage to 0. 
SVN r3567 (trunk)
 2012-04-15 03:48:27 +00:00
Christoph Oelckers
81eef71067 - added FDARI's Default/global damagetype properties submission. 
SVN r3523 (trunk)
 2012-04-07 12:11:17 +00:00
Braden Obrzut
1f6c6aafd9 - Fixed: DesignatedTeams prevented monsters from hurting themselves in teamplay. 
SVN r3508 (trunk)
 2012-04-01 20:43:14 +00:00
Randy Heit
49ea87f8bc - Fixed: Poison damage lost damage type information if the poisoner was destroyed before poisoncount 
reached 0.
- Fixed: Poisoners without a PainType should use their own DamageType to pick the Pain state
  to make the target enter, not the target's DamageType.

SVN r3475 (trunk)
 2012-03-23 20:57:10 +00:00
Randy Heit
9fcc6ebc89 - Fixed: Armor did not use damagefactor "Normal" as a fallback factor. 
SVN r3469 (trunk)
 2012-03-23 01:20:45 +00:00
Christoph Oelckers
9fc5539ae7 - fixed case of damage type variables. 
- fixed loading of BMF fonts' palettes. Index 0 is always transparent and the stored palette data starts at index 1.


SVN r3240 (trunk)
 2011-06-17 22:46:34 +00:00
Christoph Oelckers
4d7fcbf1b8 - added Major Cooke's Death/Paintype submission. 
SVN r3237 (trunk)
 2011-06-13 17:15:09 +00:00
Christoph Oelckers
44921297d3 - added DavidPH's PoisonDamageType submission. 
SVN r3235 (trunk)
 2011-06-13 10:39:14 +00:00
Christoph Oelckers
ab60afd0b8 - added DavifPH's fix for poisoning invulnerable players. 
SVN r3231 (trunk)
 2011-06-13 10:25:03 +00:00
Christoph Oelckers
61dfb608f4 - added DavidPH's ProjectileKickback submission. 
SVN r3228 (trunk)
 2011-06-13 09:16:57 +00:00
Christoph Oelckers
2e4e5bdb28 - added DavidPH's damage type specific damage color submission. 
SVN r3220 (trunk)
 2011-06-06 22:23:43 +00:00
Christoph Oelckers
24ac385d83 - fixed: Telefrag damage should not be affected by skill damage factors. 
SVN r3218 (trunk)
 2011-05-28 06:53:04 +00:00
Christoph Oelckers
6053627c5c - added DONTCORPSE submission. 
SVN r3216 (trunk)
 2011-05-26 23:27:58 +00:00
Braden Obrzut
d9d94d04ba - Added DesingatedTeam property from Skulltag. Allows friendly fire calculations to be applied to monsters/objects and allows the friendly AI to be aware of teams. 
SVN r3113 (trunk)
 2011-01-22 03:35:33 +00:00
Christoph Oelckers
d45262f96b - fixed: With the Buddha cheat active the health of the real player actor was not synchronized with the player data if a voodoo doll received damage that would have killed it. 
SVN r2978 (trunk)
 2010-11-03 23:43:34 +00:00
Christoph Oelckers
74525ab1d6 - moved some info into the GAMEINFO section: 
* the sprite used for 'pause'.
 * the factor with which a monster's health is multiplied to decide if it's supposed to be gibbed,
 * the decision to make monsters run faster in nightmare mode.
- moved the hard coded lock messages for lock types 102 and 103 into the language lump.
- fixed: Raven's fast monsters could become slower in Nightmare if they had very short walking states.


SVN r2834 (trunk)
 2010-09-19 10:39:34 +00:00