zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-24 12:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
8278 commits 2 branches 66 tags 53 MiB
Commit graph

1233 commits

Author SHA1 Message Date
MajorCooke
35b7a5ccc1 Updated for scripting branch merge. 2016-02-04 22:41:02 -06:00
MajorCooke
1f8d425a1e - Added CountInv(itemtype, [ptr_select]). 
- Returns an inventory item count.
 2016-02-04 21:45:31 -06:00
MajorCooke
3399ed60e0 Updated to scripting branch merge. 2016-02-04 20:17:46 -06:00
Christoph Oelckers
c995158d52 Merge branch 'maint' of https://github.com/rheit/zdoom 2016-02-05 01:49:12 +01:00
Randy Heit
b3b0886b64 Merge branch 'scripting' 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
 2016-02-04 15:17:22 -06:00
Randy Heit
b8a24902bc Move extra font characters into filter directories 2016-02-04 13:23:36 -06:00
Christoph Oelckers
87f3a8f0cc Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-03 13:04:16 +01:00
MajorCooke
a1c1de9edb Fixed merge conflicts. 2016-02-02 18:26:20 -06:00
Christoph Oelckers
66f053f131 - on second thought: this shouldn't explode the speakers with too high values. 2016-02-02 15:02:06 +01:00
Christoph Oelckers
e12174ffc1 Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-02 14:53:48 +01:00
Christoph Oelckers
c002c2fde9 - added a mastervolume setting for DUMB because its default volume is far less than all the other music options. 2016-02-02 14:45:32 +01:00
Christoph Oelckers
456e71ec4b Merge branch 'master' into Clip3DLights 2016-01-31 21:36:16 +01:00
Christoph Oelckers
e73e26c15a Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-31 21:11:21 +01:00
coelckers
c3cc98b5f3 Merge pull request #523 from alexey-lysiuk/osx_fullscreen 
Final touches to fullscreen mode on OS X
 2016-01-31 16:56:35 +01:00
MajorCooke
eb2829ad5e - Added CBF_DROPOFF to A_CheckBlock. Checks for actors stuck in tall ledges or dropoffs. 2016-01-31 09:45:41 -06:00
Christoph Oelckers
4d7e7deea8 Merge branch 'master' into Clip3DLights 2016-01-31 10:10:32 +01:00
alexey.lysiuk
bb00c9b588 Added menu option to control fullscreen toggle shortcut on OS X 2016-01-31 10:34:17 +02:00
Christoph Oelckers
8bc7a0a24e Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-30 23:01:36 +01:00
Christoph Oelckers
fc57180d7e - added necessary state to implement 3D light splitting using hardware clipping planes. 2016-01-30 23:01:11 +01:00
John Palomo Jr
d8f7785ad9 Added dimamount and dimcolor to display options menu. 2016-01-30 16:44:50 -05:00
Christoph Oelckers
afcd755c7a - changed autoaim menu option to a slider which allows a more precise control of the property. 
- having a value of 5000 as the default for autoaim makes no sense, since this is an angle value that will always be clamped to [0..35]. So now 35 is both the default and the maximum.
 2016-01-30 13:43:39 +01:00
Christoph Oelckers
4267e3c40b Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-30 01:08:35 +01:00
Christoph Oelckers
409525cde6 - removed some overlooked 'player5start' entries in GAMEINFO sections. 
This property no longer exists, these are now being set in the 'doomednums' block.
 2016-01-29 22:09:16 +01:00
Christoph Oelckers
d0b194563a Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/p_3dfloors.cpp
 2016-01-29 16:36:24 +01:00
Christoph Oelckers
058bfdea26 - forgot to commit this with the source changes for A_Face*. 2016-01-29 00:58:18 +01:00
Christoph Oelckers
b5c3ced9a9 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-27 21:27:26 +01:00
MajorCooke
275cdcd958 Renamed A_FaceVelocity to A_FaceMovementDirection. 2016-01-27 10:12:13 -06:00
coelckers
c5379c749e Merge pull request #428 from MajorCooke/A_CheckSPecies 
Added A_CheckSpecies(state jump, name species, ptr = AAPTR_DEFAULT)
 2016-01-27 16:45:16 +01:00
MajorCooke
6dcbc930d6 NoRandomTurn, not NoDirectionTurn, inside the macro. 2016-01-27 09:39:46 -06:00
MajorCooke
ece6fa776c - Renamed CHF_DONTANGLE to CHF_NODIRECTIONTURN. 
- A_Wander now shares CHF_NODIRECTIONTURN and CHF_NORANDOMTURN instead of having its own flags.
 2016-01-27 09:35:19 -06:00
Christoph Oelckers
238990c871 don't leave any gaps in the used clip planes. 2016-01-27 12:32:39 +01:00
Christoph Oelckers
47db3252f4 - it's really not necessary to waste two clip planes for reflective surfaces because only one can be active at any time. 2016-01-27 12:30:55 +01:00
Christoph Oelckers
4b0ce7a8db Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-27 11:21:39 +01:00
Christoph Oelckers
2a1fa60aa6 Merge branch 'CheckProxExpPruned' of https://github.com/MajorCooke/zdoom 2016-01-26 18:49:03 +01:00
MajorCooke
1c0ef1d367 Removed CPXF_NODISTANCE. 2016-01-26 10:00:20 -06:00
Christoph Oelckers
66ce8915fb Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-26 15:00:54 +01:00
alexey.lysiuk
204bf2c375 Made secret on Plutonia: Revisited MAP27 accessible without vanilla wallrunning 
Increased duration of lift's lowered state
See http://forum.zdoom.org/viewtopic.php?t=47878
 2016-01-26 13:49:04 +02:00
