Commit graph

3644 commits

Author SHA1 Message Date
Christoph Oelckers
2f325a1b81 Merge branch 'maint' into maint_1.8
Conflicts:
	src/version.h
2013-07-03 07:34:25 +02:00
Randy Heit
5b17c0779b Version 2.7.1 2013-07-02 15:46:31 -05:00
Randy Heit
e845b292c2 - Always clear bEvilGrin after checking it in FMugShot::UpdateState(). If
it's not an appropriate time to show the grin when the flag is set, it
  shouldn't be saved until later.
2013-07-02 14:48:03 -05:00
Randy Heit
5af1e6f734 - Added a compatibility option to fix Super Sonic Doom's first bonus
stage leaving you frozen when you finished it.
2013-07-02 14:15:08 -05:00
Christoph Oelckers
05a95f0ed0 Merge branch 'maint' into maint_1.8
Conflicts:
	wadsrc/CMakeLists.txt
2013-07-02 10:04:35 +02:00
Randy Heit
23e21cc85e - Fixed: S_IsChannelUsed() is declared as static, so it should be defined
as such, too.
2013-07-01 22:02:46 -05:00
Randy Heit
001ed91fd4 - Fixed: ACS's PlaySound should mask off the flag bits from the channel
before passing it to S_IsActorPlayingSomething().
2013-07-01 22:01:26 -05:00
Randy Heit
2717ed703d Shuffle FActionMap for better 64-bit alignment. 2013-07-01 21:51:12 -05:00
Randy Heit
e9425b356b - Fixed: Verbose user info strings were written with an extra backslash
character between the key and value.
2013-07-01 21:40:09 -05:00
Braden Obrzut
02ff428d54 - Allow generator expressions to be turned off during pk3 building with CMake.
- On Mac OS X, ensure assembly code is disabled by default (since it won't work).
2013-07-01 16:57:46 -04: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
b35422376e - add brightmaps.pk3 and lights.pk3 to VC++ 64bit confguration. 2013-06-27 20:03:05 +02:00
Braden Obrzut
276ca5b75b - Fixed compilation on non-Windows systems by removing dependency on src/Linux/platform.h 2013-06-26 19:01:00 -04:00
Christoph Oelckers
119bcd7686 Merge branch 'maint' into maint_1.8 2013-06-26 20:23:15 +02:00
Christoph Oelckers
d65af4b5bb - fixed updaterevision calls in VC project.
- put back a clean version file into the maintenance branch.
2013-06-26 20:22:52 +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
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
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
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
31d748d848 Merge branch 'maint' into maint_1.8 2013-06-24 02:30:45 +02:00
Christoph Oelckers
631fd69719 - fixed: GoldWandPuff2 requires the PUFFONACTORS flag. 2013-06-24 02:25:16 +02:00
Christoph Oelckers
252cb6c760 Merge branch 'maint' into maint_1.8
Conflicts:
	.gitignore
2013-06-24 02:02:59 +02: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
3da7dcea03 - this is version 1.8.1. 2013-06-23 14:52:21 +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
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
Christoph Oelckers
a73d1b792c - fixed: Assignment of GetLightLevel to GLWall::lightlevel must be clamped. This was done incorrectly in the last SVN version which clamped the result of GetLightLevel, causing problems elsewhere. 2013-06-23 10:17:58 +02:00
Christoph Oelckers
399d0974ab - added GL render as of SVN revision 1600. 2013-06-23 09:49:34 +02:00
Christoph Oelckers
8c31955731 - brightmap and light definitions. 2013-06-23 09:32:35 +02:00
Christoph Oelckers
71e65ed116 - GZDoom differences to /wadsrc. 2013-06-23 09:30:04 +02:00