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

1306 commits

Author SHA1 Message Date
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
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