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