Randy Heit
c63f65d441 Merge remote-tracking branch 'origin/master' into scripting 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
 2016-01-22 20:53:27 -06:00
Christoph Oelckers
6691358b0a Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-22 19:15:24 +01:00
MajorCooke
793fc90716 Once more homogenized! 
- DECORATE: color, flags, lifetime, size, angle, xyz offset/vel/accel, startalpha, fadestep.
- ACS: Similar, minus the angle parameter.
 2016-01-21 19:59:33 -06:00
MajorCooke
28502b9a80 - Reorganized A_SpawnParticle parameters. 
- Decorate order is now color, x/y/zoff, velx/y/z, lifetime, angle, flags, size, startalphaf, fadestepf, accelx/y/z.
- ACS order is now color, xyz offset, xyz velocity, lifetime, fullbright, size, startalpha, fadestep, xyz accel
 2016-01-21 18:34:39 -06:00
Christoph Oelckers
1a631670fb Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-22 01:11:08 +01:00
Christoph Oelckers
841c7b275e Merge branch 'ParticleFlags' of https://github.com/MajorCooke/zdoom 
Conflicts:
	wadsrc/static/actors/actor.txt
 2016-01-22 00:58:42 +01:00
Christoph Oelckers
3b4ed8d7cd - made A_SpawnParticle's fadestep parameter a fixed point value as well. 2016-01-22 00:54:09 +01:00
MajorCooke
13dc6be5a1 - Added flags for A_SpawnParticle and angle parameter. 
- SPF_FULLBRIGHT makes the particle full bright.
- SPF_RELATIVE encapsulates the following flags:
- SPF_RELPOS: Position is relative to angle.
- SPF_RELVEL: Velocity is relative to angle.
- SPF_RELACCEL: Acceleration is relative to angle.
- SPF_RELANG: Add caller's angle to angle parameter for relativity.
 2016-01-21 16:36:58 -06:00
Christoph Oelckers
39014b1732 - make the startalpha parameter of A_SpawnParticle a float to be consistent with other functions that want an alpha value. 2016-01-21 20:13:55 +01:00
Randy Heit
1ac0d0690c Re-remove testglobalvar from constants.txt so scripting branch runs again 2016-01-21 12:46:12 -06:00
Randy Heit
9744b9e0d9 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/dobject.h
	src/dobjgc.cpp
	src/p_local.h
	src/thingdef/thingdef_codeptr.cpp
 2016-01-21 12:45:06 -06:00
MajorCooke
9638cbb844 Updated A_CheckProximity Expansion Pruned Edition. 2016-01-21 11:39:13 -06:00
Christoph Oelckers
995721836b Merge branch 'SpawnParticle' of https://github.com/Edward850/zdoom 
Conflicts:
	src/actor.h
 2016-01-21 17:04:52 +01:00
Christoph Oelckers
8f7be01dd4 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/r_data/r_interpolate.cpp
 2016-01-21 12:09:12 +01:00
MajorCooke
93aff2413f Fixed an issue which caused A_Teleport to set the caller and itself to SpotZ's z position. 2016-01-20 18:18:00 -06:00
MajorCooke
d20a7516c9 Updated A_FaceVelocity to remove conflicts. 2016-01-20 15:51:11 -06:00
Edward Richardson
e5c67cee83 Merge branch conflicts fix 
- CONFLICT (content): Merge conflict in src/p_acs.cpp
- Updated position variables
 2016-01-21 10:49:57 +13:00
Christoph Oelckers
bf747075e8 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_hexen/a_clericstaff.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:57:55 +01:00
Christoph Oelckers
cfcd2668cc Merge commit '772a5724313f2ad0bd6828fcc28545a9ee5e6068' into scripting 
Conflicts:
	src/p_pspr.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:00:45 +01:00
Christoph Oelckers
fbaab5044d Merge commit '38df0665e3a2018cf1d0028a36357df6c7e908e9' into scripting 
Conflicts:
	src/d_dehacked.cpp
	src/decallib.cpp
	src/g_hexen/a_clericstaff.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
	wadsrc/static/actors/shared/inventory.txt
 2016-01-17 19:50:34 +01:00
Christoph Oelckers
5207aa6cc0 Merge commit '125afcf3defb901e23bd44d32fa86681ef1748f6' into scripting 
Conflicts:
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/shared/inventory.txt
 2016-01-17 19:09:05 +01:00
Christoph Oelckers
65080a65c9 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-16 09:07:20 +01:00
alexey.lysiuk
e405fb4624 Set compatibility for Return to Hadron 
Updated version of Return to Hadron (dated 2016.01.03) has new version of E1M9: Prototype
This map requires vanilla's P_PointOnLineSide() function to avoid issue with sleepy shotgun guys
http://forum.zdoom.org/viewtopic.php?t=49544
 2016-01-15 15:54:35 +02:00
