Commit graph

802 commits

Author SHA1 Message Date
Christoph Oelckers
36b487fd78 Merge branch 'maint' 2013-08-11 11:32:44 +02:00
Christoph Oelckers
1acbe17876 - specte typo in language.ptb. 2013-08-10 21:15:06 +02:00
Christoph Oelckers
d438c6c456 - fixed typo in Strife spectre's obituary message and added it to the DECORATE definition of the spectre. 2013-08-10 20:42:34 +02:00
Christoph Oelckers
c88bf3108c Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-10 10:21:00 +02:00
Christoph Oelckers
3bcc4078b1 Merge branch 'maint' 2013-08-10 10:19:20 +02:00
Christoph Oelckers
1c889dc9fa - let APowerRegeneration use the Strength property to define the amount of regeneration it gives. 2013-08-10 09:51:48 +02:00
Christoph Oelckers
ad7c53855e Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-09 13:05:14 +02:00
Christoph Oelckers
21bce3b0c4 Merge branch 'maint' 2013-08-09 12:51:26 +02:00
Christoph Oelckers
5d0369d4ed - Ability to set A_VileAttack's initial attack's damage type - by BlueShadow. 2013-08-09 12:18:58 +02:00
Christoph Oelckers
34b71baad1 - added Player.Aircapacity property which is used as a multiplier for the level's air supply. 2013-08-09 11:57:14 +02:00
Christoph Oelckers
9f35788164 - added custom automap overlay colors.
- extended am_drawmapback so that map backgrounds can only be drawn if used with custom colorsets and Raven's, assuming that these sets were specifically made for the accompanying backgrounds.
2013-08-09 11:00:24 +02:00
Christoph Oelckers
62e55d710a Merge branch 'master' of https://github.com/rheit/zdoom 2013-08-02 22:14:22 +02:00
Christoph Oelckers
8f45e906d4 Merge branch 'automap_colors' 2013-08-02 18:16:05 +02:00
Christoph Oelckers
42848f41dc - fixed typo in MENUDEFS. 2013-08-02 18:15:39 +02:00
Christoph Oelckers
aa72857c72 - implemented automap color parser for MAPINFO (code not tested yet!) 2013-08-02 16:56:42 +02:00
Christoph Oelckers
845020c617 - ovthingcolors were not properly set.
- added all the missing color CVARs for the overlays which previously duplicated use of one of the other CVARs.
2013-07-31 23:13:20 +02:00
Christoph Oelckers
ef6fca823e Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	src/version.h
2013-07-30 15:20:38 +02:00
Christoph Oelckers
e01c4e0201 Merge branch 'maint' 2013-07-30 13:18:08 +02:00
Christoph Oelckers
16456bec56 - added separate colors for the various types of 2-sided walls for the overlay automap. They previously all mapped to the same CVAR. 2013-07-30 13:17:20 +02:00
Christoph Oelckers
81334809c4 - changed autoloading of *.deh lumps: it is now controlled by a CVAR with 3 options: never load *.deh lumps, load all of them or only load the last one. *.deh loading is disabled by default. 2013-07-30 09:32:33 +02:00
Christoph Oelckers
cf31ccbbaf Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-28 18:23:50 +02:00
Christoph Oelckers
c253d40fbb - externalize labels for automap statistics display to the string table. 2013-07-28 16:18:57 +02:00
Christoph Oelckers
b499742d46 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-25 17:31:27 +02:00
Christoph Oelckers
897a17309b - added menu option for sprite display on automap. 2013-07-25 17:22:45 +02:00
Christoph Oelckers
cbc0b70e7c - TransferStencilColor A_SpawnItemEx patch / by Ryan Cordell. 2013-07-24 20:15:17 +02:00
Christoph Oelckers
ba2faee125 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-22 23:01:58 +02:00
Christoph Oelckers
f3d8790995 Merge branch 'maint' of https://github.com/rheit/zdoom into maint 2013-07-22 22:54:45 +02:00
Christoph Oelckers
83bd8ba1b8 - added NeuralStunner's player.userange submission, but changed it to use the value directly from the PlayerPawn data.
- bumped savegame version for addition of APlayerPawn::userange.
2013-07-22 22:37:50 +02:00
Christoph Oelckers
aad509c800 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-14 14:47:12 +02:00
Christoph Oelckers
531da15ac2 Merge branch 'maint' 2013-07-14 14:44:11 +02:00
Christoph Oelckers
10dd75f902 - externalized "New save game" line for save screen. 2013-07-14 09:31:49 +02:00
Christoph Oelckers
453f4ace5c - added compatibility setting for stuff in Cheogsh2 MAP04's megasphere cage which is positioned too low. 2013-07-14 09:01:00 +02:00
Christoph Oelckers
edd2142a0f Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-02 22:11:55 +02:00
Randy Heit
3d61365879 Merge branch 'maint' 2013-07-02 14:51:49 -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
503dc1d9a1 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	wadsrc/CMakeLists.txt
2013-07-02 09:59:59 +02:00
Braden Obrzut
cc616a417d Merge branch 'maint' 2013-07-01 16:58:14 -04: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
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
4622ab865b - merged the two blocks for void.wad in compatibility.txt. 2013-06-25 11:55:49 +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
5fd3b1cf19 - added _mental_*s compatibility fix for Ultimate Simplicity, map07 2013-06-23 17:38:51 -05:00
Christoph Oelckers
faeba3933e Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-23 18:52:45 +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
e00847f64b - GZDoom solution file
- missing GL resources for gzdoom.pk3.
2013-06-23 11:13:01 +02:00
Christoph Oelckers
71e65ed116 - GZDoom differences to /wadsrc. 2013-06-23 09:30:04 +02:00
Christoph Oelckers
c4b7335312 - fixed: UDMF's Doom namespace needs to retain Boom's sector special flags.
- fixed: UDMF's ZDoomTranslated namespace needs to set the DUMMYSWITCHES flag so that it remains compatible with Doom-format ZDoom maps.


