Commit graph

3634 commits

Author SHA1 Message Date
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
Christoph Oelckers
f501983d1b Merge branch 'maint' 2013-06-30 18:16:38 +02:00
Christoph Oelckers
310979e9e6 - fixed clang compile error "friend declaration specifying a default argument must be the only declaration". 2013-06-30 18:16:02 +02:00
Christoph Oelckers
f0feee3b4e Merge branch 'maint' 2013-06-26 01:03:19 +02:00
Christoph Oelckers
fb1734ba50 - fix previous commit and add compat option for Cheogh's blue key. 2013-06-26 00:57:26 +02:00
Christoph Oelckers
72e91786e2 - added SetThingZ compatibility option for fixing problems resulting from the changes to spawn position handling. 2013-06-26 00:57:10 +02:00
Christoph Oelckers
4622ab865b - merged the two blocks for void.wad in compatibility.txt. 2013-06-25 11:55:49 +02:00
Randy Heit
fb965c50a1 Merge branch 'maint' 2013-06-24 20:59:12 -05:00
Randy Heit
a5f5d8adcb - Remove the first parameter from updaterevision, since it isn't needed with git. 2013-06-24 20:58:14 -05:00
Randy Heit
1032170ccd - Add .aps files to .gitignore 2013-06-24 20:53:49 -05:00
Randy Heit
b9d5949825 - Add popen/pclose macros for updaterevision on Windows. 2013-06-24 20:52:52 -05:00
Randy Heit
e989e11f5c - update revision via popen() (via GZDoom OS X) 2013-06-24 20:52:01 -05:00
Christoph Oelckers
4189092db8 - spycancel improvement by Edward-san. 2013-06-24 22:50:24 +02:00
Christoph Oelckers
94a3d92f93 Merge branch 'maint' 2013-06-24 16:49:51 +02: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
c4ad09fe90 - added new MAPINFO/gameinfo keys for adding entries to some string arrays, most notably the player classes and the F1 info pages. 2013-06-24 15:50:30 +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
Christoph Oelckers
1976f28df9 - merge cheat fix from maint. 2013-06-24 14:32:55 +02:00
Christoph Oelckers
baa82c396c - disabled Heretic's 'joke' cheats and Chex's 'idmus' in 'allcheats' mode because their multiple occurence interfered with how the cheat parser works. 2013-06-24 14:25:48 +02:00
Christoph Oelckers
e4f78f225c Merge fix. 2013-06-24 02:26:23 +02:00
Christoph Oelckers
631fd69719 - fixed: GoldWandPuff2 requires the PUFFONACTORS flag. 2013-06-24 02:25:16 +02:00
Randy Heit
7531191ffe Get fixed SAVESIG from maint. 2013-06-23 18:14:39 -05:00
Randy Heit
03d2b79bfd - Fixed: SAVEVERSTRINGIFY macros were wrong. 2013-06-23 18:14:29 -05:00
Christoph Oelckers
d1835b2db8 - DavidPH's patch for Linux compilation. 2013-06-23 17:38:51 -05:00
Christoph Oelckers
ef42955053 - added DavidPH's patch for compiling with FModEx 4.44.01. 2013-06-23 17:38:51 -05:00
Christoph Oelckers
5fd3b1cf19 - added _mental_*s compatibility fix for Ultimate Simplicity, map07 2013-06-23 17:38:51 -05:00
Christoph Oelckers
054899ea53 - added Edward-san's patch for allowing 'clang' compiler to use the same 'gcc' cmake settings 2013-06-23 17:38:51 -05:00
Christoph Oelckers
c0e634b0ac - updated .gitignore to ignore all compile generated files. 2013-06-23 17:38:51 -05:00
Christoph Oelckers
4e77b93a52 - d_dehackedactions no longer exists. 2013-06-23 17:38:51 -05:00
Christoph Oelckers
099e365a23 - fixed typo in USDF spec.
- comment fixes taken from GZDoom.
- division by zero check in R_SetVisibility from GZDoom.
2013-06-23 17:38:51 -05:00
Christoph Oelckers
3a477f6903 - DavidPH's patch for Linux compilation. 2013-06-23 20:54:21 +02:00
Christoph Oelckers
4286bd68cd - added Edward-san's spycancel submission. 2013-06-23 20:04:06 +02:00
Christoph Oelckers
a6ba2ce8b9 - added DavidPH's patch for compiling with FModEx 4.44.01. 2013-06-23 18:47:39 +02:00
Christoph Oelckers
7d56311152 - added Ryan Cordell's A_CheckRange submission. 2013-06-23 18:45:17 +02:00
Christoph Oelckers
5bbb18b6dd - added _mental_*s compatibility fix for Ultimate Simplicity, map07 2013-06-23 18:39:01 +02:00
Christoph Oelckers
7c81c2f1ee - added Edward-san's patch for allowing 'clang' compiler to use the same 'gcc' cmake settings 2013-06-23 18:37:13 +02:00
Christoph Oelckers
aa5f223051 - added _mental_'s patch for loading .deh/.bex files if no Dehacked lump can be found. 2013-06-23 18:34:57 +02:00
Christoph Oelckers
d8abeceef9 - updated .gitignore to ignore all compile generated files. 2013-06-23 13:31:06 +02:00
Christoph Oelckers
c4d3a7ac69 - d_dehackedactions no longer exists. 2013-06-23 10:42:07 +02:00
Christoph Oelckers
50c5dc62aa - fixed typo in USDF spec.
- comment fixes taken from GZDoom.
- division by zero check in R_SetVisibility from GZDoom.
2013-06-23 10:28:12 +02:00
Randy Heit
54f06739d0 Set master banch up as 2.8pre and maint branch for 2.7.x 2013-06-22 22:44:48 -05:00
Randy Heit
eb3f243fc8 - Make a copy of the polyobject mirror number instead of relying on being able to read it from the initial linedef. 2013-06-22 22:40:17 -05:00
Randy Heit
d8f88770fd - baseversion.h was not supposed to make its way into zdoom.vcproj, since it was never used. 2013-06-22 22:39:20 -05:00
Randy Heit
98ac224e53 - Use gitinfo.h instead of svnrevision.h for versioning.
- Use functions in gitinfo.cpp to retrieve the strings from gitinfo.h so
  that changes to gitinfo.h only require recompiling one file instead of
  several.
2013-06-22 21:49:51 -05:00
Randy Heit
fece189bdb - Change updaterevision to use git instead of svnversion 2013-06-22 20:49:38 -05:00
Alex Mayfield
742ecd324b Convert svn:ignore to .gitignore. 2013-06-13 21:24:08 -04:00
Randy Heit
5916ce087b - Revert r4244. It seems to be working well enough like this, since there have been no complaints.
SVN r4341 (trunk)
2013-06-08 03:24:41 +00:00
Randy Heit
9510525fdf - Bump up to 2.7.0.
SVN r4339 (trunk)
2013-06-08 02:20:37 +00:00
Randy Heit
5b65b3ebdf - Bumped NETGAMEVERSION, which should have been done when I changed the order uservars were sent
during netgame initialization.

SVN r4338 (trunk)
2013-06-08 02:18:23 +00:00
Randy Heit
902f6647b6 - Added ACS function CheckFont.
SVN r4335 (trunk)
2013-06-06 20:48:57 +00:00