Christoph Oelckers
9e33599536 - at least get the terms being used right. Of course it's not EDF (which would way beyond the scope of what's intended here) but only Extradata, that's being supported. 
(For EDF an external converter would make more sense.)
 2016-01-12 09:13:55 +01:00
Christoph Oelckers
7c8d48bbfc Merge branch 'edf-gl' 
Conflicts:
	src/actor.h
	src/p_spec.cpp
 2016-01-12 00:02:17 +01:00
Christoph Oelckers
65022b780a - implemented 'copy portal to wall' linedef type. 2016-01-11 22:44:53 +01:00
Christoph Oelckers
196c9bc34d - cleaned up the skybox type detection logic. 2016-01-11 20:29:24 +01:00
Christoph Oelckers
76b0971067 Merge branch 'master' into edf-gl 2016-01-10 10:31:00 +01:00
Christoph Oelckers
4fd0a726b1 - more work on EDF handling. Vaporware demo is now loading. 2016-01-10 10:05:06 +01:00
Christoph Oelckers
feeaf29c46 - set translations for Eternity's linked portals for testing. 2016-01-10 10:05:05 +01:00
Christoph Oelckers
bdfac02f69 - EDF parser for linedefs and sectors. Also extended the Eternity xlat table to handle the parameterized types to the point EDF needs. 2016-01-10 10:05:05 +01:00
MajorCooke
bfd9e2bc1c - Added CHF_STOPIFBLOCKED and CHF_DONTTURN macro. 
- CHF_STOPIFBLOCKED simply prevents the actor from changing directions for movement.
- CHF_DONTTURN implies NORANDOMTURN, NOPOSTATTACKTURN and STOPIFBLOCKED.
 2016-01-07 19:20:02 -06:00
MajorCooke
da9c3ff9d2 Added A_Wander Flags. 
- WF_NORANDOMTURN and WF_DONTANGLE do the same as their CHF_ counterparts for A_Wander.
 2016-01-07 17:38:45 -06:00
MajorCooke
f357a36c5c - New A_Chase flags. 
- CHF_NORANDOMTURN: Actor will not randomly turn during chasing to pursue its target. It will only turn if it cannot keep moving forward.
- CHF_DONTANGLE: Actor does not adjust its angle to match the movement direction.
- CHF_NOPOSTATTACKTURN: Actor will not make its first turn after exiting its attacks.
 2016-01-07 17:38:25 -06:00
MajorCooke
ccc694bbcd - Added the following flags, all affixed with CPXF_: 
- NODISTANCE: Disables distance checking.
- CHECKSIGHT: The qualifying actor must be in sight in order to count.
- SET<TARGET/MASTER/TRACER>: Gets the first qualifying actor and sets the calling actor's specified pointer to it.
- SETONPTR: If the function is being aimed at another actor other than the caller, sets that actor's pointers instead. Requires a SET* flag to work.
- FARTHEST: The actor farthest from the checking actor is set as the pointer. Requires a SET* flag to work.
- CLOSEST: The closest qualifying actor is set as the pointer. Requires a SET* flag to work.
 2016-01-07 17:09:02 -06:00
