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
b187451a71
- added APROP_ViewHeight and APROP_AttackZOffset submission by TheFortuneTeller.
2013-08-09 12:06:51 +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
a0c214104d
Merge branch 'maint' of https://github.com/rheit/zdoom into maint
2013-08-09 11:47:33 +02:00
Christoph Oelckers
e6c880c93a
- fixed: The sector's 'hidden' UDMF property did not properly clear the corresponding flag if the value was 'false'.
...
- added UDMF 'waterzone' property for sectors.
2013-08-09 11:47:25 +02:00
Christoph Oelckers
151d54aaf5
- added 3 more modes for am_cheat: 4-6 are the same as 1-3 with the exception that lines not drawn on the regular automap won't be shown.
2013-08-09 11:32:46 +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
3e389fdde8
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-09 08:36:36 +02:00
Braden Obrzut
5b228ae5a7
Merge branch 'maint'
2013-08-09 00:25:51 -04:00
Braden Obrzut
7e76fb0078
- Fixed: Disable ifitem jumping if a link isn't specified since an invalid value can cause a crash.
2013-08-09 00:25:29 -04:00
Braden Obrzut
bb494292c6
- Fixed P_CheckMapData allowed non-map lump names to pass resulting in a crash when actually trying to load the map.
2013-08-08 23:47:58 -04: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
alexey.lysiuk
5c05f1f3cd
- Ignored dehacked.exe from *.zip files to enable loading of *.deh files.
2013-08-02 10:17:06 +03: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
d77673d681
- reorganization of automap color handling for easier maintenance
...
Mostly preparation to implement a per-mod automap option but also fixes a few minor issues with some colors that are not defined in the original game specific colorsets.
2013-07-31 22:59:35 +02:00
Edoardo Prezioso
0dc70f847c
- Be more compatible with C++11 narrowing conversions system.
2013-07-31 12:27:54 +02:00
Edoardo Prezioso
8cab8f180b
- Be clear about the safe 'memset/memcpy' operations on virtual classes.
...
Since I remember that 'memset/memcpy' is safe in this code, it should be okay to cast to the generic pointer all the 'virtual class' arguments before calling the above functions. Shuts up Clang warnings.
2013-07-31 12:23:31 +02:00
Christoph Oelckers
844f79e04a
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-30 17:50:30 +02:00
Christoph Oelckers
4eb6f74e36
Merge branch 'maint'
2013-07-30 16:53:00 +02:00
Christoph Oelckers
3480d40484
- fixed: AActor::Die may only randomize the death state's duration if it is positive. Otherwise -1 (infinite) gets clobbered.
2013-07-30 16:52:36 +02:00
Christoph Oelckers
2cd1fd9658
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-30 15:25:09 +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
9c08a029b1
Merge branch 'maint'
2013-07-30 15:14:10 +02:00
Christoph Oelckers
a13af5cc65
Merge branch 'maint' of https://github.com/edward-san/zdoom into maint
2013-07-30 15:08:44 +02:00
Edoardo Prezioso
7e21eafc2f
- Fixed mismatched alloc/dealloc in FTextureManager.
...
The 'TextureFrames', which is attached to all the 'mAnimatedDoors', were deleted with one-pointer 'delete' and they were allocated with 'new[]'.
2013-07-30 13:36:56 +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
Edoardo Prezioso
4ce0574b3f
- Use a more conformant C++ preprocessor macro identifier for Unix systems.
...
The 'unix' identifier isn't defined when '-std' is passed to the compiler (tested with gcc and clang), so use '__unix__' which is well enough documented.
2013-07-30 11:46:14 +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
27de9f45af
- commented out autoloading of .DEH lumps for maint branch.
2013-07-30 09:25:07 +02:00
Christoph Oelckers
805de60aa4
- fixed: ChangeSpy didn't check if a player's camera's player pointer was valid before using it to get an index into the players table.
2013-07-30 09:16:27 +02:00
Braden Obrzut
c4af738bf6
- Fixed: crash when closing ZDoom in the save menu and a memory leak.
2013-07-30 00:20:21 -05:00
Christoph Oelckers
6dee878b2e
- used TEXTCOLOR_ #defines for colorizing CCMD list, remove use of strbin1.
2013-07-30 00:20:21 -05:00
slatenails
0c850e8ddd
Results for console tab-completion are now color-coded. CCMDs appear blue, CVars green and aliases red.
2013-07-30 00:20:20 -05:00
Braden Obrzut
bc71d4537e
Merge branch 'maint'
2013-07-29 18:55:29 -04:00
Braden Obrzut
eb5d57be06
- Fixed: crash when closing ZDoom in the save menu and a memory leak.
2013-07-29 18:35:19 -04:00
Christoph Oelckers
cf31ccbbaf
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-28 18:23:50 +02:00
Christoph Oelckers
c7d167d278
- used TEXTCOLOR_ #defines for colorizing CCMD list, remove use of strbin1.
2013-07-28 17:15:47 +02:00
Christoph Oelckers
6f4b09cc77
Merge branch 'master' of https://github.com/slatenails/zdoom
2013-07-28 16:42:36 +02:00
Christoph Oelckers
c253d40fbb
- externalize labels for automap statistics display to the string table.
2013-07-28 16:18:57 +02:00
slatenails
48a29b769f
Results for console tab-completion are now color-coded. CCMDs appear blue, CVars green and aliases red.
2013-07-28 14:58:30 +03:00
Christoph Oelckers
b534cba113
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-28 10:19:08 +02:00
Christoph Oelckers
775ecdeebb
- fall back to drawing triangles on automap when encountering actors with non-displayable sprites
2013-07-28 10:14:46 +02:00
Christoph Oelckers
992ba0bbf4
- added handling of MF3_FOILINVUL for A_BFGSpray. This function needs special treatment because the shooting player is considered the inflictor of the spray damage.
2013-07-26 00:52:12 +02:00
Christoph Oelckers
b499742d46
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-25 17:31:27 +02:00
