zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity
5195 commits 86 branches 139 tags 124 MiB
Commit graph

5195 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Oelckers
eb78c24140 - small oversight: TakeSpecialDamage must be called if damage is 0 (to do the special death state checks) but it may not be called if damage is already -1, because that means that damage and pain have already been ruled out completely. 2015-03-27 14:37:13 +01:00
Christoph Oelckers
9d5e6d32c7 - review of P_DamageMobj: 
* decided that the pain threshold should always be checked against the actual damage, even if it's down to 0, for consistency. This also restores the original behavior of using actual damage for checking the pain threshold which was altered by the introduction of the ALLOWPAIN and CAUSEPAIN flags.
* removed all newly added exceptions that excluded the player from checks for completely cancelled out damage.
* if anything during damage modification causes negative damage, no pain handling whatsoever will be initiated.
* made sure that TELEFRAG_DAMAGE will not be subjected to damage amount modification by protection items and any other kind of damage modification.
 2015-03-27 13:49:47 +01:00
Christoph Oelckers
ac7abca6f8 - completely removed fakePain check in case DoSpecialDamage returns -1. This signifies a special case that should bypass anything that inflicting pain implies. 2015-03-27 11:55:11 +01:00
Christoph Oelckers
c78b9235a8 - DoSpecialDamage was formerly called for any damage value, removed check for 'damage > 0' to restore original behavior. 2015-03-27 11:50:27 +01:00
Christoph Oelckers
375c0ac736 - cleanup of damage flag handling in P_RailAttack. 2015-03-27 10:10:22 +01:00
Christoph Oelckers
19cea0f626 - fixed: DoCheckSpecies got an actor's species by directly reading the 'species' variable, bypassing initialization in GetSpecies. 
- cleaned up DoCheckSpecies and DoCheckFilter which both contained several redundant checks and renamed DoCheckFilter to DoCheckClass.
 2015-03-27 09:57:33 +01:00
Christoph Oelckers
602f541e31 - use '|', not '+' to combine flags. 
There's probably going to be more of these coming...
 2015-03-27 09:40:47 +01:00
Christoph Oelckers
c78fdae31d - beautification of A_BFGSpray. 
Reordered checks so that only one 'spray != NULL' is needed, removed redundant thingToHit variable and reformatted slightly.
 2015-03-27 09:25:26 +01:00
Christoph Oelckers
66c3c93529 - call TakeSpecialDamage, even if damage is 0, just like it was in older versions. 2015-03-27 09:03:44 +01:00
Randy Heit
5d27bf7742 Add Windows 8+ related bits to the manifest 2015-03-27 00:25:53 -05:00
Randy Heit
3463b87876 Fixed: MUSINFO was not multiplayer-aware 
- Move MUSINFO change request out of FLevelLocals and into player_t. This
  allows the MusicChanger actors to change music for each player
  independantly. This is similar to PrBoom+, which switches depending on
  the displayplayer. The difference being, we don't actually track the
  music other players are listening to. (Which might not be a bad idea to
  implement at some point.)
- Moved a few fields in player_t for better packing.
 2015-03-26 23:19:05 -05:00
Randy Heit
9cd6aae902 Added Archvile ghosts compatibility flags for some more maps 2015-03-26 22:02:10 -05:00
Randy Heit
ee9f64427c Add wad name to mapchecksum output 2015-03-26 22:01:57 -05:00
Randy Heit
93c7f4b4b5 Don't accelerate BOOM colormaped player sprites 
- Fixed: Player weapons ignored BOOM colormaps when accelerated.
 2015-03-26 21:46:14 -05:00
Randy Heit
32a55c9229 Revert "- Fixed: A_Die didn't consider missiles for the function." 
This reverts commit 5977cb04d9.

