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
31d748d848
Merge branch 'maint' into maint_1.8
2013-06-24 02:30:45 +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
252cb6c760
Merge branch 'maint' into maint_1.8
...
Conflicts:
.gitignore
2013-06-24 02:02:59 +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
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
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