SVN r4325 (trunk)
2013-06-03 07:14:42 +00:00
Randy Heit
2d13a45773 - Added read access to an actor's melee range from DECORATE and ACS, via Blue Shadow.
SVN r4305 (trunk)
2013-06-01 02:23:27 +00:00
Christoph Oelckers
dbf68e3f2c - fixed the Peasants DECORATE definition.
SVN r4298 (trunk)
2013-05-30 21:07:29 +00:00
Christoph Oelckers
a7c2346b32 - added a FloatBobPhase property for DECORATE. Now, if FloatBobPhase is anything but -1 it will be used directly as the initial phase, allowing to define actors that bob in sync. The allowed range of phases is 0 - 63. The main reason for this is that each actor spawn called the pr_spawnmobj RNG just to randomize this value which causes problems with non-interactive actors, in particular GZDoom's dynamic lights.
SVN r4296 (trunk)
2013-05-30 08:52:29 +00:00
Christoph Oelckers
567fbace22 - re-fixed r4279.
SVN r4282 (trunk)
2013-05-25 18:30:23 +00:00
Christoph Oelckers
2767f31a92 - fixed: PillarAlienPower must loop its state.
SVN r4279 (trunk)
2013-05-25 16:22:51 +00:00
Braden Obrzut
332e39d6c8 - Fixed: Typo in WaterDropOnFloor actor's active sound.
SVN r4276 (trunk)
2013-05-22 21:26:06 +00:00
Braden Obrzut
1d4fbc05a5 - Fixed: glbsp nodes in a wad file inside a pk3 would not be loaded.
- Fixed: Typo from r4270.

SVN r4273 (trunk)
2013-05-20 20:39:34 +00:00
Randy Heit
6ada6158ef - Added a fallback for accented characters to use unaccented ones.
- Updated Portuguese strings with the version here: http://forum.zdoom.org/viewtopic.php?p=672839#p672839

