zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-15 23:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
4389 commits 86 branches 139 tags 124 MiB
Commit graph

82 commits

Author SHA1 Message Date
Randy Heit
2d87eb0ba2 Merge branch 'master' into gonesolong 
Conflicts:
	src/CMakeLists.txt
	src/actor.h
	src/g_heretic/a_hereticmisc.cpp
	src/g_heretic/a_hereticweaps.cpp
	src/g_heretic/a_ironlich.cpp
	src/info.h
	src/namedef.h
	src/p_buildmap.cpp
	src/p_enemy.cpp
	src/p_map.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	zdoom.vcproj
 2014-12-20 19:13:14 -06:00
Christoph Oelckers
6d4eb7f62d - changed handling of DF_NO_COOP_WEAPON_SPAWN dmflag so that weapons are not determined by class type but by a newly added flag WEAPONSPAWN, to allow CustomInventory replacements to act like weapons when being spawned. 2014-07-27 10:07:37 +02: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
Randy Heit
cf87d0f1e9 Use PFunction instead of PSymbolActionFunction in DECORATE parser 2013-08-14 22:00:16 -05: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
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
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
a78ad3188b - added MF5_NOFORWARDFALL flag to prevent attacks from making its victim fall forward randomly. 2013-08-09 20:20:23 +02:00
Randy Heit
4deeb8d8ae Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/p_local.h
	src/p_map.cpp
	src/sdl/i_main.cpp
	src/thingdef/thingdef_codeptr.cpp
 2013-06-25 19:28:25 -05:00
Christoph Oelckers
394f21f71e - fixed: Draining health from a victim must check for damage reduction before awarding the health to the player. This affected Heretic's gauntlets, A_Saw and A_CustomPunch. 
- added a DONTDRAIN flag that prevents the above attacks from draining any health at all.
 2013-06-24 16:42:43 +02:00
Randy Heit
459ad5abff - Updated scripting branch to latest version in trunk. 
SVN r4337 (scripting)
 2013-06-07 03:31:30 +00:00
Randy Heit
9072c25e65 - Added a big-endian fix for actor flag fields that aren't four bytes wide. 
SVN r4251 (trunk)
 2013-05-05 00:01:51 +00:00
Randy Heit
40f7abb8e9 - Added bounce states. Set the BOUNCE_UseBounceState flag to use them (+USEBOUNCESTATE via 
DECORATE). Then you can use:
  * Bounce
  * Bounce.Floor
  * Bounce.Ceiling
  * Bounce.Wall
  * Bounce.Actor
  * Bounce.Actor.Creature
  Partial matches work just like Pain states, so if an actor bounces off a floor and you don't
  have a Bounce.Floor state, but you do have a Bounce state, it will use the Bounce state.
  Conversely, if you only have a Bounce.Floor state but no Bounce state, then the actor will
  only enter the Bounce.Floor state when it bounces on a floor; bouncing off anything else will
  not cause it to change state.

SVN r4250 (trunk)
 2013-05-04 22:52:37 +00:00
Randy Heit
cb64014494 - Added CROUCHABLEMORPH flag for the PlayerPawn class. Use this to indicate that a morphed 
player class can crouch. (Regular players can always crouch, hence the name CROUCHABLEMORPH
  and not CANMORPH or ALLOWMORPH.)

SVN r4221 (trunk)
 2013-04-19 02:24:20 +00:00
Randy Heit
bd601a1bc8 - Added NOTRAIL flag for PowerSpeed. 
SVN r4146 (trunk)
 2013-02-19 02:44:49 +00:00
Randy Heit
ae6b0c6215 - Added IF_NOSCREENFLASH> 
SVN r4145 (trunk)
 2013-02-19 02:27:41 +00:00
Braden Obrzut
dcb1a3c8bd - GCC warning cleanup 
SVN r4031 (trunk)
 2013-01-21 22:30:30 +00:00
Randy Heit
e7efa1d802 - Update to latest version in trunk. 
SVN r3890 (scripting)
 2012-10-17 04:24:54 +00:00
Randy Heit
81ce8b28f2 - Added the Inventory flag IF_NEVERRESPAWN. 
SVN r3885 (trunk)
 2012-10-11 04:12:35 +00:00
Randy Heit
d5d4584008 - Ignore the Skulltag-based SERVERSIDEONLY flag in actor definitions. 
SVN r3833 (trunk)
 2012-08-22 21:35:47 +00:00
Randy Heit
644f0c0e05 - Add a name to VMFunction so that the disassembly can be more informative. 
SVN r3768 (scripting)
 2012-07-17 03:35:03 +00:00
Randy Heit
d85604da19 - Update scripting branch to latest version of trunk. 
SVN r3767 (scripting)
 2012-07-17 02:53:53 +00:00
Randy Heit
a26cd841ae - Fixed: Getting remorphed into a chicken should give you a Tome of Power so that you become a 
super chicken. Rawr! The PlayerPawn flag CANSUPERMORPH now enables this.

SVN r3763 (trunk)
 2012-07-15 03:10:00 +00:00
Randy Heit
562cf04db2 - Update scripting branch to trunk. 
SVN r3758 (scripting)
 2012-07-14 03:04:41 +00:00
Randy Heit
8a925757f5 - Added the item flag IF_RESTRICTABSOLUTELY. When this is set, players of the wrong class cannot 
pickup an item at all. (For instance, normally players in Hexen can still pick up other players'
  weapons for ammo. With this flag set, they cannot do that either.)