Christoph Oelckers
1b20a06ec4 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-06 17:16:06 +01:00
Christoph Oelckers
006d3022ca - changed the BFG decal for Freedoom to blue. With the software renderer this will be displayed as gray due to lack of blue in the palette. (Itz's still better than green, though.) 2016-01-05 17:10:47 +01:00
Christoph Oelckers
a5a069a4b0 - use DMENUPIC as titlepic in doom2bfg. 2016-01-05 14:06:07 +01:00
Christoph Oelckers
68501dc784 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-05 12:23:50 +01:00
Christoph Oelckers
99bf013652 - added new IWAD name HERETICSR.WAD so that commercial Heretic and Shadows of the Serpent Riders can coexist. 2016-01-05 11:16:38 +01:00
coelckers
d7501a1414 Merge pull request #457 from j-palomo/turn180_controlmenu 
Added turn180 to the controls menu.
 2016-01-05 10:09:40 +01:00
Christoph Oelckers
d68c97b42a Merge branch 'zmaster' 2016-01-04 21:06:54 +01:00
Christoph Oelckers
111479063f - fixed a potential overflow issue with calculating a portal's origin point. 
- fixed: Sector_SetPortal's Eternity translation was not correct.

The ZDoom variant allows specifying the plane as part of the portal, Eternity does not. Added a new 'plane' type 3 which just means 'any'.
 2016-01-04 21:05:09 +01:00
Christoph Oelckers
0e9eb2f305 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-04 11:55:07 +01:00
Christoph Oelckers
bd95c5eadf - fixed: the ambient sound things need both the args from the DoomEdNum mapping and the actual map. 2016-01-04 11:52:07 +01:00
John Palomo Jr
b8b81e9809 Added turn180 to the controls menu. 2016-01-01 13:27:44 -05:00
Christoph Oelckers
3bad7f9b55 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-01 00:46:00 +01:00
Randy Heit
1d759283c0 Cleanup the zoom/reload/userX handling for A_WeaponReady 
- There was lots of code duplication. Consolidated it.
- Renamed WRF_UserX to WRF_AllowUserX for consistancy.
 2015-12-31 16:46:19 -06:00
Randy Heit
afbf88cc63 Remove WRF_ALLUSER. 2015-12-31 16:46:18 -06:00
MajorCooke
eed6680a67 Added support for weapon states User#. 
- Added keybinds for the user state triggering.
- Added WRF_USER# flags which must be specified in order to use.
- # can be 1-4.
 2015-12-31 16:46:16 -06:00
Christopher Bruns
8e237e6146 Merge branch 'master' of https://github.com/coelckers/gzdoom into stereo3d 2015-12-30 17:41:49 -05:00
Christoph Oelckers
86797b419f Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-30 12:28:55 +01:00
Christoph Oelckers
1def61e3e3 - allow changing the reverb and resampling mode setting for WildMidi. 
- fixed: WildMidi did not initialize the reverb data structures.
- removed the menu option for midi_timiditylike.
 2015-12-30 10:14:18 +01:00
Christoph Oelckers
e0f9a59a9a - add WildMidi config file CVAR to menu. 2015-12-29 22:14:40 +01:00
alexey.lysiuk
69813993b0 - added missing hqNx modes to options menu 2015-12-25 10:00:31 +02:00
MajorCooke
452c82cbe2 - Added TF_SENSITIVEZ to A_Teleport. Fail teleportation instead of adjusting the actor to fit if they cannot. 
- When checking whether to use spot z or floorz, use spot floorz instead of ref for consistency.
 2015-12-17 10:34:38 -06:00
Christoph Oelckers
37e8221067 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-15 22:07:10 +01:00
Christoph Oelckers
68a72d64a4 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-14 09:06:42 +01:00
Christoph Oelckers
af2ce6ef42 - fixed: The 'mindefaults' game configuration must define the player starts 5-8. 2015-12-14 09:06:13 +01:00
Christopher Bruns
10088544c3 Merge branch 'master' of https://github.com/coelckers/gzdoom into stereo3d 
Conflicts:
	src/win32/i_system.cpp
 2015-12-09 18:34:20 -05:00
Edward Richardson
c099cd4581 SpawnParticle functions 
- Added A_SpawnParticle Decorate and SpawnParticle ACS functions.
 2015-12-08 22:58:24 +13:00
Christoph Oelckers
5b4323ec6c Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-08 09:35:06 +01:00
Braden Obrzut
62d41a58a8 Merge branch 'DecProx3' of git://github.com/MajorCooke/zdoom into master 2015-12-07 00:53:06 -05:00
Christoph Oelckers
41f91148a1 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-02 09:31:27 +01:00
MajorCooke
8594bfaa8b A_CustomPunch Extension 
- Added Melee/Miss parameters just like A_CustomMeleeAttack.
 2015-11-30 11:42:08 -06:00
MajorCooke
4fb48b332b Added A_CheckProximity. 
- Checks to see if a certain actor class, in numbers, is close to the actor/pointer via distance, based upon count. Can check for ancestry, disable Z searching, perform less than or equal to instead of greater or equal to, exact counts, check a pointer instead of itself and differentiate between live monsters and dead.
 2015-11-28 10:53:34 -06:00
Christoph Oelckers
888f356e58 - use the recently added text input menu item to add the config file for GUS, the patch set for Fluidsynth and the timidity.exe path for Timidity++ to the menu. Even though there is no proper file select box, this is still better than nothing. 
- changed the text input item so that it realigns itself to show the entire text when in text input mode.
 2015-11-28 12:43:01 +01:00
Christoph Oelckers
6e22be89e4 Merge branch 'master' of https://github.com/rheit/zdoom 2015-11-27 16:59:50 +01:00
Christoph Oelckers
fca469b053 - moved the notification messages for SendToCommunicator into LANGUAGE. 
As a side effect this will now allow using custom messages with this function as well by using the arg2 parameter as part of the message's name (arg2=0 will use TXT_COMM0, arg1 TXT_COMM1 and so on.)
 2015-11-26 10:25:05 +01:00
MajorCooke
d730b06da7 Added A_CheckSpecies(state jump, name species, ptr = AAPTR_DEFAULT) 
- Performs a state jump if the defined species name for the pointed actor matches the criteria.
 2015-11-26 01:33:02 -06:00
MajorCooke
a1e3112850 Removed FVF_RESETPITCH. 2015-11-25 23:15:59 -06:00
MajorCooke
ab5b1f479a Updated A_FaceVelocity. 
- Now includes anglelimit and pitchlimit.
- Anglelimit and pitchlimit only allows the actor to turn this much, similar to A_FaceTarget's limit. FVF_RESETPITCH also respects the pitch limit.
- (offset, anglelimit, pitchlimit, flags, ptr)
 2015-11-25 21:49:25 -06:00
Christoph Oelckers
01917d9f15 - fixed incorrect state settings in Macil. 2015-11-25 13:06:39 +01:00
coelckers
da39c86967 Merge pull request #401 from MajorCooke/RadiusGiveMinRange 
A_RadiusGive Mindist Parameter + RGF_OBJECTS Fix
 2015-11-25 12:27:54 +01:00
MajorCooke
75855dc64a A_FaceVelocity(offset, flags, ptr) 
- Changes the caller's angle and pitch according to the direction of velocity they're travelling.
- FVF_NOPITCH and FVF_NOANGLE disable changing of pitch/angle respectively and should be counted as mutually exclusive, or the function does nothing.
- FVF_INTERPOLATE - Interpolate's the angle and pitch changes.
- FVF_RESETPITCH will, if there's no z velocity, reset the pitch to 0. Otherwise, the pitch remains unchanged.
 2015-11-25 01:44:19 -06:00
Christopher Bruns
151b47c3ae Merge branch 'master' of https://github.com/coelckers/gzdoom into merge_down 
Conflicts:
	src/win32/i_system.cpp
 2015-11-03 20:21:27 -05:00
Christoph Oelckers
a5b43dfb66 Merge branch 'master' of https://github.com/rheit/zdoom 2015-11-03 23:55:41 +01:00
Christopher Bruns
0874455faf Initial implementation of five 3D modes -- some bugs remain. 2015-10-30 20:51:35 -04:00
Braden Obrzut
a8ac748123 Merge commit 'e2d874e343da34df6edfad0bb47370cbe10f4bae' 2015-10-25 15:00:43 -04:00
alexey.lysiuk
c93bc2561e Added Toggle Run action to Customize Controls menu 2015-10-15 10:33:28 +03:00
MajorCooke
75100d76fb - Added Threshold Manipulation. 
- Added 'threshold' and 'defthreshold' to DECORATE expression exposure.
- ChaseThreshold sets the default threshold for how long a monster must chase one target before it can switch targets. Default is 100, must not be negative.
- A_SetChaseThreshold can be used to alter the current or default threshold of an actor <pointer>.
- Changing current threshold has no effect on what the default will be once it hits 0 and something makes it infight with another.
 2015-10-12 11:06:55 -05:00
coelckers
c1496ea1bf Merge pull request #390 from MajorCooke/SetPainThreshold 
- Added A_SetPainThreshold for the calling actor('s pointer).
 2015-10-11 15:55:32 +02:00
MajorCooke
455b70630d - Added A_JumpIfCloser NoZ boolean. Disables Z distance checking if true. 2015-10-10 10:11:59 -05:00
MajorCooke
154e023800 - Added A_CheckBlock(state block, int flags, int ptr). 
- Performs a jump if an actor or a line is in the way.
- Can be used without a jump state if the desire is only to have a pointer change.
- CBF_NOLINES disables jumping if a line is involved.
- CBF_SET* flags set the target, master or tracer to whoever is blocking, for the actor calling the function.
- CBF_SETONPTR causes the pointer changing flags to apply to the pointed actor instead of itself.
 2015-10-04 16:00:40 -05:00
MajorCooke
af9478f818 - Added Warp properties RadiusOffset and Pitch. 
- RadiusOffset is a multiplier of the target actor's radius added onto the offsets x and y.
- Pitch is added to the warping actor's current pitch, provided WARPF_USEPITCH is supplied.
- Fixed WARPF_TOFLOOR not working as intended.
 2015-10-03 17:28:54 -05:00
MajorCooke
28622cecaf - Added mindist parameter to A_RadiusGive. 
- Actors must be this far away to receive items. Mindist must be less than distance.
- Fixed RGF_OBJECTS not discriminating players and monsters from shootable or vulnerable actors.
 2015-09-29 11:40:44 -05:00
Christoph Oelckers
f58b67b11d . added MBF dog sounds to Dehacked sound table. 2015-09-28 09:09:52 +02:00
Christoph Oelckers
4e1723eeb7 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	wadsrc/static/compatibility.txt
 2015-09-19 12:32:22 +02:00
Christoph Oelckers
9d68fd8fe9 Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-18 17:37:34 +02:00
MajorCooke
6730525855 - Added A_SetPainThreshold for the calling actor('s pointer). 2015-09-17 09:07:13 -05:00
alexey.lysiuk
4de57cd296 Fixed compatibility issues on MAP25 of Eternal Doom 
See http://forum.zdoom.org/viewtopic.php?f=2&t=49577
 2015-09-17 10:14:54 +03:00
alexey.lysiuk
6ee0672885 Fixed missing hit sound for Heretic weapon Dragon Claw 
See http://forum.zdoom.org/viewtopic.php?f=2&t=49459
 2015-09-16 13:38:47 +03:00
alexey.lysiuk
f4b637db62 Changed compatibility fix for Nuke Mine E1M2 
http://forum.zdoom.org/viewtopic.php?f=7&t=34013
 2015-09-15 19:30:32 +03:00
alexey.lysiuk
66437e32f6 Added compatibility setting for Return to Hadron E1M9 
See http://forum.zdoom.org/viewtopic.php?f=2&t=49544
 2015-09-15 19:29:43 +03:00
alexey.lysiuk
ee7eb3253a Added compatibility flag for point-on-line algorithm 
It's possible to use original but buggy implementations of P_PointOnLineSide() and P_PointOnDivlineSide() function
See http://forum.zdoom.org/viewtopic.php?f=2&t=49544
 2015-09-15 16:45:20 +03:00
Christoph Oelckers
0f425c4c3c Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	wadsrc/static/compatibility.txt
 2015-09-15 12:53:28 +02:00
Xaser Acheron
8948f5dc2b Added FPF_NOAUTOAIM to A_FireCustomMissile 2015-09-08 10:40:21 -05:00
MajorCooke
143a4c78a9 - Added A_SetFloatSpeed. 
- Sets the FloatSpeed of the actor/pointer.
 2015-09-06 19:57:43 -05:00
Christoph Oelckers
213216368a - more DECORATE fixing of Doom monsters, this time the Mancubus. 
It looks like the definitions that got added on November 4th, 2006 had some issues that mostly went unnoticed over time...
 2015-09-06 16:36:32 +02:00
Christoph Oelckers
23cc7da268 Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-06 16:01:18 +02:00
Christoph Oelckers
bca50c58b3 - removed A_NoBlocking call from Commander Keen. 2015-09-06 16:00:47 +02:00
alexey.lysiuk
68ea99016c Compatibility fix for Whispers of Satan MAP29 
Insta-death pit (sector 1497) is now working as intended independently from compatibility settings
 2015-09-06 15:45:10 +03:00
Christoph Oelckers
61e09da1be Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-06 08:41:27 +02:00
Christoph Oelckers
c7f3a3a7c2 Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-02 23:16:33 +02:00
Christoph Oelckers
1a275a7e8e - removed the initial extra state of Heretic's Mummy's projectile to restore the original sound behavior. 2015-09-02 23:15:41 +02:00
Braden Obrzut
1a25e35f3c Merge branch 'spider-radius' 2015-08-29 11:01:49 -04:00
Edward Richardson
0ed4549683 Correct the mastermind's radius 2015-08-30 02:47:45 +12:00
Christoph Oelckers
0a8255f34b Merge branch 'master' of https://github.com/rheit/zdoom 2015-08-27 12:49:23 +02:00
Christoph Oelckers
d87b6d6337 Merge branch 'WarpHeightOffset' of https://github.com/MajorCooke/zdoom 2015-08-26 08:46:20 +02:00
MajorCooke
f9e70a82c6 - Added A_SetSpecies(<species>,<pointer>). 2015-08-24 12:45:10 -05:00
Christoph Oelckers
2d58a28cc3 - fixed: In Heretic an active Tome of Power should not freeze a teleporting player. 
This was implemented by adding a new inventory flag INVENTORY.NOTELEPORTFREEZE so that the effect can both be activated for other items and deactivated for the two that currently have it.
 2015-08-16 08:50:22 +02:00
Christoph Oelckers
5a7afad0b3 Merge branch 'master' of https://github.com/rheit/zdoom 2015-08-12 10:08:01 +02:00
Christoph Oelckers
2ed3cec4db - externalized strings from Raven intermission screen. 2015-08-11 22:30:29 +02:00
MajorCooke
87cc3f77f9 - Removed WARPF_ADDHEIGHT. 2015-08-10 16:05:44 -05:00
MajorCooke
54af1e379e - Removed WARPF_MULHEIGHT. Enable its ability by default. 
- WARPF_ADDHEIGHT will simply change HeightOffset from multiplying to adding by default.
 2015-08-10 15:03:29 -05:00
MajorCooke
ad14caa800 - Added A_Warp heightoffset property. Only has an effect by two flags. 
- WARPF_ADDHEIGHT adds the pointed actor's height to heightoffset, and adds to the pointed actor's z position.
- WARPF_MULHEIGHT multiplies the pointed actor's height by heightoffset, and adds to the pointed actor's z position. Overridden by ADDHEIGHT.
 2015-08-10 11:19:54 -05:00
MajorCooke
e7aa5c690a Minor oversight... 2015-08-10 06:48:24 -05:00
MajorCooke
fcf1d56b1a - Added SXF_IS<TARGET/MASTER/TRACER>. 
- The spawned actor becomes the calling actor's specified pointers respectively.
 2015-08-09 14:06:22 -05:00
Christoph Oelckers
57150c8718 - fixed incorrect Strife player death sound. 2015-08-01 23:15:57 +02:00
Christoph Oelckers
40a2665726 - fixed incorrect Strife player death sound. 2015-08-01 11:56:44 +02:00
Christoph Oelckers
36974431ba Merge branch 'master' into scripting 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
 2015-08-01 09:42:31 +02:00
Christoph Oelckers
44d25afaef Merge branch 'master' of https://github.com/rheit/zdoom 2015-08-01 09:38:37 +02:00
Benjamin Moir
efce2a200c Added WARPF_USETID to A_Warp 2015-07-31 22:24:01 +09:30
MajorCooke
b4f05ee89b - Significant A_RadiusGive update. 
- Added filter and species parameter.
- Added new flags: RGF_INCLUSIVE, RGF_ITEMS, RGF_KILLED, RGF_EXFILTER, RGF_EXSPECIES, and RGF_EITHER.
- RGF_ITEMS: Items can receive inventory.
- RGF_KILLED: Actors who are truly dead might not be corpses, and vice versa.
- RGF_EXFILTER: Blacklists the specified actor filter. All but the filtered actor can receive the item.
- RGF_EXSPECIES: Blacklists the specified species. All but the filtered species can receive the item.
- RGF_EITHER: The actor can receive the item if it satisfies either the filter or the species. Only useful when both are used.
- RGF_INCLUSIVE: An actor marked as more than one pointer to the calling actor can ignore the exclusion pointers, but only if at least one is missing. I.e. an actor who is a target and tracer of the calling actor can still receive the item, if the calling actor doesn't pass RGF_NOTARGET and NOTRACER at the same time. RGF_INCLUSIVE only works with the pointer filtering flags. By default, if not specified, the actor will not be loopholed the item if they are under any one of the three filters.
- Fixed discrepancies and dependencies upon several flags and actor conditions which caused the function to fail.
 2015-07-22 16:46:14 -05:00
Christoph Oelckers
d8ea128f38 Merge branch 'master' into scripting 
Conflicts:
	src/p_effect.cpp
	src/p_effect.h
	src/p_local.h
	src/p_map.cpp
	src/thingdef/thingdef_codeptr.cpp
 2015-07-16 20:37:17 +02:00
Christoph Oelckers
d58d38a1d3 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/p_3dfloors.cpp
 2015-07-13 21:36:19 +02:00
Randy Heit
9edf409ea2 Add British English "translation", because u's matter 2015-06-30 13:11:33 -05:00
Christoph Oelckers
76c401a41e - added 'nopushwindowcheck' for Hexen's MAP30 which abuses a glitch with a 'projectile impact' line on a two-sided wall. 2015-06-18 10:20:04 +02:00
Christoph Oelckers
7ba577e1b0 Merge branch 'master' into scripting 
Conflicts:
	src/g_heretic/a_hereticweaps.cpp
	src/thingdef/thingdef_codeptr.cpp
 2015-06-07 09:43:54 +02:00
Christoph Oelckers
fbefe13bb2 Merge branch 'master' of https://github.com/rheit/zdoom 2015-06-04 09:27:17 +02:00
Christoph Oelckers
0b3a22d6d2 - fixed: The ending flat for No Rest For The Living was wrong. 2015-05-26 09:03:53 +02:00
Braden Obrzut
c9214c1ce9 - Fixed: Hexen's status bar top graphic was drawn 1 pixel too low. 
- Fixed: Artiflash played on initial save loading. I seem to recall this looking like an intentional change, but perhaps I broke it since it's completely pointless to play the animation only on the first load of a save game if nothing has been loaded beforehand.
 2015-05-20 13:10:08 -04:00
Christoph Oelckers
48ae605b7d Merge branch 'master' into scripting 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
 2015-05-02 22:44:31 +02:00
Christoph Oelckers
db8cd859a6 Merge branch 'master' of https://github.com/rheit/zdoom 2015-05-02 21:29:29 +02:00
MajorCooke
dc00d61f4d - Added TF_OVERRIDE to A_Teleport. 
- Overrides the NOTELEPORT flag so actors with velocity don't need to disable it in order to perform A_Teleport, which could be screwed up by a teleporting line or sudden ACS interference.
- Ensure that the result is set to false if it fails prematurely. Wasn't sure if this was needed, but with the upcoming if/else statements, better safe than sorry.
 2015-05-01 08:32:07 -05:00
Christoph Oelckers
bb85625d52 Merge branch 'master' of https://github.com/rheit/zdoom 2015-05-01 00:08:42 +02:00
Christoph Oelckers
1b29c3b6cf Merge branch 'master' into scripting 
Conflicts:
	src/p_interaction.cpp
	tools/lemon/lemon.c
 2015-04-30 16:13:32 +02:00
MajorCooke
1ecc048441 - Change the pointer to be at the end instead of the start. 2015-04-30 08:28:41 -05:00
MajorCooke
492ef1b716 - Added A_JumpIfHigherOrLower. 
- (int ptr = AAPTR_TARGET, state high, state low, float offsethigh = 0, float offsetlow = 0, bool includeHeight = true)
- Jumps if the pointer of the calling actor is higher or lower than itself, adding offsethigh or offsetlow depending on the circumstance.
- includeHeight works twofold.
- Includes the height of the calling actor if the pointer is higher to truly determine if they are completely above them or not.
- Includes the height of the pointer if the pointer is lower.
- Disable it to only check z differences without adding height.
 2015-04-30 08:15:48 -05:00
Christoph Oelckers
5f1c4d157c Merge branch 'master' into scripting 
Conflicts:
	src/g_shared/a_sharedglobal.h
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_data.cpp
 2015-04-30 12:30:36 +02:00
coelckers
691855e19b Merge pull request #304 from MajorCooke/morphundoalways 
- Added MORPH_UNDOALWAYS for morph powerups.
 2015-04-30 09:05:41 +02:00
coelckers
c2e91293d2 Merge pull request #310 from MajorCooke/telefogfix 
- Allow teleport fogs to set the teleporting actors as their targets, so...
 2015-04-30 09:02:10 +02:00
Christoph Oelckers
2e0f999fea Merge branch 'master' into scripting 
Conflicts:
	src/p_effect.cpp
	src/p_effect.h
	src/p_local.h
	src/p_map.cpp
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/actor.txt
	wadsrc/static/actors/shared/inventory.txt
	zdoom.vcproj
 2015-04-28 14:45:13 +02:00
Christoph Oelckers
8447990889 Merge commit '2719ce86dc07c9f7b1ad6d61a9a49c974896abf2' into scripting 
Conflicts:
	src/info.h
	src/thingdef/thingdef_codeptr.cpp

(until right before the main work for multiple tags.)
 2015-04-28 13:32:50 +02:00
Christoph Oelckers
f7834061df Merge commit 'b6a4511dd1e74440fad99bc673c1f2b3680dba48' into scripting 
Conflicts:
	src/dobjtype.cpp
	src/p_conversation.cpp
	src/p_local.h
	src/p_things.cpp
	src/thingdef/thingdef_properties.cpp

(This is just the conversationID to MAPINFO stuff to keep the conflicts as small as possible)
 2015-04-28 13:08:18 +02:00
Christoph Oelckers
ddced06be2 Merge commit '6e45c565a0bc8d05279b0b2458a3fb718ae0924c' into scripting 
Conflicts:
	src/p_mobj.cpp

(This stops right before moving the conversation IDs into MAPINFO because that feature is quite conflict-heavy and will have to merged by itself.)
 2015-04-28 12:59:20 +02:00
Christoph Oelckers
0474560ac6 Merge commit '2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0' into scripting 
Conflicts:
	src/d_main.cpp
	src/info.cpp
	src/p_local.h

(Had to merge this all by itself because it was creating too many merge conflicts when combined with other stuff.
 2015-04-28 12:54:01 +02:00
Christoph Oelckers
065c0a79cd Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting 
Conflicts:
	src/d_main.cpp
	src/info.cpp
	src/info.h
	src/p_acs.cpp
	src/p_interaction.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_properties.cpp

(scripting branch update part 5)
 2015-04-28 12:48:33 +02:00
Christoph Oelckers
792cad89b3 Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting 
Conflicts:
	src/g_hexen/a_clericstaff.cpp
	src/g_hexen/a_hexenspecialdecs.cpp
	src/p_acs.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_expression.cpp

(Scripting branch update part 4)
 2015-04-28 11:59:33 +02:00
Christoph Oelckers
d6e3fc0567 Merge commit 'fb9231a38db2025eb77bfd246f36d985cbbccd2e' into scripting 
Conflicts:
	src/info.cpp
	src/thingdef/thingdef_expression.cpp
	wadsrc/static/actors/constants.txt

(Scripting branch update part 2)
 2015-04-28 09:57:01 +02:00
Christoph Oelckers
56989d3422 Merge commit 'ec5817869592660af6837b9f4e20ed140972a2b2' into scripting 
Conflicts:
	src/p_enemy.cpp
	src/p_enemy.h
	wadsrc/static/actors/constants.txt

(Scripting branch update part 1)
 2015-04-28 09:34:51 +02:00
Christoph Oelckers
b4cdcef159 Merge branch 'zmaster' 2015-04-27 18:20:37 +02:00
Christoph Oelckers
98029a12ec Merge branch 'master' of https://github.com/rheit/zdoom into zmaster 2015-04-27 18:19:44 +02:00
Christoph Oelckers
ae16e5d195 - Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition. 2015-04-27 18:18:46 +02:00
Christoph Oelckers
6b1e7522e6 - Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition. 2015-04-27 15:14:01 +02:00
Christoph Oelckers
d46ba7bfb7 - added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.) 2015-04-27 10:24:49 +02:00
Christoph Oelckers
3ddc3d8feb Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/CMakeLists.txt
 2015-04-27 09:41:06 +02:00
Christoph Oelckers
020808ff40 - updated pistol pickup sprite with one from original beta graphics. 2015-04-27 08:57:36 +02:00
Christoph Oelckers
aecff68a4d - cleanup of sound system startup and menu handling: 
* added global functions that check whether FMod and OpenAL are present, without initializing the sound backend.
* make sound init code more fault tolerant. It will now try to switch between FMod and OpenAL if the currently active one cannot be found but the other one can.
* added 'ifoption' checks for sound backend to menu code.
* only show sound backends which are present and hide the options for the ones which are not.
 2015-04-26 12:13:21 +02:00
Christoph Oelckers
ab1d90038c Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/p_3dfloors.cpp
 2015-04-25 19:45:27 +02:00
Christoph Oelckers
1f2a431d15 Merge branch 'master' into openal 2015-04-24 09:21:06 +02:00
Chronos Ouroboros
6a6836b1e7 Added SpiralOffset to railgun functions. 2015-04-23 15:11:54 -03:00
Randy Heit
7ee1853403 Remove OpenAL and Sound Manager output options for FMOD 
- OpenAL never actualy worked properly and was removed in later FMODs.
- Sound Manager was deprecated by Apple long ago and is not supported for
  64-bit applications. It was also removed in later FMODs.
 2015-04-22 19:09:33 -05:00