SVN r4271 (trunk)
2013-05-17 02:35:35 +00:00
Randy Heit
71f42122bc - Added a definition for OB_MPMAULER1 and removed the needless reference to OB_MPMAULER2.
SVN r4270 (trunk)
2013-05-17 01:22:19 +00:00
Randy Heit
ec7f433da3 - Fixed: Strife line special 200 should also be marked as repeatable.
SVN r4269 (trunk)
2013-05-17 01:06:47 +00:00
Randy Heit
4692e3f69c - Fixed: Strife line special should have been marked repeatable.
SVN r4268 (trunk)
2013-05-17 01:02:43 +00:00
Randy Heit
6922049b83 - Redo r4259, because I guess those weren't actually whitespace changes. (Although they looked like it to me.)
SVN r4266 (trunk)
2013-05-14 23:34:24 +00:00
Randy Heit
1e32e75eef - Removed the music strings from the Brazilian Portuguese translations. (And apparently some whitespace changes too?)
SVN r4260 (trunk)
2013-05-12 18:43:28 +00:00
Randy Heit
cb7bc7e66c - Fixed: TAG_MINEKEY still contained the underscore character.
SVN r4259 (trunk)
2013-05-12 18:41:44 +00:00
Randy Heit
404df07629 - Fixed: The Ironlich lost its Pain state when it was converted to DECORATE.
SVN r4252 (trunk)
2013-05-07 01:57:05 +00:00
Randy Heit
8830d3a07a - Fixed: Ever since r1078, D'Sparil has been too quiet.
SVN r4249 (trunk)
2013-05-04 19:46:38 +00:00
Randy Heit
e9cd2777f3 - Fixed: r4226 had bad copy-paste angles for Demon2's XDeath.
SVN r4241 (trunk)
2013-04-30 04:49:24 +00:00
Randy Heit
77b57e2f98 - Fixed: Hexen's A_DemonDeath and A_Demon2Death had been converted to incorrect generic Decorate.
SVN r4226 (trunk)
2013-04-28 01:58:51 +00:00
Christoph Oelckers
9f71c7cb4e - added Xaser's reactiontime for ACS and DECORATE expression patch.
SVN r4222 (trunk)
2013-04-20 21:32:03 +00:00
Randy Heit
d99517292b - Added DONTGIB flag to Key, so key-dropping enemies can be used reliably near crushers.
SVN r4218 (trunk)
2013-04-16 20:26:35 +00:00
Christoph Oelckers
0d89183aa7 - ignoreteleporttags compatibility setting for a few maps.
SVN r4208 (trunk)
2013-04-02 19:11:50 +00:00
Randy Heit
147da94e2f - Added FDARI's CLOFF_JUMP_ON_MISS and CLOFF_AIM_VERT_NOOFFSET flags.
SVN r4207 (trunk)
2013-03-28 01:29:23 +00:00
Randy Heit
f9915d7cf2 - Added FDARI's A_CheckLOF, modified to use a Trace callback function.
SVN r4201 (trunk)
2013-03-23 02:55:59 +00:00
Randy Heit
c54ea7f6b7 - Added SXF_TRANSFERSPECIAL and SXF_CLEARCALLERSPECIAL flags for A_SpawnItemEx.
SVN r4199 (trunk)
2013-03-23 01:22:37 +00:00
Randy Heit
53e73783e0 - Added spawnofs_z parameter to A_RailAttack and A_CustomRailgun.
SVN r4191 (trunk)
2013-03-20 03:36:45 +00:00
Randy Heit
277d59b2bb - Added flags SXF_CLEARCALLERTID, SXF_MULTIPLYSPEED, and SXF_TRANSFERSCALE for A_SpawnItemEx.
SVN r4188 (trunk)
2013-03-20 03:07:45 +00:00
Christoph Oelckers
b0203c9f1d - added Xaser's SXF_USEBLOODCOLOR for A_SpawnItemEx submission
SVN r4181 (trunk)
2013-03-13 11:27:30 +00:00
Randy Heit
8410ac760a - Added A_SetDamageType.
SVN r4180 (trunk)
2013-03-13 04:04:48 +00:00
Braden Obrzut
3fe31668a6 - More Visual Studio with CMake fixes.
SVN r4176 (trunk)
2013-03-08 19:23:06 +00:00
Christoph Oelckers
33f363f4c6 - added TheFortuneTeller's NORANDOMPUFFZ submission.
SVN r4170 (trunk)
2013-02-27 10:35:44 +00:00
Braden Obrzut
01fed92920 - Added support for Visual Studio to the CMake project.
SVN r4166 (trunk)
2013-02-25 00:12:21 +00:00
Christoph Oelckers
81785124c5 - fixed: the ExplosiveBarrel's height was wrong.
SVN r4161 (trunk)
2013-02-22 21:18:29 +00:00
Christoph Oelckers
071002c02b - add weapon slots to key configuration menu.
SVN r4154 (trunk)
2013-02-20 12:22:04 +00:00
Randy Heit
2e7ef2e019 - Added Brazilian Portuguese translation.
SVN r4149 (trunk)
2013-02-19 02:59:40 +00:00
Randy Heit
f5891dea25 - Added time display for alt hud.
SVN r4148 (trunk)
2013-02-19 02:58:03 +00:00
Randy Heit
bd601a1bc8 - Added NOTRAIL flag for PowerSpeed.
SVN r4146 (trunk)
2013-02-19 02:44:49 +00:00
Christoph Oelckers
027a99d772 - fixed: Hexen's Floor_RaiseAndCrush is not the same action as the one used by Doom and which was used by ZDoom before r4053. Restored the old code and gave it a new special 99:Floor_RaiseAndCrushDoom.
SVN r4125 (trunk)
2013-02-10 08:53:03 +00:00
Randy Heit
9af00a22d3 - Fixed: Strife's slow Ceiling_CrushAndRaise lines do no actual damage.
SVN r4124 (trunk)
2013-02-10 00:33:22 +00:00
Randy Heit
24edfd5c86 - Fixed translations of Heretic linetype's that perform Floor_LowerToHighest with an offset.
SVN r4123 (trunk)
2013-02-10 00:26:47 +00:00
Randy Heit
65d2d0a5e5 - Added compatibility option for Claustrophobia 1024, map 01.
SVN r4122 (trunk)
2013-02-09 23:18:34 +00:00
Randy Heit
afabf7e018 - Force node building for garrison.wad from The Master Levels so that the teleporter to the
red key won't leave you in the ground.