- It breaks at least one mod (Complex Doom) and who knows how many others.
  Considering how long A_Die has been around, a random "fix" like this is
  probably not a good idea. [P.S. Missiles have health and can be damaged
  by P_DamageMob, so it's not like it never did anything on missiles.]
 2015-03-26 20:57:12 -05:00
Christoph Oelckers
29c5071672 Merge branch 'hashing' of https://github.com/Edward850/zdoom 2015-03-26 13:05:42 +01:00
Edward Richardson
2c978bc6f7 Change hashfiles filename string to a cstr 
- It seems some compilers don't like passing FNames to Printf, and this
might as well be a cstr anyway.
 2015-03-26 23:38:09 +13:00
Christoph Oelckers
d206e423b6 Merge branch 'countitems' of https://github.com/edward-san/zdoom 2015-03-25 23:21:14 +01:00
Christoph Oelckers
3d2eaf81db Merge branch 'hashing' of https://github.com/Edward850/zdoom 2015-03-25 23:20:20 +01:00
Braden Obrzut
98b2475fb8 - Fixed: Loading music from an external file was broken. 2015-03-25 17:28:05 -04:00
Edoardo Prezioso
66b090cd44 - Improvements to some of the actor debug CCMDs. 
- 'monster' and 'items' can now filter the list if an argument is passed (like with 'kill');
- added 'countitems', which will show only the 'count items' in the current map, with the same filter parameter as 'monster' and 'items'.
- reorganize the code to reduce the duplication.
 2015-03-25 22:25:00 +01:00
Christoph Oelckers
21314fe867 Merge branch 'causepainfix' of https://github.com/MajorCooke/zdoom 2015-03-25 20:36:09 +01:00
Christoph Oelckers
d1a972ff3d - fixed: The recent ANIMDEFS extension missed adjusting the call to AddSimpleAnim for ANIMATED-defined animations. 2015-03-25 20:34:26 +01:00
Christoph Oelckers
9eda15c280 - fixed: The recent ANIMDEFS extension missed adjusting the call to AddSimpleAnim for ANIMATED-defined animations. 2015-03-25 20:33:24 +01:00
MajorCooke
d45d45583b Take PainThresholds into account. 2015-03-25 14:27:12 -05:00
MajorCooke
f161c0c501 - Fixed: Projectile impacts never called P_DamageMobj when damage was 0 without the CAUSEPAIN flag. 2015-03-25 14:19:50 -05:00
Braden Obrzut
890fb39d25 - Apparently cmake_policy doesn't ignore unknown policies (which seems to defeat the purpose to me) so we must wrap them in code to detect if the policy is known. 2015-03-24 18:28:59 -04:00
Christoph Oelckers
c249157876 Merge branch 'master' into openal 2015-03-24 17:59:08 +01:00
Christoph Oelckers
7b6d245444 - added NULL pointer checks to A_CheckStaff. 2015-03-24 09:22:51 +01:00
Braden Obrzut
e29b8b2094 - Fixed: QuakeEx ACS function didn't handle fixed->double conversion. 2015-03-24 00:02:25 -04:00
Braden Obrzut
b958e930cf - Cleared developer warnings with modern (3.0+) versions of CMake. 2015-03-23 23:28:18 -04:00
Braden Obrzut
44f9f2bbd6 - Fixed: Default movedown bind was set to "insert" and not "ins". 2015-03-23 21:51:33 -04:00
Randy Heit
86e1d3ed9a Improve default IWAD search paths for Unix 
- /usr/share/doom and /usr/share/games/doom are better default paths than
  /usr/local/share
 2015-03-23 17:01:49 -05:00
Christoph Oelckers
7dbabb5ee7 - missed a NULL pointer check. 2015-03-21 13:08:08 +01:00
Christoph Oelckers
ffbcda206c - allow oscillating for discretely defined animations as well, not just for ranged ones. 
- add random animations.
 2015-03-21 12:48:37 +01:00
Edward Richardson
bf6cdba0bb Added -hashfiles command 2015-03-17 18:07:50 +13:00
Christoph Oelckers
502120e78f Merge branch 'osx_newmb_res' of https://github.com/alexey-lysiuk/gzdoom 2015-03-15 09:53:24 +01:00
Christoph Oelckers
16ad440adb - fixed: The distance check in A_RadiusGive could overflow for large distances. 2015-03-15 09:51:57 +01:00
Christoph Oelckers
cf579e4c77 - removed unused 'bombvec' variable from P_RadiusAttack. 2015-03-14 13:14:27 +01:00
alexey.lysiuk
64d663397b Added video resolution of new 12" MacBook, 2304-by-1440 2015-03-14 11:39:47 +02:00
Christoph Oelckers
6012950230 Merge branch 'master' of https://github.com/rheit/zdoom 2015-03-14 09:35:23 +01:00
Christoph Oelckers
da26e10951 - fixed: The FBoundingBox constructor taking a point and a radius needs to restrict the resulting values to the fixed point range. 2015-03-14 09:34:55 +01:00
Randy Heit
433744d0fd Fix old warning on VC 2005 2015-03-12 13:41:38 -05:00
MajorCooke
9a09fbd7ed Added MTHRUSPECIES support for rails and sprays. 2015-03-12 09:34:25 +01:00
MajorCooke
b6ca1947ff Added QuakeEx for ACS. ACC is ready as well. 2015-03-12 09:26:47 +01:00
Kyle Evans
bc206f21af A_FireCustomMissile's useammo parameter should NOT use ammo if not called from a weapon 2015-03-11 14:24:31 -05:00
Randy Heit
4f04fb4fbd Don't use AdjustWindowRectEx to determine window sizes 
- GetSystemMetrics can lie about the window border sizes, so we can't
  trust it if the executable is flagged as Vista-targetting
  (default behavior for VS2012/2013).
 2015-03-11 13:59:51 -05:00
Randy Heit
8398a6ee75 Change cpu_lag_max to a define, since it is used in an assert 2015-03-11 13:26:35 -05:00
Randy Heit
e073786abe Move MULSC stuff into a separate include file 2015-03-11 13:24:55 -05:00
Randy Heit
1706ff5ccb Use new IT filter instead of old 
- The old SSE filter sounds fine with VC 2005, but produces occasional
  garbage with VC 2013.
 2015-03-11 13:24:45 -05:00