Christoph Oelckers
ad7c53855e
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-09 13:05:14 +02:00
Christoph Oelckers
bba092cc0b
Merge branch 'master' into scripting
...
Conflicts:
src/d_player.h
src/g_doom/a_archvile.cpp
src/thingdef/thingdef.h
src/thingdef/thingdef_properties.cpp
2013-08-09 13:03:28 +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
Randy Heit
93cbdd37a5
PArray's size should take alignment into account.
2013-08-08 22:27:40 -05:00
Randy Heit
6c1f3a1396
Added PStruct::AddField()
2013-08-08 22:27:40 -05:00
Randy Heit
476a98652c
Remove extraneous PField class
...
- Remove the existing PField class, rename PMemberField to PField, and
derive it from PSymbol instead of the old PField.
2013-08-08 22:27:39 -05:00
Randy Heit
7e24f6b00c
- Added NewStruct() function.
2013-08-08 22:27:39 -05:00
Randy Heit
0ec33191aa
- Added NewEnum() function.
2013-08-08 22:27:39 -05:00
Randy Heit
12a312b6b4
- Fixed: NewArray returned the element type, not the array type.
2013-08-08 22:27:38 -05:00
Randy Heit
dbaf72772b
Move the symbol table from PClass to PStruct.
2013-08-08 22:27:38 -05:00
Randy Heit
91207ed3f4
Update lemon.c to August 2012 version from SQLite.
...
- Add a missing check for out-of-memory in the lemon code generator.
- Fix a total unimportant file descriptor leak in lemon. This is to silence warning messages.
- Fix a bug in lemon in computation of which non-terminals can generate an empty string. This bug and the fix make absolutely no difference for the grammar used by SQLite, but it can make a difference when lemon is used in other grammars.
- In Lemon, when comparing the output to the *.h file to see if it has changed, make sure that the proposed new output and the preexisting output are the same size before deciding that they are the same.
2013-08-02 22:17:32 -05:00
Randy Heit
11b588de4a
Add names for fallback tokens.
...
- Fixed: When falling back to the IDENTIFIER token, the identifier it
would get was undefined, because it never got initialized.
2013-08-02 21:54:50 -05:00
Randy Heit
5cc8a9c2a7
Remove redundant Resolves
...
- ParseExpression() calls Resolve() on the FxExpression before returing
it, so there's no need to immediately Resolve() what it returns.
2013-08-02 21:19:05 -05:00
Randy Heit
4f528e3832
Remove lax from FCompileContext
...
- It's always set to true these days, so let's get rid of it.
2013-08-02 21:13:40 -05:00
Randy Heit
09c902ce55
Remove isconst from FCompileContext.
...
- It's not used anymore, so keeping it around is pointless.
2013-08-02 21:09:49 -05: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
Randy Heit
58f088c1ab
Remove FxExpression::EvalExpression() entirely
...
- For the purposes of getting constant values from expressions, the only
class where Resolve doesn't duplicate the functionality of
EvalExpression was FxConstant. So, every other class has had its
EvalExpression taken away, and FxConstant has had it renamed to GetValue.
2013-07-30 22:52:27 -05: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