SVN r4071 (trunk)
2013-02-07 21:32:06 +00:00
Randy Heit
87b8b6201c - Added WRF_DISABLESWITCH flag for A_WeaponReady to indicate that any attempts to switch the weapon
should be discarded.

SVN r4062 (trunk)
2013-02-05 02:27:35 +00:00
Randy Heit
5b97bf47de - Fixed: The string displayed when attempting to start a new game during a netgame is "NEWGAME", not "NETGAME".
SVN r4051 (trunk)
2013-01-26 03:39:43 +00:00
Randy Heit
931357358d - Reorder the althud level time map entries to match their displayed order.
SVN r4048 (trunk)
2013-01-26 03:19:27 +00:00
Christoph Oelckers
6a1f28e400 - fixed some issues in the alternate HUD menu.
SVN r4046 (trunk)
2013-01-25 14:50:09 +00:00
Randy Heit
9b5232a410 - Fixed: The health bonuses atop the pillars in the starting room of Void could not be picked
up because they no longer physically clip through the floor.

SVN r4038 (trunk)
2013-01-23 04:48:33 +00:00
Randy Heit
7291a56335 - Shorten text of the longest lines in the gameplay options menu.
SVN r4035 (trunk)
2013-01-23 03:54:14 +00:00
Randy Heit
5f4bcaac3d - Added A_UnSetInvulnerable() to the FireDemon (aka Afrit)'s Pain state, in case it gets pained
before entering its Chase state.

SVN r4033 (trunk)
2013-01-23 03:38:13 +00:00