Randy Heit
fd9c450c6e
Fix merge for ACS's DropItem
2013-08-21 22:28:53 -05:00
Christoph Oelckers
3e4678765b
Merge branch 'master' into scripting
...
Conflicts:
src/actor.h
src/thingdef/thingdef_codeptr.cpp
2013-08-18 12:18:59 +02:00
Christoph Oelckers
116defbb35
- fixed: LookForEnemiesInBlock needs to check for MF7_NEVERTARGET.
2013-08-18 09:11:40 +02:00
Randy Heit
5fe5fe7c51
Merge branch 'scripting' of github.com:rheit/zdoom into scripting
2013-08-14 22:15:28 -05:00
Randy Heit
cf87d0f1e9
Use PFunction instead of PSymbolActionFunction in DECORATE parser
2013-08-14 22:00:16 -05:00
Randy Heit
aba691ad72
Implement NewClassPointer()
2013-08-14 21:59:10 -05:00
Randy Heit
8fbb4b90fb
Add some flags for PFunction
2013-08-14 21:56:21 -05:00
Randy Heit
ed1c22186f
Add PStatePointer type
2013-08-14 21:53:03 -05:00
Christoph Oelckers
62830f7927
- added separate automap color for non-counting monsters.
...
- fixed: using a nonexistent CVAR in a ColorPicker menu item caused a crash.
2013-08-14 00:32:05 +02:00
Christoph Oelckers
c8b4fb0d3d
- added a 'closemenu' CCMD so that menu options that close the menu can be added.
2013-08-13 21:09:46 +02:00
Christoph Oelckers
7a87e08107
- added MF7_ALWAYSTELEFRAG flag that causes an actor to be telefragged by everything that teleports into the same place.
2013-08-13 21:01:14 +02:00
Christoph Oelckers
9ebf345fec
Merge branch 'maint'
2013-08-13 08:53:23 +02:00
Christoph Oelckers
1b79f7d956
- fixed chance default for ACS's DropItem.
2013-08-13 08:52:53 +02:00
Christoph Oelckers
3518b4dd28
- allow menu's back button and the pause sign to be animated.
2013-08-12 22:46:45 +02:00
Christoph Oelckers
61c94648dc
- added ACS CheckFlag function.
2013-08-12 22:38:52 +02:00
Christoph Oelckers
ba3e57281a
Merge branch 'maint'
2013-08-12 21:12:20 +02:00
Christoph Oelckers
072b66fb9f
- fixed: The music that's defined in the Gameinfo section of MAPINFO could not set the order for multitrack music lumps.
2013-08-12 21:11:53 +02:00
Christoph Oelckers
aa03609b69
- added IF_TOSSED inventory flag.
2013-08-12 21:00:23 +02:00
Christoph Oelckers
be1a00c537
Merge branch 'maint'
2013-08-12 20:42:21 +02:00
Christoph Oelckers
e14590d8ce
- moved NOTELESTOMP to flags7. When committing I was accidentally on maint instead of master and in master flags6 was already full.
2013-08-12 20:41:33 +02:00
Christoph Oelckers
44a1b94ad9
- added MF6_NOTELESTOMP flag that prevents an actor from telefragging under all possible circumstances.
2013-08-12 20:23:54 +02:00
Christoph Oelckers
f2c250d35d
- flags7 variable added to AActor.
2013-08-12 20:09:21 +02:00
Christoph Oelckers
2bcc5cd7cc
Merge branch 'maint'
2013-08-12 09:14:18 +02:00
Christoph Oelckers
ecfe67dd78
- removed weirdness from Powerup.Strength property that was specifically tailored to its use on PowerInvisibility and made its use problematic elsewhere.
2013-08-12 09:13:55 +02:00
Christoph Oelckers
ef22bb2521
Merge branch 'maint'
2013-08-12 01:55:12 +02:00
Christoph Oelckers
3300566493
- P_DropItem's chance parameter had an incorrect default value.
2013-08-12 01:54:45 +02:00
Christoph Oelckers
fabf8272e6
Merge branch 'maint'
2013-08-11 21:04:17 +02:00
Christoph Oelckers
1b2d8420bb
- DropItem for ACS.
2013-08-11 20:57:53 +02:00
Christoph Oelckers
c0174ea7cd
- Added A_DropItem for DECORATE.
2013-08-11 20:48:08 +02:00
Christoph Oelckers
35764ff3b2
- fixed: Powerup.Strength is a fixed point value, so using it as health amount for PowerRegeneration requires division by FRACUNIT.
2013-08-11 20:39:53 +02:00
Christoph Oelckers
5bb4b558a4
Merge branch 'maint'
2013-08-11 13:37:36 +02:00
Christoph Oelckers
c5cba70fc8
- removed obsolete quit message #defines.
2013-08-11 13:36:48 +02:00
Christoph Oelckers
c7a46492eb
- fixed bad index variable in R_RenderFakeWallRange.
2013-08-11 12:41:14 +02:00
Christoph Oelckers
36b487fd78
Merge branch 'maint'
2013-08-11 11:32:44 +02:00
Randy Heit
55bec365e8
Added a way to specify paramater flags for PFunction
...
- And right now, the only flag is "Optional".
2013-08-10 20:24:12 -05:00
Randy Heit
973b0f5c56
Change PFunction's superclass from PNamedType to PSymbol
2013-08-10 20:17:55 -05:00
Randy Heit
6575499f37
Added basic implementation for PField.
...
- I don't know why this didn't give me trouble before, but I needed to add IMPLEMENT_CLASS for PField.
2013-08-10 20:17:29 -05:00
Randy Heit
3e46e6376c
Added NewPrototype() function
2013-08-10 20:06:54 -05:00
Randy Heit
f18c7b8959
Make FType::Hash work for PPrototype
...
- For Prototypes, Hash is passed the address of two TArrays. If we blindly
hash those without checking their contents, then we can forget about
ever finding any matching prototypes in the type table. (Not that I
remember why I wanted them to be unique, but I'm sure I must have had my
reasons.)
2013-08-10 20:05:42 -05: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
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
c8f0df44f2
Merge branch 'maint'
...
Conflicts:
src/am_map.cpp
2013-08-10 09:41:50 +02:00
Christoph Oelckers
25ec3fb8fe
- added MF6_RELATIVETOFLOOR flag.
2013-08-10 09:32:55 +02:00
Christoph Oelckers
211d293002
- added MF6_NOTONAUTOMAP flag to exclude things from being shown with the scanner powerup. The IDDT cheat will not be affected by this.
2013-08-10 08:53:37 +02:00
Christoph Oelckers
55f637c906
- fixed: When creating colormaps for 3D floors the model sector's fade value must be used when defining a fog volume.
2013-08-09 23:40:34 +02:00
Christoph Oelckers
9c12c03684
Merge branch 'maint'
2013-08-09 20:36:08 +02:00
Christoph Oelckers
6a07118ea4
- added ML_BLOCKHITSCAN line flag.
2013-08-09 20:35:10 +02:00
Christoph Oelckers
a78ad3188b
- added MF5_NOFORWARDFALL flag to prevent attacks from making its victim fall forward randomly.
2013-08-09 20:20:23 +02:00