SVN r3751 (trunk)
 2012-07-08 02:45:46 +00:00
Christoph Oelckers
ff25785781 - removed the MF5_FASTER and MF5_FASTMELEE flags and replaced them with a 'Fast' state flag. 
SVN r3692 (trunk)
 2012-06-16 08:35:51 +00:00
Christoph Oelckers
3d7c6811c1 - The bouncing check from r3643 cannot be applied retroactively to the existing DOOMBOUNCE flag because mods depend on the old behavior. Instead of modifying BOUNCE_OnOff's behavior the correct way of doing this has to be implemented as a separate flag in order to avoid problems. 
SVN r3685 (trunk)
 2012-06-10 10:17:49 +00:00
Christoph Oelckers
83620fca1f - added Gez's NOTAUTOAIMED patch but did not set it for Heretic's pod. 
SVN r3527 (trunk)
 2012-04-07 12:40:50 +00:00
Christoph Oelckers
e4455c293f - added DavidPH's DOHARMSPECIES submission. 
SVN r3236 (trunk)
 2011-06-13 10:43:07 +00:00
Christoph Oelckers
ab60afd0b8 - added DavifPH's fix for poisoning invulnerable players. 
SVN r3231 (trunk)
 2011-06-13 10:25:03 +00:00
Christoph Oelckers
6053627c5c - added DONTCORPSE submission. 
SVN r3216 (trunk)
 2011-05-26 23:27:58 +00:00
Christoph Oelckers
3277b508cd - added SEEINVISIBLE submission. 
SVN r3215 (trunk)
 2011-05-26 23:25:02 +00:00
Christoph Oelckers
b6960eec1a - fixed: The ALT_USES_BOTH weapon flag was missing in the list of DECORATE flags. 
SVN r3213 (trunk)
 2011-05-26 23:18:39 +00:00
Christoph Oelckers
a06b88fa50 - added new IF_UNTOSSABLE flag for items that should be removable by any inventory function but not be droppable by the 'drop' CCMD. 
SVN r3049 (trunk)
 2010-12-16 08:21:38 +00:00
Christoph Oelckers
f0f17e531c - move static AM color initialization into the AM_StaticInit function. 
- move D_LoadWadSettings to keysections.cpp.
- made some more data reloadable.
- data structures filled by P_SetupLevel should be cleared before loading the level. They can remain non-empty in case of an error. There's probably more to fix here...
- fixed: MidiDevices and MusicAliases were not cleared before reloading local SNDINFOs.
- fixed signed/unsigned warnings in AddSwitchPair for real (GCC really allows -1u? MSVC prints a warning for that.)


SVN r3036 (trunk)
 2010-12-14 00:50:02 +00:00
Christoph Oelckers
9a8a446840 - added player class definition through the GAMEINFO section in MAPINFO. Also added a NOMENU flag that can be set for a player class. This means that the use of KEYCONF is now deprecated except for its original purpose: To define mod specific key binding options. 
SVN r2832 (trunk)
 2010-09-19 08:27:20 +00:00
Christoph Oelckers
df138fe4f9 - added a ClearCounters function to AActor that handles everything necessary to un-count an item that is not supposed to be counted but has some of the COUNT* flags set. 
- merged all places where secrets are credited into one common function.
- added the Doom64 COUNTSECRET actor flag.
- fixed: AInventory::CreateCopy did not clear the COUNTITEM flag.
- fixed: Dropping an item did not increase the item count but the dropped item could still have the COUNTITEM flag. Now this flag gets cleared when the item gets picked up so that dropped items don't count a second time.

SVN r2826 (trunk)
 2010-09-19 00:06:45 +00:00
Randy Heit
99670b708c - Sync scripting branch with what was in trunk on Sunday. I believe that would be revision 2739. 
SVN r2790 (scripting)
 2010-09-16 03:14:32 +00:00
Christoph Oelckers
f430881a54 - Added DavidPH's Poison damage extension but changed it so that the metadata can be removed. 
SVN r2450 (trunk)
 2010-07-23 21:36:17 +00:00
Christoph Oelckers
eadc539bc6 - fixed: Poison clouds spawned by the PoisonShroom should not be pushable by the Disc of Repulsion. 
SVN r2350 (trunk)
 2010-05-30 20:12:32 +00:00
Randy Heit
42ac75e894 - Sync scriptbranch with trunk. 
SVN r2269 (scripting)
 2010-04-04 04:09:24 +00:00
Randy Heit
549ddf8035 - Use the standard DObject type system for the PSymbol hierarchy. 
SVN r2264 (scripting)
 2010-04-03 02:06:51 +00:00
Randy Heit
f88f601230 - Removed the third parameter from dumpclasses when it was restricted it to Actors, because 
I have no idea what that was all about.
- Got rid of FActorInfo and merged it into a new PClassActor.

SVN r2240 (scripting)
 2010-03-24 02:49:37 +00:00
Christoph Oelckers
a5c3c95b2f - added 2 DECORATE keywords from Skulltag as dummies. 
SVN r2169 (trunk)
 2010-02-19 08:10:04 +00:00
Randy Heit
913555aa4e - Synced the scripting branch with trunk. 
SVN r2166 (scripting)
 2010-02-17 04:46:11 +00:00
Randy Heit
739e684549 - Converted all action functions be directly callable by the VM (though they are not yet 
usable).

SVN r2154 (scripting)
 2010-02-12 06:04:57 +00:00