Commit Graph

3649 Commits

Author SHA1 Message Date
Christoph Oelckers ddae9757a8 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-26 09:32:43 +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
Christoph Oelckers 93e040b322 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-25 09:23:11 +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 0980f6645c Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-24 16:54:37 +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 5a24190796 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-24 02:31:18 +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
Christoph Oelckers 37504a3444 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-24 01:21:07 +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 46d203a929 - removed unused variable wgl_extensions. 2013-06-24 00:59:57 +02: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 68984467b1 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-23 20:55:17 +02:00
Christoph Oelckers 3a477f6903 - DavidPH's patch for Linux compilation. 2013-06-23 20:54:21 +02:00
Christoph Oelckers 0da957a605 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-23 20:06:48 +02:00
Christoph Oelckers 4286bd68cd - added Edward-san's spycancel submission. 2013-06-23 20:04:06 +02:00
Christoph Oelckers faeba3933e Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-23 18:52:45 +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 4500145ef9 - forgot to add wadsrc_lights and wadsrc_bm projects to solution. 2013-06-23 14:36:26 +02:00
Christoph Oelckers 21d1ff4839 - remove d_dehackedactions.h from .prj file. 2013-06-23 13:35:00 +02:00
Christoph Oelckers 4c860ed3b1 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-23 13:33:13 +02:00
Christoph Oelckers d8abeceef9 - updated .gitignore to ignore all compile generated files. 2013-06-23 13:31:06 +02:00
Christoph Oelckers e00847f64b - GZDoom solution file
- missing GL resources for gzdoom.pk3.
2013-06-23 11:13:01 +02:00
Christoph Oelckers b2bb24ea0a - GZDoom project files and GZDoom related changes to main ZDoom code 2013-06-23 10:46:31 +02:00
Christoph Oelckers c4d3a7ac69 - d_dehackedactions no longer exists. 2013-06-23 10:42:07 +02:00