Christoph Oelckers
df2e7c37fb
Merge branch 'master' of https://github.com/rheit/zdoom
2015-01-08 20:01:29 +01:00
alexey.lysiuk
f3cc872677
Added Retina/HiDPI option to video mode menu (OS X only)
2015-01-08 12:50:23 +02:00
Christoph Oelckers
1c3561d71e
Merge branch 'master' of https://github.com/rheit/zdoom
2015-01-08 09:27:30 +01:00
Randy Heit
f71b1a8983
Whoops.
2015-01-06 19:34:11 -06:00
Randy Heit
b2abf224b5
Save function name for error message in ParseStates()
...
- The error "You cannot pass parameters to..." used the most recent token,
which was always ( and not the function name. (Note that this was
already fixed in the scripting branch, so this is probably going to be a
conflict. Meh.)
2015-01-06 19:31:00 -06:00
MajorCooke
643d37ab7c
- Added A_SetFloatBobPhase(int). Takes a number between 0 and 63. If it's outside that range, it does nothing.
...
- Added A_Warp flags:
- WARPF_BOB: Gets the bob offset of actor pointer with the FLOATBOB flag.
- WARPF_MOVEPTR: The function is inversed to move the pointed actor with applied flags, but only the original caller will make the success/jump.
2015-01-06 11:55:41 -06:00
nashmuhandes
2b12db153b
New functions to manipulate an actor's roll.
...
- DECORATE functions: A_SetRoll code pointer.
- DECORATE expressions: "roll" variable.
- ACS functions: SetActorRoll, GetActorRoll.
2015-01-05 17:51:32 +08:00
Blue-Shadow
ba3988290c
Added an option to A_Check[SightOr]Range to be able to perform a 2D-based distance check.
2015-01-01 22:16:51 +03:00
Christoph Oelckers
4d34e0f548
Merge branch 'master' of https://github.com/rheit/zdoom
2014-12-31 10:55:55 +01:00
Randy Heit
85a2042394
Reimplement CheckClass and IsPointerEqual functions
...
- The definition of FxGlobalFunctionCall_CheckClass was big and scary. I
would say this is a big improvement, since now it gets to leverage the
same framework that action functions use.
- The definition of FxGlobalFunctionCall_IsPointerEqual was not so big and
scary, so this can't be called so much of an improvement as
CheckClass was. (Which is not to say that it isn't better anyway.)
2014-12-30 23:36:56 -06:00
MajorCooke
4ddfd0f46a
- Added 3 new properties and 3 functions to control them.
...
- Rippers will rip through anything with an equivalent ripper level, or if their level is between or on the min and max ranges.
- If no min or max is defined, it simply checks if the monster's ripper level is lower than the missiles.
- Functions: A_SetRipperLevel(int level), A_SetRipMin(int min), A_SetRipMax(int max)
- Properties: RipperLevel, RipLevelMin, and RipLevelMax.
- RipperLevel: Applicable to monsters and projectiles.
- RipLevelMin and RipLevelMax are only useful on monsters.
- By default, all are 0.
2014-12-30 19:59:31 -06:00
Christoph Oelckers
c39e962fd5
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/CMakeLists.txt
src/posix/sdl/hardware.cpp
Please note that this will NOT(!!!) compile on Linux without adjusting sdlglvideo.cpp!
2014-12-25 22:50:15 +01:00
MajorCooke
15cd0debc1
- Fixed: Species was not defined in actor.txt.
2014-12-25 09:23:59 -06:00
MajorCooke
d94be8f57b
- Reverted back and set filter to "None" instead.
2014-12-24 17:15:21 -06:00
rheit
bfb94f13d2
Merge pull request #198 from MajorCooke/filters
...
- Added name filtering to all A_Damage/Kill/Remove functions.
2014-12-23 21:42:31 -06:00
Randy Heit
b5e4153c78
Merge branch 'master' into gonesolong
...
Conflicts:
src/CMakeLists.txt
src/b_think.cpp
src/g_doom/a_doomweaps.cpp
src/g_hexen/a_clericstaff.cpp
src/g_hexen/a_fighterplayer.cpp
src/namedef.h
src/p_enemy.cpp
src/p_local.h
src/p_mobj.cpp
src/p_teleport.cpp
src/sc_man_tokens.h
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_function.cpp
src/thingdef/thingdef_parse.cpp
wadsrc/static/actors/actor.txt
wadsrc/static/actors/constants.txt
wadsrc/static/actors/shared/inventory.txt
- Added register reuse to VMFunctionBuilder for FxPick's code emitter.
- Note to self: Need to reimplement IsPointerEqual and CheckClass, which
were added to thingdef_function.cpp over the past year, as this file no
longer exists in this branch.
2014-12-21 21:15:11 -06:00
MajorCooke
91bfe4cceb
- Added pointers for A_CustomMissile and A_CustomBulletAttack.
2014-12-21 12:29:19 -06:00
MajorCooke
2c7a3f2eba
- Optimized DoDamage and DoKill.
...
- Do a filter and species check first to save time.
- Added DMSS/KILS/RMVF_EITHER, which means if the actor is of type or species, it counts.
- A_DamageTarget(20,"Normal",DMSS_EITHER,"DoomImp","CyberdemonSpecies")
- This affects actor DoomImp, and anything that's of species CyberdemonSpecies.
- Added a little more documentation via comments.
2014-12-21 10:38:51 -06:00
MajorCooke
5a472e815b
- Added species checking.
...
- Added two more flags for each of the functions, EXFILTER and EXSPECIES.
- Stands for "exclude filter/species" and makes the function not take them into account.
- Cleaned up the code and placed all the checking in their own subfunctions.
2014-12-21 09:31:24 -06:00
Christoph Oelckers
58a3b86813
Merge branch 'master' of https://github.com/rheit/zdoom
2014-12-21 13:49:23 +01:00
MajorCooke
c168761eda
- Couple additional fixes:
...
- The wiki said the minimum distance to teleport defaults to 0, actor.txt on the other hand said otherwise. I was wondering why it was still broken somewhat...
- Prevent stickiness from happening, a.k.a. getting stuck in ceiling or floor and letting the engine unstick the actor. This caused velocity loss.
2014-12-20 22:51:43 -06:00
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
MajorCooke
e5a41a1358
- Added name filtering to all A_Damage/Kill/Remove functions.
...
- A_DamageChildren(20,"Normal",0,"DoomImp") for example will only target actors of DoomImp specifically.
2014-12-20 16:57:00 -06:00
Christoph Oelckers
5f8d140424
Merge branch 'menu-updates' of https://github.com/Edward850/zdoom
2014-12-20 11:38:22 +01:00
Christoph Oelckers
a19f0219c5
Merge branch 'master' of https://github.com/Blue-Shadow/zdoom
2014-12-20 11:36:10 +01:00
MajorCooke
86b0065c0b
- Added a multitude of flags for A_Teleport.
...
- TF_KEEPVELOCITY: Keep the velocity after teleporting.
- TF_KEEPANGLE: Don't use the special spot's angle.
- TF_USESPOTZ: Normally, this function
- TF_NOSRCFOG: Don't leave fog at the previous location.
- TF_NODESTFOG: Don't leave fog at the arriving location.
- TF_USEACTORFOG: Use the actor's TeleFogSourceType and TeleFogDestType properties.
- TF_NOJUMP: Don't require or cause a jump. In this case, put 0 (or "") in for the jump destination when using CustomInventory items to teleport actors around.
2014-12-19 12:37:02 -06:00
Edward Richardson
80bc95d3bc
Added absent cl_capfps and cl_maxdecals entries
2014-12-19 21:57:34 +13:00
Blue-Shadow
a150e0686c
Added 'lifestealmax' parameter and STEALARMOR flag to A_Saw and A_CustomPunch.
2014-12-18 23:05:59 +03:00
MajorCooke
c6fd4c5aaf
- Added the two definitions to actor.txt.
2014-12-18 09:46:19 -06:00
MajorCooke
a2bb673370
- I really need to stop coding so late at night.
2014-12-17 21:58:30 -06:00
MajorCooke
30acb72006
- Added per-actor teleport fog modifications.
...
- New properties include TeleFogSourceType and TeleFogDestType.
- TeleFogSourceType is the fog left behind where the actor teleported away from.
- TeleFogDestType is the fog the actor sees when it arrives at its destination.
- Added A_SetTeleFog(<oldpos>,<newpos>) -- oldpos sets TeleFogSourceType, newpos sets TeleFogDestType.
2014-12-17 16:11:07 -06:00
Christoph Oelckers
4f00aa3957
Merge branch 'master' of https://github.com/rheit/zdoom
2014-12-16 17:38:37 +01:00
MajorCooke
465d9ab89a
- Added flags for A_CheckLOF:
...
- CLOFF_SETTARGET | CLOFF_SETMASTER | CLOFF_SETTRACER
- An actor that causes A_CheckLOF (and only an actor) to succeed will set the intercepting actor as its target, master, and/or tracer, respectively.
2014-12-15 14:50:35 -06:00
Christoph Oelckers
020b02e073
- changed deprecated texture sampler access function names.
2014-11-28 12:28:45 +01:00
MajorCooke
94f08aa593
- Added: Boolean to specify if A_Raise functions should perform CopyFriendliness based upon who raised it. By default, this is false.
2014-11-27 15:12:33 -06:00
MajorCooke
08570ec48e
- Added flags for A_Fade functions:
...
- FTF_REMOVE: Removes the actor when the alpha hits a certain level.
- - A_FadeIn - 1.0
- - A_FadeOut - 0.0
- - A_FadeTo - Alpha target level reached
- FTF_CLAMP: Automatically fixes the alpha so it won't leave the range [0.0, 1.0].
2014-11-25 13:24:35 -06:00
Christoph Oelckers
6665ac5837
- fixed: With P_ExplodeMissile now working properly it is no longer valid to terminate a looping sound in a missile's death state because it now gets called after the death sound has been started.
2014-11-25 16:49:27 +01:00
Christoph Oelckers
a7a2d55695
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/sdl/iwadpicker_cocoa.mm
2014-11-25 16:39:56 +01:00
khokh2001
e9075334a3
new opl3 emulator
2014-11-23 00:36:22 +09:00
Christoph Oelckers
c25325efa4
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
wadsrc/static/compatibility.txt
2014-11-16 09:02:17 +01:00
Edoardo Prezioso
fd354dbe9a
- Added CPF_NOTURN flag for A_CustomPunch.
2014-11-14 12:18:46 +01:00
Edward Richardson
b08fcbf6b3
Added compat profile for TNT MAP31
2014-11-10 18:37:14 +13:00
Christoph Oelckers
62d72fb751
Merge branch 'master' of https://github.com/rheit/zdoom
2014-11-09 12:22:49 +01:00
Edoardo Prezioso
8b85e6d00b
- Port an empty version of 'A_FaceConsolePlayer'.
...
Hissies will be happy now.
2014-11-08 18:49:16 +01:00
Christoph Oelckers
48fbab819b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-11-08 09:40:17 +01:00
Christoph Oelckers
c28c0b8f0b
Revert "Backport 'A_FaceConsolePlayer' from zandronum."
...
This reverts commit eab971500b
.
As Edward850 pointed out, this feature is broken by design and therefore completely useless.
2014-11-08 08:53:32 +01:00
Christoph Oelckers
3976de1404
Merge branch 'faceconsoleplayer' of https://github.com/edward-san/zdoom
2014-11-08 00:48:07 +01:00
Edoardo Prezioso
eab971500b
Backport 'A_FaceConsolePlayer' from zandronum.
...
By Dusk, who authorized me to do this.
2014-11-08 00:31:16 +01:00
MajorCooke
364d9069bd
In fact, let's go ahead and ensure compatibility doesn't break since it's already in there.
2014-11-07 17:20:12 -06:00
MajorCooke
848225e9ee
- Fixed typo on WARPF_ABSOLUTEPOSITION
2014-11-07 17:12:03 -06:00
MajorCooke
938b54ccb5
- Added TF_FORCED for A_Teleport. Forces the actor to move to the spot.
2014-10-31 15:51:15 -05:00
Edward Richardson
c85105f552
Added cl_showsecretmessage
...
Controls if secret notifications are displayed (def. true)
2014-10-31 22:50:23 +13:00
Christoph Oelckers
1a8da51857
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-29 22:53:58 +01:00
MajorCooke
165d2887fd
- Added: A_GiveToChildren
...
- Added: A_TakeFromChildren
- Added: A_GiveToSiblings
- Added: A_TakeFromSiblings
- Added the following flags for A_RadiusGive:
- RGF_NOSIGHT: Exclude sight check from distance.
- RGF_MISSILES: Missiles can take inventory items.
2014-10-29 14:01:31 -05:00
MajorCooke
c01d1a8003
- Added DMSS_NOPROTECT.
...
Bypasses PowerProtection inventory items.
2014-10-27 22:29:10 -05:00
Christoph Oelckers
5638aab63c
- fixed: Even though the name REDISALPHA implies otherwise, this render mode still needs to respect a texture's alpha channel to ensure that things get rendered properly. Otherwise the SmoothEdges function cannot be used which is necessary to ensure that filtered textures look correct.
2014-10-26 21:17:29 +01:00
Christoph Oelckers
bd811bea87
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-25 18:26:42 +02:00
Christoph Oelckers
be4b253215
- use a separate sound for the net notches on the startup screen.
2014-10-25 18:18:35 +02:00
Christoph Oelckers
fc0025963b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-25 15:11:29 +02:00
Christoph Oelckers
ef5707d73b
- added a compatibility option for stopping sounds when the owning actor is destroyed.
2014-10-25 12:12:06 +02:00
Christoph Oelckers
8edace83c5
- made CheatKey and EasyKey vector graphics configurable through MAPINFO.
2014-10-25 10:19:14 +02:00
Christoph Oelckers
313245dd77
- added a Buddha powerup
2014-10-25 09:53:23 +02:00
MajorCooke
a19620968d
- Follow-up of the previous commit.
...
- Cleaned up the DoDamage and DoKill functionality.
- Added DMSS_FOILBUDDHA and KILS_FOILBUDDHA.
2014-10-25 09:39:10 +02:00
MajorCooke
b980069367
- Added GOD2 and BUDDHA2 cheats.
...
- Ensures that not even telefrag damage can kill the player.
- Fixed: Players with NODAMAGE could still hurt and kill themselves via
voodoo dolls.
2014-10-25 09:38:40 +02:00
Christoph Oelckers
5513966165
- fixed: Strife's peasants couldn't harm the player because they were defined as friendly.
2014-10-25 01:15:39 +02:00
Christoph Oelckers
e28234a8b8
- replaced pistol pickup sprite.
2014-10-24 23:19:57 +02:00
Christoph Oelckers
6824605154
- added pickup sprite and editor number for Heretic's gold wand.
2014-10-24 00:06:18 +02:00
Christoph Oelckers
57895d69f9
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-14 08:54:41 +02:00
Christoph Oelckers
952d03da7c
Merge branch 'multi' of https://github.com/Edward850/zdoom
2014-10-13 10:37:51 +02:00
Edward Richardson
98904039b7
Final work on prediction lerping
...
Added cl_predict_lerpscale and cl_predict_lerpthreshold
Added options in menudef
Made sure that lerping cannot extrapolate or run on small scales
Lerping gets reset when rendering interpolation does or respawn
2014-10-13 16:32:49 +13:00
Edward Richardson
3e6ad8c1a8
Further work on prediction lerping
2014-10-13 00:29:15 +13:00
Christoph Oelckers
0f19356e24
Merge branch 'master' of https://github.com/MajorCooke/zdoom
...
Conflicts:
wadsrc/static/actors/constants.txt
2014-10-12 08:43:46 +02:00
Christoph Oelckers
2228dcb32f
Merge branch 'experimental' of https://github.com/MajorCooke/zdoom
2014-10-12 08:30:13 +02:00
MajorCooke
f766a1ab38
- Added SXF_ORIGINATOR.
...
- Only useful for missiles.
By default, missiles cannot set themselves as the master when spawning
actors.
2014-10-11 16:15:42 -05:00
Christoph Oelckers
9fe2857dc1
Merge branch 'master' of https://github.com/rheit/zdoom
2014-10-05 18:49:48 +02:00
Christoph Oelckers
fd3128a164
- fixed: When changing enhanced nightvision mode the shaders need to have their fixed colormap state reset to ensure that the new settings get used.
...
- fixed: The shader code for handling special fixed colormaps did not use the color vertex attribute which was most evident with the 'shadow' render style on the spectre.
2014-10-05 09:40:36 +02:00
MajorCooke
f54a59fdf8
- Added JLOSF_CHECKTRACER for A_JumpIfTargetInLOS.
...
- CHECKTRACER doesn't need to be a missile or have the SEEKERMISSILE
flag.
2014-10-02 17:00:17 -05:00
ChillyDoom
20dea78ce9
Merge branch 'master' of https://github.com/ChillyDoom/zdoom into scoreboardtoggle
2014-10-02 21:13:54 +01:00
ChillyDoom
c6e1ea864f
- Added scoreboard toggling.
2014-10-02 21:03:15 +01:00
MajorCooke
5030832df0
- Added DMSS_NOFACTOR for all A_Damage functions.
2014-10-02 11:48:07 -05:00
Christoph Oelckers
cfb623d517
Merge branch 'master' of https://github.com/MajorCooke/zdoom
2014-09-29 00:42:59 +02:00
MajorCooke
43b86288c7
- Added A_Remove(int pointer, int flags).
...
- RMVF_MISSILES removes missiles.
- RMVF_NOMONSTERS ignores monsters.
- RMVF_MISC includes non-monsters and missiles.
- RMVF_EVERYTHING disregards all checks and remove it.
These flags now apply to the following in addition to the new function:
-A_RemoveTarget
-A_RemoveMaster
-A_RemoveTracer
-A_RemoveChildren
-A_RemoveSiblings
2014-09-28 08:15:00 -05:00
fdari
c4f0f95ec8
Get linetarget (aim target) from any actor (not just player): AAPTR_LINETARGET
2014-09-28 15:06:52 +02:00
Christoph Oelckers
ee09f8c72d
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-28 01:06:04 +02:00
MajorCooke
68a5db3c8c
- Added SXF_NOPOINTERS for A_SpawnItemEx.
...
- Added WARPF_ABSOLUTEPOSITION for A_Warp.
2014-09-27 13:22:14 -05:00
Christoph Oelckers
68c481945a
- extended parameter list of A_BFGSpray.
2014-09-27 09:36:38 +02:00
MajorCooke
0735cb9550
- Updated many functions.
...
- Added A_KillTarget(damagetype, int flags).
- Added A_KillTracer(damagetype, int flags).
- Added A_RemoveTarget.
- Added A_RemoveTracer.
A_Kill (Master/Target/Tracer/Children/Siblings):
- KILS_FOILINVUL: foils invulnerability.
- KILS_KILLMISSILES: destroys projectiles. Does not work on invulnerable
projectiles without KILS_FOILINVUL, and doesn't work at all on missiles
with NODAMAGE flag.
- KILS_NOMONSTERS: actors that are monsters will not be killed.
A_Damage (Self/Target/Master/Tracer/Children/Siblings):
- DMSS_FOILINVUL: foils invulnerability.
- DMSS_AFFECTARMOR: damages the actor's armor instead of bypassing it
entirely.
- DMSS_KILL: damages the actor by its remaining health (useful for
modular DECORATE programming).
- Added A_SpawnItemEx flags:
- SXF_SETTARGET: sets the calling actor as the target.
- SXF_SETTRACER: sets the calling actor as the tracer.
Both of these functions take priority similar to SXF_SETMASTER over
SXF_TRANSFERPOINTERS.
2014-09-27 00:10:31 -05:00
MajorCooke
5b71ce6dcb
- Added FDARI's A_JumpIfHealthLower patch.
...
Now with pointer accessibility.
2014-09-26 11:48:20 -05:00
Christoph Oelckers
0f62983aee
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-09-26 08:31:20 +02:00
MajorCooke
422e83a1b9
- Added more A_Damage functions:
...
- A_DamageTarget
- A_DamageTracer
-Both take a number for how much damage to deal and the damagetype to
inflict. Negative numbers means healing.
2014-09-25 23:12:25 -05:00
Edward Richardson
9e68983b44
Added standard teleports to line prediction
...
- Added standard teleports to line prediction
- Menudef for line special prediction
2014-09-26 15:48:45 +12:00
Edward Richardson
6cd4fd8151
Added menu options for network settings
2014-09-26 15:48:44 +12:00
Edward Richardson
97586c317e
Further refinements to network balancing
...
- Added delay times of all players to the scoreboard
- Removed balancing from packet-server (tried it, didn't work)
- Calculations remove an extra tic to account for possible bias
2014-09-26 15:48:42 +12:00
Edward Richardson
542b8a7171
Added network load balancing
...
- Guests can now attempt to match latency with the arbitrator.
(net_loadbalance)
- Added althud feature to show arbitrator and local latency.
(hud_showlag 1 is on for netgames, 2 is always on)
2014-09-26 15:48:42 +12:00
MajorCooke
b1f87295b8
- Added A_DamageSelf.
...
- A_DamageSelf(int amount, name damagetype)
2014-09-25 16:47:41 -05:00
Chris Robinson
b8e3f99ce6
Merge remote-tracking branch 'zdoom/master' into openal
...
Conflicts:
src/s_sound.cpp
2014-09-22 18:24:55 -07:00
Christoph Oelckers
4682736585
- fixed: non-tiled mid textures on a fog boundary require some special clamping to be performed in the shader.
2014-09-21 11:08:17 +02:00
Christoph Oelckers
cbf353ca52
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-21 08:12:32 +02:00
MajorCooke
44683657f2
- Added jpalomo's A_SetSpeed patch.
2014-09-20 17:34:57 -05:00
Christoph Oelckers
835dbe5bd0
- removed the 'layout' qualifier from the uniform buffer declaration. It's not really needed because the layout of a single vec4 array cannot possibly change, and Intel drivers are complaining for unknown reasons.
2014-09-20 09:10:01 +02:00
MajorCooke
33f83cc7f9
Added Blue Shadow's A_SpawnItemEx changes: (2/2)
...
SXF_TRANSFERALPHA and SXF_TRANSFERRENDERSTYLE
2014-09-19 14:17:24 -05:00
Christoph Oelckers
07ef7d3d59
Merge branch 'master' into v2.x
2014-09-14 23:07:30 +02:00
Christoph Oelckers
60ff6c5f07
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-14 23:06:57 +02:00
Chris Robinson
cd46f95902
Merge remote-tracking branch 'zdoom/master' into openal
2014-09-13 11:52:47 -07:00
Christoph Oelckers
f9741f1047
- added a compatibility option for Hexen's MAP04 to change the z-position of 4 quartz flasks that get lowered into a pool of lava but were incorrectly positioned 48 map units above the floor.
2014-09-13 12:20:06 +02:00
Chris Robinson
ff6eb6df5c
Merge remote-tracking branch 'zdoom/master' into openal
...
Conflicts:
src/s_sound.cpp
2014-09-09 14:45:53 -07:00
Christoph Oelckers
acf6c259d8
- changed the handling of alpha textures. The only special case they need is with palette-less textures and this can be handled far more easily and robustly with a predefined translation instead of passing another parameter through all the layers of the texture management code. This also fixes problems with paletted PNGs that get used as an alpha texture because the old method clobbered the image's palette.
2014-09-09 13:21:36 +02:00
Christoph Oelckers
d5633701b4
- swapped order of textures in burn shader to avoid some problems with the texture samplers.
...
- fixed: texture sampler state for the burn texture was never set.
2014-09-09 10:17:44 +02:00
Christoph Oelckers
9b8869e78d
Merge branch 'master' into v2.x
...
Conflicts:
src/gl/textures/gl_material.cpp
2014-09-09 01:30:11 +02:00
Christoph Oelckers
86d9c7ec8e
- add some compatibility settings to fix rendering glitches in BTSX_E1 MAP12.
2014-09-09 01:27:41 +02:00
Christoph Oelckers
0ff061b928
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-08 22:55:37 +02:00
Christoph Oelckers
3d2646cbae
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-08 13:02:39 +02:00
Christoph Oelckers
cfd24f438f
- jpalomo's A_Saw flags submission.
2014-09-08 13:02:05 +02:00
Braden Obrzut
49382a2a14
- Added detection for The Adventures of Sqaure (based off MTrop's submission).
...
- IWADINFO no longer requires a mapinfo to be specified.
2014-09-04 19:36:08 -04:00
Christoph Oelckers
b96dd6c421
- fixed: The missing fourth component of the texture coordinate must be filled with 1.0, not 0.0 before applying the texture matrix. Not doing so will cancel out the translation part of the matrix.
2014-09-02 10:31:48 +02:00
Christoph Oelckers
12160bd29c
- remove some obsolete code from decal rendering.
...
- avoid rebinding the same texture multiple times, as there's considerable overhead in the texture manager.
- check gl_sort_textures only once per scene, not per draw list.
2014-08-30 15:34:14 +02:00
Christoph Oelckers
8f238f8d32
- fixed: the Revenant's frame duration in its missile state were wrong.
2014-08-27 11:06:12 +02:00
Christoph Oelckers
7a727b6807
Merge branch 'master' into v2.x
2014-08-21 13:44:41 +02:00
Christoph Oelckers
816999109e
Merge branch 'master' of https://github.com/rheit/zdoom
2014-08-21 13:42:43 +02:00
Christoph Oelckers
eebd5c9d4d
- fixed bad edit in linedef translation.
2014-08-21 13:38:47 +02:00
Christoph Oelckers
df0d3543a8
- fixed: *ALL* original ceiling crushers, not just type 49, require a distance of 8 to the floor for the destination height. For the silent types this required a new action special, Ceiling_CrushAndRaiseSilentDist. This change only affects the XLAT mapping, the Hexen format types behave as before.
...
- removed the redundant internal ceilCrushAndRaiseDist ceiling movement type. It was precisely the same as ceilCrushAndRaise in all details.
2014-08-21 13:01:12 +02:00
Christoph Oelckers
c98e3ca99d
Merge branch 'master' into v2.x
2014-08-03 10:58:41 +02:00
Christoph Oelckers
1b55c17379
Merge branch 'master' of https://github.com/rheit/zdoom
2014-08-03 10:08:05 +02:00
Christoph Oelckers
a1b579e5fc
- added menu entry for newly added hud_showweapons CVAR.
2014-08-03 01:20:12 +02:00
Christoph Oelckers
a8e9c1832f
- decided to restrict the 2.0 beta to OpenGL 4.x with GL_ARB_buffer_storage extension and removed all code for supporting older versions.
...
Sadly, anything else makes no sense.
All the recently made changes live or die, depending on this extension's presence.
Without it, there are major performance issues with the buffer uploads. All of the traditional buffer upload methods are without exception horrendously slow, especially in the context of a Doom engine where frequent small updates are required.
It could be solved with a complete restructuring of the engine, of course, but that's hardly worth the effort, considering it's only for legacy hardware whose market share will inevitably shrink considerably over the next years.
And even then, under the best circumstances I'd still get the same performance as the old immediate mode renderer in GZDoom 1.x and still couldn't implement the additions I'd like to make.
So, since I need to keep GZDoom 1.x around anyway for older GL 2.x hardware, it may as well serve for 3.x hardware, too. It's certainly less work than constantly trying to find workarounds for the older hardware's limitations that cost more time than working on future-proofing the engine.
This new, trimmed down 4.x renderer runs on a core profile configuration and uses persistently mapped buffers for nearly everything that is getting transferred to the GPU. (The global uniforms are still being used as such but they'll be phased out after the first beta release.
2014-08-01 22:42:39 +02:00
Christoph Oelckers
7967082e60
- use the light buffer to handle dynamic lighting.
2014-08-01 20:59:39 +02:00
Christoph Oelckers
01a1e10084
Merge branch 'master' into Glew_Version_For_Real
2014-07-31 00:59:56 +02:00
Christoph Oelckers
09ae52e26b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-31 00:44:59 +02:00
Christoph Oelckers
ef8f66c9a1
- removed the code for hardware alpha testing again because it didn't work anymore with how things are set up now.
...
- we need to check all GL versions when trying to get a context because some drivers only give us the version we request, leaving out newer features that are not exposed via extension.
- added some status info about uniform blocks.
2014-07-30 23:13:16 +02:00
Randy Heit
ea7ba9dba3
Add per-actor friction
...
- This is multiplied by the sector's friction.
- This is intentionally not serialized yet, while awaiting feedback.
2014-07-28 23:15:50 -05:00
Christoph Oelckers
754c96a540
- added default precision settings to shader include because some old ATI drivers complain if they aren't there - even though the spec doesn't require them...
2014-07-27 16:09:47 +02:00
Chris Robinson
7e7219a84b
Merge remote-tracking branch 'zdoom/master' into openal
2014-07-27 06:59:26 -07: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
637aa9d77e
- some adjustments to allow testing the different rendering methods.
2014-07-26 18:43:54 +02:00
Christoph Oelckers
0e647e0f2b
Merge branch 'master' into Glew_Version_For_Real
2014-07-26 10:37:00 +02:00
Christoph Oelckers
8465a5f5d7
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-26 10:23:41 +02:00
Christoph Oelckers
a21f01bc5f
- added jpalomo's submission to make freelook a 3-state setting, like crouch and jump. This required moving around the flags a bit so demo compatibility had to be bumped. It may also require adjustment for launchers that can set the dmflags.
2014-07-26 10:15:07 +02:00
Christoph Oelckers
f64428dd2a
Merge branch 'master' into Glew_Version_For_Real
2014-07-17 09:31:18 +02:00
Christoph Oelckers
b78b566b0a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-17 09:30:50 +02:00
Christoph Oelckers
eb9d2d9917
- reactivate compatibility profile so that immediate mode drawing can be used on older hardware not supporting persistently mapped buffers.
...
- reactivate alpha testing per fixed function pipeline
- use the 'modern' way to define clip planes (GL_CLIP_DISTANCE). This is far more portable than the old glClipPlane method and a lot more robust than checking this in the fragment shader.
2014-07-17 02:37:18 +02:00
Chris Robinson
e8233d7e87
Merge remote-tracking branch 'zdoom/master' into openal
2014-07-16 08:31:12 -07:00
Braden Obrzut
bd5bf2a40a
- Expand environment variables for autoload paths.
...
- Forgot to save the French translation file for the last commit, so a few more corrections there.
2014-07-15 21:26:26 -04:00
Braden Obrzut
bfbea40415
- Fixed some typos with chex quest obituaries and French translation error.
2014-07-15 21:20:05 -04:00
Christoph Oelckers
b8bcbe819b
- removed texture based dynamic lighting. For GL 3.x the shader approach is always better.
...
- fixed: sky fog was not unset.
2014-07-15 20:49:21 +02:00
Christoph Oelckers
fc0cf4f998
- GZDoom now runs on an OpenGL core profile. :)
...
It's probably still necessary to replace GLEW with another loader library. GLEW is pretty much broken on core OpenGL without some hacky workarounds...
2014-07-15 02:26:23 +02:00
Christoph Oelckers
6046b11b4f
- all shaders now compile in core profile.
2014-07-15 01:05:53 +02:00
Christoph Oelckers
eedc5a69be
- replaced builtin position vertex attribute.
2014-07-15 01:02:48 +02:00
Christoph Oelckers
1b7f5a2e6a
- replaced builtin texture coordinate vertex attribute.
2014-07-15 00:59:01 +02:00
Christoph Oelckers
5a322742c3
- remove use of builtin and deprecated color vertex attribute.
2014-07-15 00:37:13 +02:00
Christoph Oelckers
5193f6cfef
- remove use of builtin deprecated varyings in shaders.
2014-07-15 00:19:41 +02:00
Christoph Oelckers
ed8a21fd86
- replaced deprecated alpha testing with shader code.
2014-07-14 21:14:43 +02:00
Christoph Oelckers
84a49e37ee
- handle normals for spheremapped mirror surfaces using non-deprecated features.
...
- move all WGL references out of global header files so that global wgl header include is no longer necessary
2014-07-14 19:54:07 +02:00
Christoph Oelckers
ce3653f6e1
- remove all uses of builtin matrices.
2014-07-13 23:13:40 +02:00
Christoph Oelckers
dbb05c5f33
- remove use of builtin texture matrices.
...
- make matrix class single precision.
2014-07-13 20:41:20 +02:00
Christoph Oelckers
00fcf4bc06
- for some reason using world coordinates for clipping in the shader is somewhat imprecise so the clip plane heights have to be adjusted a bit for it.
2014-07-13 13:25:42 +02:00
Christoph Oelckers
60dc2e1122
- some shader fixes.
2014-07-13 13:01:35 +02:00
Christoph Oelckers
d868f60f6c
- since the clip planes for plane mirrors did not work anymore I reimplemented them using shader based logic. It still needs to be seen if this affects performance on older hardware.
2014-07-13 12:14:12 +02:00
Christoph Oelckers
a936629cec
- use default fragment shader for burn and stencil shader, with the time consuming parts disabled by a #define, to avoid code duplication.
2014-07-10 10:33:07 +02:00
Christoph Oelckers
f710518903
- use a uniform array to store vertex data to render dynamic stuff on GL 3.x hardware without the ARB_buffer_storage extension.
...
Due to the way the engine works it needs to render a lot of small primitives with frequent state changes.
But due to the performance of buffer uploads it is impossible to upload each primitive's vertices to a buffer separately because buffer uploads nearly always stall the GPU.
On the other hand, in order to reduce the amount of buffer uploads all the necessary state changes would have to be saved in an array until they can finally be used. This method also imposed an unacceptable overhead.
Fortunately, uploading uniform arrays is very fast and doesn't cause GPU stalls, so now the engine puts the vertex data per primitive into a uniform array and uses a static vertex buffer to index the array in the vertex shader.
This method offers the same performance as immediate mode but only uses core profile features.
2014-06-30 18:10:55 +02:00
Christoph Oelckers
1efc2938b7
- implement model vertex buffer and draw MD2 models using it instead of using the GLCommands from the model.
2014-06-29 23:24:16 +02:00
Christoph Oelckers
9d1dbf4eab
- fixed: FBufferedUniform1f didn'T work because it used an int as its buffered value.
2014-06-29 14:08:44 +02:00
Christoph Oelckers
ffcb6cb70a
- added second vertex coordinate attribute for model interpolation.
2014-06-29 11:00:21 +02:00
Christoph Oelckers
08054ddc34
Merge branch 'master' into Glew_Version_For_Real
2014-06-29 08:53:43 +02:00
Chris Robinson
1a40c95f84
Rename some FMOD references to be generic sound system
...
Since they relates to other sound backends as well, there's no need to single
out FMOD in these places.
2014-06-26 16:58:18 -07:00
Chris Robinson
d761dd1ff6
Merge remote-tracking branch 'zdoom/master' into openal
2014-06-25 17:37:20 -07:00
Christoph Oelckers
e15f80f640
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-23 09:27:30 +02:00
Christoph Oelckers
e56e525d0f
- A_FireCustomMissile transfer tranlsation flag, code submission by jpalomo
2014-06-22 08:55:21 +02:00
Christoph Oelckers
6457ced53f
Merge branch 'master' into Glew_Version_For_Real
2014-06-19 11:57:36 +02:00
Christoph Oelckers
d30bf6768e
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-19 11:20:38 +02:00
Chris Robinson
b94a2949e5
Don't use air absorption for being underwater
2014-06-18 23:41:45 -07:00
Chris Robinson
cd550cf9b6
Merge remote-tracking branch 'origin/master' into openal
2014-06-17 22:08:03 -07:00
Edward Richardson
a3a7ee569f
Multi-intermission waits for all players + changes
...
- Added a segment of code that now makes the intermission wait for all
players before advancing, instead of continuing on any player. A "ready
icon" shows to reflect this.
- The Deathmatch intermisson couldn't show the ready icon (because it
just used the ingame scoreboard), so a proper intermission was added,
which reflects the same design as the coop scoreboard.
- The colour column wasted more space then it should have needed, so it
was replaced with player colour backgrounds.
- Slight y offset adjustments to make everything fit in 320x200
properly.
2014-06-17 19:46:10 +12:00
Chris Robinson
7ff7c151a8
Merge remote-tracking branch 'origin/master' into openal
...
Conflicts:
src/CMakeLists.txt
2014-06-15 12:04:15 -07:00
Christoph Oelckers
2ad47935ef
Merge branch 'master' into Glew_Version_For_Real
2014-06-01 12:43:17 +02:00
Christoph Oelckers
7fedaf9221
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-01 12:39:13 +02:00
Edward Richardson
e8513a64ed
Rebuild nodes for hellfact map04
2014-06-01 15:32:43 +12:00
Christoph Oelckers
3c5d07e9c6
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-31 11:05:44 +02:00
Christoph Oelckers
8f5683e23d
- moved secret found message to string table and removed the CVAR crutch that dates from a time when modifying string table content wasn't as easy as it is now.
...
- added 'showsecretsector' CVAR to show the sector number with the secret found message.
2014-05-29 17:50:14 +02:00
Christoph Oelckers
39775cc904
- mystery of desaturation shader solved: The old code passed '1-desaturation' to the shader, the new code 'desaturation', so for the 'mix' function to work its arguments must be swapped.
2014-05-21 15:25:25 +02:00
Christoph Oelckers
54425ee2ef
- fixed: Desaturation factor was applied incorrectly.
...
- Also fixed some very strange thing in the shader's desaturate function. For unknown reasons using the 'mix' function there did not work.
- fixed: The fog boundary special shader could not be used.
2014-05-21 13:40:46 +02:00
Christoph Oelckers
6e6be8ed5b
Merge branch 'master' into Glew_Version_For_Real
2014-05-18 12:47:48 +02:00
Christoph Oelckers
4e64ad847b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-15 09:46:47 +02:00
Christoph Oelckers
802a478766
- Heretic doesn't really need dontcrunchcorpses because there was already some alternative handling for that situation.
2014-05-14 14:03:15 +02:00
Christoph Oelckers
51ed68dc72
- forgot to save this...
2014-05-14 13:02:04 +02:00
Christoph Oelckers
388f09f786
- fixed: In Heretic corpses do not get crunched to gibs, they just get their size reduced to 0. Handled by a new gameinfo flag. This also gets set for Chex quest which has the gib sprite replaced by something different. Using a Crush state will override this global flag.
2014-05-14 12:54:03 +02:00
Christoph Oelckers
cf45f2d718
- added missing shader files.
2014-05-12 22:24:26 +02:00
Christoph Oelckers
4d005bdfa0
shader rework
...
All those special shaders have been merged together.
Mostly working but the non-shader lighting seems a bit broken.
2014-05-12 14:45:41 +02:00
Christoph Oelckers
b9a6fe80a4
Do not use the shader to handle STYLEF_RedIsAlpha.
...
Turns out that the name doesn't accurately describe what it does.
It is correct for images that come with their own palette or are true color.
But for images using the game palette it doesn't use the red channel to determine translucency but the palette index! Ugh...
This means it cannot be done with a simple operation in the shader because it won't get a proper source image. The only solution is to create a separate texture.
2014-05-11 23:56:53 +02:00
Christoph Oelckers
7793bbbcc9
Further cleanup of lighting code.
...
- remove thing color from lighting calculations.
- implement alpha textures and inverse sprites for infrared as texture modes. This still requires some handling for the alpha texture mode for non-shader rendering because there is no way in the fixed pipeline to do it. The inverted texture effect can be done with a texture combiner.
- fixed: ThingColor for sprites was set in the wrong place. It must be in the Process function, not in the lighting calculation.
- added functions for isolated calculation of sprites' dynlight color.
2014-05-11 17:56:38 +02:00
Christoph Oelckers
52056a05bd
- changed handling of DynLight in shader to serve as a global dynamic light color for all lighting modes.
2014-05-11 16:49:17 +02:00
Christoph Oelckers
53f4cd0108
- added objectcolor uniform. This will be used to hold the thingcolor for shader based rendering.
2014-05-11 16:06:25 +02:00
Christoph Oelckers
09f4071436
Ok, it had to be done: Removed shader support for pre GLSL 1.3/GL 3.0 hardware. The compromises needed to accomodate these are just too bad and would block any attempt at streamlining the code.
2014-05-11 13:27:51 +02:00
Christoph Oelckers
b09405a8bd
- changed rendering of glowing walls so that it doesn't require an additional vertex attribute, just pass the floor and ceiling planes as uniforms.
2014-05-10 17:09:43 +02:00
Christoph Oelckers
6988156d0f
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-08 09:49:00 +02:00
Christoph Oelckers
63a0e01c6a
Merge branch 'interpview_optin'
2014-05-08 09:17:00 +02:00
Christoph Oelckers
67ebbe3ed4
made some changes to turn the CF_INTERPVIEW flag when changing angles into an op-in feature instead of making it automatic.
2014-05-08 09:15:56 +02:00
Christoph Oelckers
cc4305e86c
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-30 01:29:26 +02:00
Christoph Oelckers
94c4f38c58
- added constants for sound channels 5-7.
2014-04-28 01:26:30 +02:00
Christoph Oelckers
97c7f2c5ce
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-18 12:13:29 +02:00
Christoph Oelckers
7cb828d763
Merge branch 'slowstate' of https://github.com/Gaerzi/zdoom
2014-04-18 09:46:23 +02:00
Gaerzi
60fe07df74
Added slow states to relevant Strife monsters
...
Namely, acolyte, shadow acolyte, reaver, stalker, and turret. Info on
which states needed the slow flag was obtained with Quasar's permission
by looking at G_InitNew() in g_game.c and the info.c state tables from
Chocolate Strife.
Also added fast flag to acolyte states that needed it, based on the same
source.
2014-04-17 17:42:16 +02:00
Christoph Oelckers
29231fa3b7
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-16 11:34:32 +02:00
Gaerzi
94d47efbb5
Added slow monsters to Strife's easiest skill
2014-04-15 21:02:20 +02:00
Christoph Oelckers
745b147d18
- fixed typo in xlat files (they don't use exactly C syntax.)
2014-04-15 16:40:53 +02:00
Christoph Oelckers
dbefac81d8
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-15 09:26:05 +02:00
Gaerzi
580094a792
More editing flags
...
PSX-inspired flags to change the render styles of monsters (and other
things).
2014-04-10 12:32:23 +02:00
Christoph Oelckers
e983649731
Merge branch 'master' of https://github.com/rheit/zdoom
2014-03-31 16:02:43 +02:00
alexey.lysiuk
a97b068ed7
Enable fighting between different types of gargoyles and golems
...
In vanilla Heretic:
- Gargoyles are able to fight with Fire Gargoyles
- Golems are able to fight with Nitro Golems, both regular and ghosted versions
2014-03-30 13:27:27 +03:00
alexey.lysiuk
6a958b032c
Add NOBLOOD flag to Heresiarch actor
...
Heresiarch entity in vanilla Hexen doesn't spawn blood when hit
2014-03-18 12:29:14 +02:00
alexey.lysiuk
3c8e9b6dc0
Fix incorrect Maulotaur melee attack sound
...
It was STFHIT instead of STFPOW
2014-03-16 12:29:04 +02:00
Christoph Oelckers
4a23b97963
Merge branch 'master' of https://github.com/rheit/zdoom
2014-03-01 14:41:00 +01:00
Randy Heit
e7f427aa60
Merge branch 'maint'
2014-02-24 19:26:50 -06:00
Randy Heit
a60918f601
Add NoPushWindowCheck compatibility flag
...
- For maps like xtheateriii that expect non-blocking push lines to
activate when you are standing on them and run into a completely different
line, there is now this compatiblity.txt-only flag.
2014-02-24 17:43:28 -06:00
Christoph Oelckers
2490324652
Merge branch 'master' of https://github.com/Gaerzi/zdoom
2014-02-18 09:59:07 +01:00
Gaerzi
d7478bcd68
New Freedoom names
...
- Added freedoom2.wad as valid alias name (freedoom1.wad already
existed).
- Renamed titles to Freedoom: Phase 1 and Freedoom: Phase 2.
- Reordered to put Phase 1 above Phase 2 in the IWAD picker.
2014-02-18 00:40:14 +01:00
Christoph Oelckers
3e318e4555
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
.gitignore
src/CMakeLists.txt
2014-02-16 21:08:44 +01:00
Braden Obrzut
efa9e0c3ee
Merge branch 'maint'
2014-01-18 18:10:48 -05:00
Braden Obrzut
e5d7077d74
- Fixed: Shareware games couldn't bother with the actor has no frames errors since we don't load mods.
...
- Fixed: Heretic shareware used a different border for the statusbar.
2014-01-18 15:09:12 -05:00
Christoph Oelckers
fd767233aa
- fixed typo: glColor must be gl_Color in shader.
2013-12-08 10:01:03 +01:00
Christoph Oelckers
d46315c44b
- some finetuning of subtractive effect.
2013-12-05 15:39:46 +01:00
Christoph Oelckers
95163e378e
- added a fog layer when drawing sprites with render style reverse subtract.
2013-12-05 15:06:10 +01:00
Christoph Oelckers
3fbcfa7551
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-30 01:34:10 +01:00
Christoph Oelckers
cbed4624fa
- added a user-settable factor for earthquake intensity. Value can be between 0 (no shaking) and 1 (normal shaking.)
2013-11-29 13:24:38 +01:00
Christoph Oelckers
4122e4041a
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-20 09:16:12 +01:00
Randy Heit
fe67ae5e54
Merge branch 'maint'
2013-11-19 21:01:15 -06:00
Randy Heit
62ffe7e4e2
Add NOGRAVITY to every Raven actor with FLOATBOB
...
- Fixed: Heretic and Hexen completely skip all normal Z processing on
mobjs with FLOATBOB set. To emulate that, we need to add NOGRAVITY to
everything with that flag set.
2013-11-19 19:42:13 -06:00
Braden Obrzut
97d7b1e59e
Merge branch 'origin/maint'
...
Conflicts:
src/sound/fmodsound.cpp
2013-10-23 19:39:22 -04:00
Christoph Oelckers
daf5b97ff9
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/version.h
2013-09-28 23:37:41 +02:00
Christoph Oelckers
a144221174
- changed the invisible waiting frame of the ExplosiveBarrel to use TNTA10 instead of the real barrel frame. This is so that sprite checks do not erroneously determine that there's still something to see. GZDoom's dynamic light code has problems with this.
2013-09-20 10:43:10 +02:00
Christoph Oelckers
251cdacf26
Merge branch 'master' into scripting
...
Conflicts:
src/g_shared/a_randomspawner.cpp
src/g_strife/a_strifeweapons.cpp
src/thingdef/thingdef_parse.cpp
wadsrc/static/actors/constants.txt
2013-09-03 09:01:28 +02:00
Christoph Oelckers
4d3f6cae2e
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-27 23:53:40 +02:00
Christoph Oelckers
8e8f6cf5a6
- A_AlertMonsters flags submission by NeuralStunner.
2013-08-20 20:33:03 +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
Christoph Oelckers
42c9b68d47
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-14 00:32:35 +02: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
16f239536a
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-12 21:16:41 +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
9455608e21
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-11 21:05:36 +02:00
Christoph Oelckers
fabf8272e6
Merge branch 'maint'
2013-08-11 21:04:17 +02:00
Christoph Oelckers
c0174ea7cd
- Added A_DropItem for DECORATE.
2013-08-11 20:48:08 +02:00
Christoph Oelckers
752f44502c
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-11 14:49:36 +02:00
Christoph Oelckers
36b487fd78
Merge branch 'maint'
2013-08-11 11:32:44 +02: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
c88bf3108c
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-10 10:21:00 +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
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
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
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
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
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
ef6fca823e
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/version.h
2013-07-30 15:20:38 +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
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
cf31ccbbaf
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-28 18:23:50 +02:00
Christoph Oelckers
c253d40fbb
- externalize labels for automap statistics display to the string table.
2013-07-28 16:18:57 +02:00
Christoph Oelckers
909ec2e35a
Merge branch 'maint' into scripting
2013-07-28 10:47:17 +02:00
Christoph Oelckers
b499742d46
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-25 17:31:27 +02:00
Christoph Oelckers
897a17309b
- added menu option for sprite display on automap.
2013-07-25 17:22:45 +02:00
Christoph Oelckers
cbc0b70e7c
- TransferStencilColor A_SpawnItemEx patch / by Ryan Cordell.
2013-07-24 20:15:17 +02:00
Randy Heit
9c86f1c220
Merge branch 'master' into scripting for plugged userinfo memory leak
...
Conflicts:
src/d_player.h
src/p_interaction.cpp
src/thingdef/thingdef_codeptr.cpp
2013-07-23 21:01:13 -05:00
Christoph Oelckers
ba2faee125
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-22 23:01:58 +02:00
Christoph Oelckers
f3d8790995
Merge branch 'maint' of https://github.com/rheit/zdoom into maint
2013-07-22 22:54:45 +02:00
Christoph Oelckers
83bd8ba1b8
- added NeuralStunner's player.userange submission, but changed it to use the value directly from the PlayerPawn data.
...
- bumped savegame version for addition of APlayerPawn::userange.
2013-07-22 22:37:50 +02:00
Christoph Oelckers
aad509c800
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-14 14:47:12 +02:00
Christoph Oelckers
531da15ac2
Merge branch 'maint'
2013-07-14 14:44:11 +02:00
Christoph Oelckers
10dd75f902
- externalized "New save game" line for save screen.
2013-07-14 09:31:49 +02:00
Christoph Oelckers
453f4ace5c
- added compatibility setting for stuff in Cheogsh2 MAP04's megasphere cage which is positioned too low.
2013-07-14 09:01:00 +02:00
Christoph Oelckers
edd2142a0f
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-02 22:11:55 +02:00
Randy Heit
3d61365879
Merge branch 'maint'
2013-07-02 14:51:49 -05:00
Randy Heit
5af1e6f734
- Added a compatibility option to fix Super Sonic Doom's first bonus
...
stage leaving you frozen when you finished it.
2013-07-02 14:15:08 -05:00
Christoph Oelckers
ddae9757a8
Merge branch 'master' of https://github.com/rheit/zdoom
2013-06-26 09:32:43 +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
f0feee3b4e
Merge branch 'maint'
2013-06-26 01:03:19 +02:00
Christoph Oelckers
fb1734ba50
- fix previous commit and add compat option for Cheogh's blue key.
2013-06-26 00:57:26 +02:00
Christoph Oelckers
4622ab865b
- merged the two blocks for void.wad in compatibility.txt.
2013-06-25 11:55:49 +02:00
Christoph Oelckers
5a24190796
Merge branch 'master' of https://github.com/rheit/zdoom
2013-06-24 02:31:18 +02:00
Christoph Oelckers
e4f78f225c
Merge fix.
2013-06-24 02:26:23 +02:00
Christoph Oelckers
631fd69719
- fixed: GoldWandPuff2 requires the PUFFONACTORS flag.
2013-06-24 02:25:16 +02:00
Christoph Oelckers
5fd3b1cf19
- added _mental_*s compatibility fix for Ultimate Simplicity, map07
2013-06-23 17:38:51 -05:00
Christoph Oelckers
faeba3933e
Merge branch 'master' of https://github.com/rheit/zdoom
2013-06-23 18:52:45 +02:00
Christoph Oelckers
7d56311152
- added Ryan Cordell's A_CheckRange submission.
2013-06-23 18:45:17 +02:00
Christoph Oelckers
5bbb18b6dd
- added _mental_*s compatibility fix for Ultimate Simplicity, map07
2013-06-23 18:39:01 +02:00
Christoph Oelckers
e00847f64b
- GZDoom solution file
...
- missing GL resources for gzdoom.pk3.
2013-06-23 11:13:01 +02:00
Christoph Oelckers
71e65ed116
- GZDoom differences to /wadsrc.
2013-06-23 09:30:04 +02:00
Randy Heit
459ad5abff
- Updated scripting branch to latest version in trunk.
...
SVN r4337 (scripting)
2013-06-07 03:31:30 +00:00
Christoph Oelckers
c4b7335312
- fixed: UDMF's Doom namespace needs to retain Boom's sector special flags.
...
- fixed: UDMF's ZDoomTranslated namespace needs to set the DUMMYSWITCHES flag so that it remains compatible with Doom-format ZDoom maps.
SVN r4325 (trunk)
2013-06-03 07:14:42 +00:00
Randy Heit
2d13a45773
- Added read access to an actor's melee range from DECORATE and ACS, via Blue Shadow.
...
SVN r4305 (trunk)
2013-06-01 02:23:27 +00:00
Christoph Oelckers
dbf68e3f2c
- fixed the Peasants DECORATE definition.
...
SVN r4298 (trunk)
2013-05-30 21:07:29 +00:00
Christoph Oelckers
a7c2346b32
- added a FloatBobPhase property for DECORATE. Now, if FloatBobPhase is anything but -1 it will be used directly as the initial phase, allowing to define actors that bob in sync. The allowed range of phases is 0 - 63. The main reason for this is that each actor spawn called the pr_spawnmobj RNG just to randomize this value which causes problems with non-interactive actors, in particular GZDoom's dynamic lights.
...
SVN r4296 (trunk)
2013-05-30 08:52:29 +00:00
Christoph Oelckers
567fbace22
- re-fixed r4279.
...
SVN r4282 (trunk)
2013-05-25 18:30:23 +00:00
Christoph Oelckers
2767f31a92
- fixed: PillarAlienPower must loop its state.
...
SVN r4279 (trunk)
2013-05-25 16:22:51 +00:00
Braden Obrzut
332e39d6c8
- Fixed: Typo in WaterDropOnFloor actor's active sound.
...
SVN r4276 (trunk)
2013-05-22 21:26:06 +00:00
Braden Obrzut
1d4fbc05a5
- Fixed: glbsp nodes in a wad file inside a pk3 would not be loaded.
...
- Fixed: Typo from r4270.
SVN r4273 (trunk)
2013-05-20 20:39:34 +00:00
Randy Heit
6ada6158ef
- Added a fallback for accented characters to use unaccented ones.
...
- Updated Portuguese strings with the version here: http://forum.zdoom.org/viewtopic.php?p=672839#p672839
SVN r4271 (trunk)
2013-05-17 02:35:35 +00:00
Randy Heit
71f42122bc
- Added a definition for OB_MPMAULER1 and removed the needless reference to OB_MPMAULER2.
...
SVN r4270 (trunk)
2013-05-17 01:22:19 +00:00
Randy Heit
ec7f433da3
- Fixed: Strife line special 200 should also be marked as repeatable.
...
SVN r4269 (trunk)
2013-05-17 01:06:47 +00:00
Randy Heit
4692e3f69c
- Fixed: Strife line special should have been marked repeatable.
...
SVN r4268 (trunk)
2013-05-17 01:02:43 +00:00
Randy Heit
6922049b83
- Redo r4259, because I guess those weren't actually whitespace changes. (Although they looked like it to me.)
...
SVN r4266 (trunk)
2013-05-14 23:34:24 +00:00
Randy Heit
1e32e75eef
- Removed the music strings from the Brazilian Portuguese translations. (And apparently some whitespace changes too?)
...
SVN r4260 (trunk)
2013-05-12 18:43:28 +00:00
Randy Heit
cb7bc7e66c
- Fixed: TAG_MINEKEY still contained the underscore character.
...
SVN r4259 (trunk)
2013-05-12 18:41:44 +00:00
Randy Heit
404df07629
- Fixed: The Ironlich lost its Pain state when it was converted to DECORATE.
...
SVN r4252 (trunk)
2013-05-07 01:57:05 +00:00
Randy Heit
8830d3a07a
- Fixed: Ever since r1078, D'Sparil has been too quiet.
...
SVN r4249 (trunk)
2013-05-04 19:46:38 +00:00
Randy Heit
e9cd2777f3
- Fixed: r4226 had bad copy-paste angles for Demon2's XDeath.
...
SVN r4241 (trunk)
2013-04-30 04:49:24 +00:00
Randy Heit
77b57e2f98
- Fixed: Hexen's A_DemonDeath and A_Demon2Death had been converted to incorrect generic Decorate.
...
SVN r4226 (trunk)
2013-04-28 01:58:51 +00:00
Christoph Oelckers
9f71c7cb4e
- added Xaser's reactiontime for ACS and DECORATE expression patch.
...
SVN r4222 (trunk)
2013-04-20 21:32:03 +00:00
Randy Heit
d99517292b
- Added DONTGIB flag to Key, so key-dropping enemies can be used reliably near crushers.
...
SVN r4218 (trunk)
2013-04-16 20:26:35 +00:00
Christoph Oelckers
0d89183aa7
- ignoreteleporttags compatibility setting for a few maps.
...
SVN r4208 (trunk)
2013-04-02 19:11:50 +00:00
Randy Heit
147da94e2f
- Added FDARI's CLOFF_JUMP_ON_MISS and CLOFF_AIM_VERT_NOOFFSET flags.
...
SVN r4207 (trunk)
2013-03-28 01:29:23 +00:00
Randy Heit
f9915d7cf2
- Added FDARI's A_CheckLOF, modified to use a Trace callback function.
...
SVN r4201 (trunk)
2013-03-23 02:55:59 +00:00
Randy Heit
c54ea7f6b7
- Added SXF_TRANSFERSPECIAL and SXF_CLEARCALLERSPECIAL flags for A_SpawnItemEx.
...
SVN r4199 (trunk)
2013-03-23 01:22:37 +00:00
Randy Heit
53e73783e0
- Added spawnofs_z parameter to A_RailAttack and A_CustomRailgun.
...
SVN r4191 (trunk)
2013-03-20 03:36:45 +00:00
Randy Heit
277d59b2bb
- Added flags SXF_CLEARCALLERTID, SXF_MULTIPLYSPEED, and SXF_TRANSFERSCALE for A_SpawnItemEx.
...
SVN r4188 (trunk)
2013-03-20 03:07:45 +00:00
Christoph Oelckers
b0203c9f1d
- added Xaser's SXF_USEBLOODCOLOR for A_SpawnItemEx submission
...
SVN r4181 (trunk)
2013-03-13 11:27:30 +00:00
Randy Heit
8410ac760a
- Added A_SetDamageType.
...
SVN r4180 (trunk)
2013-03-13 04:04:48 +00:00
Christoph Oelckers
33f363f4c6
- added TheFortuneTeller's NORANDOMPUFFZ submission.
...
SVN r4170 (trunk)
2013-02-27 10:35:44 +00:00
Christoph Oelckers
81785124c5
- fixed: the ExplosiveBarrel's height was wrong.
...
SVN r4161 (trunk)
2013-02-22 21:18:29 +00:00
Christoph Oelckers
071002c02b
- add weapon slots to key configuration menu.
...
SVN r4154 (trunk)
2013-02-20 12:22:04 +00:00
Randy Heit
2e7ef2e019
- Added Brazilian Portuguese translation.
...
SVN r4149 (trunk)
2013-02-19 02:59:40 +00:00
Randy Heit
f5891dea25
- Added time display for alt hud.
...
SVN r4148 (trunk)
2013-02-19 02:58:03 +00:00
Randy Heit
bd601a1bc8
- Added NOTRAIL flag for PowerSpeed.
...
SVN r4146 (trunk)
2013-02-19 02:44:49 +00:00
Christoph Oelckers
027a99d772
- fixed: Hexen's Floor_RaiseAndCrush is not the same action as the one used by Doom and which was used by ZDoom before r4053. Restored the old code and gave it a new special 99:Floor_RaiseAndCrushDoom.
...
SVN r4125 (trunk)
2013-02-10 08:53:03 +00:00
Randy Heit
9af00a22d3
- Fixed: Strife's slow Ceiling_CrushAndRaise lines do no actual damage.
...
SVN r4124 (trunk)
2013-02-10 00:33:22 +00:00
Randy Heit
24edfd5c86
- Fixed translations of Heretic linetype's that perform Floor_LowerToHighest with an offset.
...
SVN r4123 (trunk)
2013-02-10 00:26:47 +00:00
Randy Heit
65d2d0a5e5
- Added compatibility option for Claustrophobia 1024, map 01.
...
SVN r4122 (trunk)
2013-02-09 23:18:34 +00:00
Randy Heit
afabf7e018
- Force node building for garrison.wad from The Master Levels so that the teleporter to the
...
red key won't leave you in the ground.
SVN r4071 (trunk)
2013-02-07 21:32:06 +00:00
Randy Heit
87b8b6201c
- Added WRF_DISABLESWITCH flag for A_WeaponReady to indicate that any attempts to switch the weapon
...
should be discarded.
SVN r4062 (trunk)
2013-02-05 02:27:35 +00:00
Randy Heit
5b97bf47de
- Fixed: The string displayed when attempting to start a new game during a netgame is "NEWGAME", not "NETGAME".
...
SVN r4051 (trunk)
2013-01-26 03:39:43 +00:00
Randy Heit
931357358d
- Reorder the althud level time map entries to match their displayed order.
...
SVN r4048 (trunk)
2013-01-26 03:19:27 +00:00
Christoph Oelckers
6a1f28e400
- fixed some issues in the alternate HUD menu.
...
SVN r4046 (trunk)
2013-01-25 14:50:09 +00:00
Randy Heit
9b5232a410
- Fixed: The health bonuses atop the pillars in the starting room of Void could not be picked
...
up because they no longer physically clip through the floor.
SVN r4038 (trunk)
2013-01-23 04:48:33 +00:00
Randy Heit
7291a56335
- Shorten text of the longest lines in the gameplay options menu.
...
SVN r4035 (trunk)
2013-01-23 03:54:14 +00:00
Randy Heit
5f4bcaac3d
- Added A_UnSetInvulnerable() to the FireDemon (aka Afrit)'s Pain state, in case it gets pained
...
before entering its Chase state.
SVN r4033 (trunk)
2013-01-23 03:38:13 +00:00
Randy Heit
5cbdc3382d
- Slow down the scripted marines' rocket attack and speed up the plasma attack to better reflect
...
the speeds of the equivalent player weapons.
SVN r4023 (trunk)
2013-01-06 04:32:27 +00:00
Randy Heit
7f74d28638
- Do not use the muzzle flash player sprites for the scripted marines' melee attacks.
...
SVN r4022 (trunk)
2013-01-06 04:20:37 +00:00
Randy Heit
7fb0d37d99
- Added a flag to A_M_Refire to ignore the actor's missile state, so the rocket marine will
...
not continue to punch air if it starts attacking while its target is in melee range and
then moves out of it.
SVN r4021 (trunk)
2013-01-06 04:15:28 +00:00
Randy Heit
0d47c6cbc8
- Added bright flags to the scripted marines' BFG and railgun attacks.
...
SVN r4020 (trunk)
2013-01-06 04:06:19 +00:00
Randy Heit
dfe470e5f2
- Added JLOSF_NOAUTOAIM flag for when you want to use A_JumpIfTargetInLOS in conjunction with
...
something that never autoaims, such as a railgun.
- Fixed: A_JumpIfTargetInLOS should use P_AimLineAttack() instead of P_BulletSlope(), because the
latter intentionally checks to the sides of the aimed line.
SVN r4007 (trunk)
2013-01-02 03:17:52 +00:00
Christoph Oelckers
b3ada01bbd
- Added Gez's patch to show the berserk icon on the alt. HUD and added a menu option for this setting.
...
SVN r4002 (trunk)
2012-12-22 22:37:58 +00:00
Randy Heit
92a07ab8b4
- Fixed: The Fist had the wrong Tag string.
...
SVN r3996 (trunk)
2012-12-22 00:21:18 +00:00
Christoph Oelckers
7aa4c55bfc
- added Gez's patch to fix map checksum calculation.
...
SVN r3970 (trunk)
2012-11-19 00:43:45 +00:00
Randy Heit
5627a7ebd7
- Added the Java OPL3 emulator to the menu.
...
- Added full panning support to the Java OPL3 emulator.
SVN r3969 (trunk)
2012-11-17 05:26:03 +00:00
Randy Heit
3f02444ffe
- Fixed: ArtiTeleport was missing its SpawnID.
...
SVN r3966 (trunk)
2012-11-13 04:59:38 +00:00
Randy Heit
b0e70f8f87
- Added compatibility kludge for Khorus map08.
...
SVN r3965 (trunk)
2012-11-13 04:55:03 +00:00
Randy Heit
2ce1debe8d
- Added FDARI's get actor height and radius patch.
...
SVN r3955 (trunk)
2012-11-09 23:06:40 +00:00
Randy Heit
6c64f19a7e
- Enable Doom 1.1 status bar support.
...
SVN r3954 (trunk)
2012-11-09 23:03:53 +00:00
Randy Heit
68b3c4860f
- Remove redundant redundancy in the PigPlayer definition.
...
SVN r3950 (trunk)
2012-11-09 05:02:05 +00:00
Randy Heit
3ec387ac32
- Renamed opl_stereo to opl_fullpan, since DOSBox's core is emulating an OPL3, which is stereo
...
but only supports three pan positions and not the full 127 MIDI pan positions.
- Added opl_core cvar to select emulator core. 0 is MAME and 1 is DOSBox.
- Added DOSBox's LGPL OPL core, distantly related to one adlibemu.c written by Ken Silverman
(not to be confused with the ancient MAME-derived and GPL-licensed core also found in DOSBox).
I believe this corresponds to their "compat" emulator, but I'm not sure.
SVN r3946 (trunk)
2012-11-08 05:45:58 +00:00
Randy Heit
12ee3271c4
- Replaced the opl_onechip cvar with opl_numchips. You can now emulate up to 8 of them for MIDI
...
playback. (Raw OPL playback will still clamp it to 2, since there's no use for more than that
with any of the raw OPL formats.)
SVN r3945 (trunk)
2012-11-06 06:10:04 +00:00
Randy Heit
3b0ad55285
- Since our OPL chips are emulated, we can give them a feature that real OPL2 chips lacked:
...
Full stereo panning for the MIDI player. (The raw OPL players are unaffected.) To get the
mono output back, you can set opl_stereo to false.
- Changed SoftSynthMIDIDevice::OpenStream() to allocate the same number of samples for stereo
and mono streams.
SVN r3929 (trunk)
2012-11-02 03:25:50 +00:00
Randy Heit
bfae51ed2e
- Added Gez's BFG edition patch.
...
SVN r3926 (trunk)
2012-11-01 02:42:14 +00:00
Randy Heit
6e88529324
- Added a RETI instruction for returning 15-bit signed immediate values.
...
- Changed Actor's Damage property into an actual function. All access to the damage property
must now be done through GetMissileDamage. actor->GetMissileDamage(0, 1) is equivalent
to the former actor->Damage, for the case where actor->Damage was not an expression. (I
suppose I will probably need to make a thunk for DECORATE expressions that want to read it.)
- Cleaned up some decorate expression evaluation functions that are no longer used.
SVN r3919 (scripting)
2012-10-28 04:36:52 +00:00
Randy Heit
5e184260ac
- Fixed: FastProjectile's missile height needs to be initialized to 0.
...
SVN r3918 (scripting)
2012-10-28 01:26:10 +00:00
Randy Heit
38d7b7d203
- Fixed errors and warnings when compiling with GCC. (Unfortunately, the VC++ debug builds
...
become ungodly slow when using mods with complex DECORATE. The GCC debug builds run just
fine, however. Hopefully this is something that can be fixed later with an assembly-optimized
version of the main VM loop, because I don't relish the thought of being stuck with GDB
for debugging.)
- Fixed: The ACS_Named* action specials were erroneously defined as taking strings instead of
names.
- Fixed: Copy-paste error caused FxMultiNameState::Emit to generate code that called
DecoNameToClass instead of DecoFindMultiNameState.
- Updated FxActionSpecialCall::Emit for named script specials.
- Fixed inverted asserts for FxMinusSign::Emit and FxUnaryNotBitwise::Emit.
SVN r3893 (scripting)
2012-10-18 03:19:27 +00:00
Randy Heit
e7efa1d802
- Update to latest version in trunk.
...
SVN r3890 (scripting)
2012-10-17 04:24:54 +00:00
Randy Heit
1e234c9853
- Disable the teleports on lines 1107 and 1108 of nukemine.wad E1M2 so that the map is completable.
...
SVN r3871 (trunk)
2012-09-14 03:02:51 +00:00
Randy Heit
077feefb0b
- Fixed one small copy-paste error in decaldef.txt for SnakeScorch22.
...
SVN r3870 (trunk)
2012-09-11 01:42:01 +00:00
Randy Heit
9f3a93bfd2
- Added compatibility setting for Community Chest 3, map03.
...
SVN r3867 (trunk)
2012-09-09 02:58:37 +00:00
Randy Heit
a33b2fe2d5
- Daedalus maps 31 and 32 don't need compatibility settings.
...
SVN r3865 (trunk)
2012-09-09 01:50:45 +00:00
Randy Heit
7a99d28e8c
- Added compatibility entries for Daedalus to fix SPAC_Push-triggered lines that aren't actually pushable.
...
SVN r3864 (trunk)
2012-09-08 03:41:31 +00:00
Randy Heit
a77705e04e
- Added A_JumpIfTargetOutsideMeleeRange and A_JumpIfTargetInsideMeleeRange because I thought
...
I could be clever and have the beggar chase after you some after you attack him, with a
random chance to cease pursuit. However, that didn't look much different from his normal
wandering animation, and he usually gave up before getting anywhere near you, so it was
kind of pointless. I kept the action functions around anyway, since they're simple things that
somebody else might find useful.
- Added a melee range check to A_SentinelRefire for actors without missile states. This fixes
Strife's Beggar trying to attack you when you're nowhere near him.
SVN r3863 (trunk)
2012-09-06 03:36:25 +00:00
Randy Heit
6a91335841
- Turned A_Explode's affectsource parameter into a flags parameter and added XF_NOTMISSILE
...
and RTF_NOTMISSILE so that you can use A_Explode and A_RadiusThrust with non-missiles without
them telling P_RadiusAttack() that the target is the source.
SVN r3860 (trunk)
2012-08-30 04:01:50 +00:00
Randy Heit
a94cf9d548
- Added A_SetTics.
...
SVN r3851 (trunk)
2012-08-24 21:02:49 +00:00
Randy Heit
6645121519
- Changed the gamma slider in the menu to bottom out at 0.75 instead of 1.0 and to move in
...
increments of 0.05 instead of 0.1.
SVN r3848 (trunk)
2012-08-23 01:10:28 +00:00
Randy Heit
bc30b1a806
- Exported the scoreboard text to LANGUAGE.
...
SVN r3834 (trunk)
2012-08-22 21:53:44 +00:00
Randy Heit
a505352da3
- Added noclip2 cheat. This is similar to noclip, except it also adds nogravity and the ability to fly through 3D floors.
...
SVN r3832 (trunk)
2012-08-22 21:31:48 +00:00
Randy Heit
100391507e
- Added two new PlayerPawn properties:
...
* GruntSpeed: The minimum speed a player must be falling at the time of landing to play *grunt.
* FallingScreamSpeed: When a player is falling within this range of speeds, they will play *falling.
SVN r3829 (trunk)
2012-08-14 03:24:59 +00:00
Randy Heit
d993143126
- Remove LabelOffset from menudef.txt.
...
SVN r3787 (trunk)
2012-07-26 05:36:43 +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
86a7a3249f
- Added compatibility options for Requiem map04 and Hell Revealed map19.
...
SVN r3761 (trunk)
2012-07-15 01:46:47 +00:00
Randy Heit
562cf04db2
- Update scripting branch to trunk.
...
SVN r3758 (scripting)
2012-07-14 03:04:41 +00:00
Randy Heit
9b041cb431
- What I didn't have this saved? ugh
...
SVN r3742 (trunk)
2012-07-06 03:15:40 +00:00
Randy Heit
df6f494329
- Added Hacx 2.0 detection.
...
SVN r3736 (trunk)
2012-07-06 02:06:51 +00:00
Randy Heit
93a480f52f
- Added hud_scale and hud_althudscale to the menus.
...
SVN r3719 (trunk)
2012-06-30 01:18:26 +00:00
Christoph Oelckers
006a0b1641
- fixed the Programmer's last state's sprite frame (was Y, should be X.
...
SVN r3715 (trunk)
2012-06-28 23:11:32 +00:00
Randy Heit
70c11f7568
- Added RGF_CENTERZ to spawn a rail from the actor's center instead of offsetting it upward.
...
- Merged all the multiple bool parameters to the railgun functions into a single flags parameter.
SVN r3706 (trunk)
2012-06-22 03:56:08 +00:00
Christoph Oelckers
37d9519673
- added Xaser's submission for no impact damage from blasting.
...
SVN r3693 (trunk)
2012-06-16 09:01:05 +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
Randy Heit
44932a6c56
- Added OB_MPDEFAULT string for being killed by a player for an unknown reason. This can be
...
overridden in custom player classes by changing their Obituary property to something else.
- ClientObituary() now only looks up the obituary message from the killing player's weapon if the
damage type was 'Melee' or 'Hitscan'.
- Gave P_GunShot() and A_FireBullets the new damage type 'Hitscan'.
- Switched A_Saw and A_CustomPunch to the 'Melee' damage type.
SVN r3646 (trunk)
2012-05-13 01:06:28 +00:00
Christoph Oelckers
af43ef8983
- added Gez's submission to add a compatibility option for Doom's floor motion behavior to fix an issue in phobos.wad.
...
SVN r3623 (trunk)
2012-05-05 22:53:16 +00:00
Christoph Oelckers
cbcc7443c6
- added Xaser's bobbing style options submission.
...
SVN r3615 (trunk)
2012-05-02 20:58:29 +00:00
Christoph Oelckers
5dbf486806
- added menu entries for HUD flash options.
...
SVN r3614 (trunk)
2012-05-01 18:20:04 +00:00
Christoph Oelckers
8b875bc32a
- added Italian translation to OB_VOODOO (thanks to Edward-san)
...
SVN r3584 (trunk)
2012-04-22 07:37:38 +00:00
Christoph Oelckers
b8604e4bcd
- added some accented characters to the small Doom font. (thanks to hfc2x)
...
SVN r3583 (trunk)
2012-04-22 07:35:53 +00:00
Randy Heit
a157e587b5
- 私は英語が悪い。
...
SVN r3575 (trunk)
2012-04-22 02:00:34 +00:00
Randy Heit
b94607dc7e
- Being killed by a voodoo doll now has its own obituary, rather than trying to come up with one
...
by treating it as a real player.
SVN r3574 (trunk)
2012-04-19 04:03:42 +00:00
Christoph Oelckers
52bb3a4dbe
- fixed: Boom's generalized doors are not retriggerable, even if they are not remote. (Patch by Gez)
...
SVN r3555 (trunk)
2012-04-12 12:42:00 +00:00
Christoph Oelckers
26dbec2aae
- added FDARI*s damagetype fix
...
SVN r3533 (trunk)
2012-04-07 15:29:47 +00:00
Christoph Oelckers
4637ed53fa
- added Thomas's patch to add a Pufftype parameter to A_Explode.
...
SVN r3532 (trunk)
2012-04-07 13:17:38 +00:00
Christoph Oelckers
235a09d92a
- Added Xaser's weapon patch to check +reload and +zoom in A_WeaponReady.
...
SVN r3530 (trunk)
2012-04-07 13:07:25 +00:00
Christoph Oelckers
34820aacd2
- added Xaser's modified version of kgsws's railgun enhancements patch.
...
SVN r3529 (trunk)
2012-04-07 12:57:44 +00:00
Christoph Oelckers
3aa759714a
- added DavidPH's A_FaceTarget with pitch submission.
...
SVN r3528 (trunk)
2012-04-07 12:48:56 +00:00
Christoph Oelckers
c3638eb338
- added FDARI's submission for A_CustomMissile options.
...
SVN r3526 (trunk)
2012-04-07 12:36:39 +00:00
Christoph Oelckers
64f14f8d18
- changed Hacx and Harmony configs to use the arrow cursor as default instead of Doom's bunny.
...
SVN r3505 (trunk)
2012-04-01 10:49:40 +00:00
Randy Heit
89790ac313
- Add DMXGUS parsing, thanks to Gez.
...
SVN r3494 (trunk)
2012-03-30 05:23:18 +00:00
Randy Heit
cfb9329c7f
- Add Gez's A_RadiusGive.
...
SVN r3493 (trunk)
2012-03-30 04:28:10 +00:00
Randy Heit
60e0eca047
- Add compatibility settings for Reverie map18 and Artica 3.
...
SVN r3489 (trunk)
2012-03-29 04:40:41 +00:00
Randy Heit
23e88c88c9
- Add 17:10 aspect ratio, for 1024x600 screens.
...
SVN r3482 (trunk)
2012-03-25 02:57:28 +00:00
Randy Heit
49aaf9b451
- Added A_ClearLastHeard action function.
...
SVN r3464 (trunk)
2012-03-22 21:40:26 +00:00
Randy Heit
849d6724d8
- Moved "Go away!" text into language.enu.
...
SVN r3449 (trunk)
2012-03-17 01:27:12 +00:00
Randy Heit
07118147d8
- Revised the fix from r3442: Make the line a nonrepeatable Door_Open instead of completely
...
clearing the line's special.
SVN r3447 (trunk)
2012-03-16 23:42:11 +00:00
Randy Heit
73a78caa5c
- Added support for a few extra color ranges to Player.Colorset so that the Strife player's
...
predefined colors can properly define the standard Strife translation ranges.
SVN r3446 (trunk)
2012-03-16 02:23:31 +00:00
Randy Heit
9f168e29e2
- Added clearlinespecial, for doom.wad e3m4 line 1069.
...
- Allow using the parameterized compatibility options with IWAD maps.
SVN r3442 (trunk)
2012-03-15 23:41:44 +00:00
Randy Heit
6290ea4fcb
- Added setactivation command for compatibility.cpp to fix the gear boxes on hexdd.wad, map54,
...
which should be set for player uses activation but are not.
- Added some developer mode messages for setlinespecial and clearlinespecial.
SVN r3437 (trunk)
2012-03-15 20:33:33 +00:00
Christoph Oelckers
e4880d162f
- added Xaser's submission for accessing accuracy and stamina from DECORATE and ACS.
...
- added DECORATE properties for accuracy and stamina.
- Since these changes move properties from player_t to AActor all savegame compatibility code was removed and the min. savegame version bumped.
SVN r3427 (trunk)
2012-03-11 09:08:35 +00:00
Randy Heit
859512bf77
- Added gather2.wad's map05 and darkside.wad's map01 (which are actually the same map) to
...
compatibility.txt for Arch-Vile ghost resurrection.
SVN r3421 (trunk)
2012-03-10 02:09:04 +00:00
Randy Heit
e9f832460b
- Added "misc/startupdone" sound to be played when the startup screen is closed and the game
...
is about to begin.
SVN r3420 (trunk)
2012-03-10 01:54:00 +00:00
Randy Heit
514f29a34a
- Added Gez's custom flechettes patch, with ArtiPoisonBag4 renamed to ArtiPoisonBagGiver and
...
ArtiPoisonBag5 renamed to ArtiPoisonBagShooter.
SVN r3379 (trunk)
2012-02-21 20:58:33 +00:00
Randy Heit
91ba2ec404
- Fix strife linetype 11 again, courtesy of Gez.
...
SVN r3376 (trunk)
2012-02-21 19:56:25 +00:00
Randy Heit
7561beb212
- Added action functions that work with script names instead of script numbers. They are
...
named the same as their ACS function equivalents. e.g. From DECORATE, you can now use
ACS_NamedExecuteAlways to run a script with a name.
SVN r3364 (trunk)
2012-02-16 21:49:09 +00:00
Braden Obrzut
da974c3444
- Allow any parameterized SBarInfo value to use parentheses to help make the syntax a little more consistent.
...
SVN r3361 (trunk)
2012-02-16 05:01:17 +00:00
Randy Heit
5a95c997d1
- Added keys on the automap for Heretic in easy mode, courtesy of Gez.
...
SVN r3356 (trunk)
2012-02-12 02:45:48 +00:00
Randy Heit
68fbd75897
- Fixed compilation with FMOD 4.38+. The removal of hardware voices and EAX was a fairly
...
major change, so I'm making no provisions for using older FMOD DLLs when compiled with the
4.38 API. However, sound positioning is still broken like in 4.28, so you are recommended
to continue building with 4.26. Also, the Freeverb-based DSP unit is no longer present in
FMOD, so the underwater effect is currently unavailable when using 4.38 until I can figure
out how to make it work with the SFX Reverb unit instead. (And on that topic, the Freeverb
DSP was officially only for stereo outputs, so I really shouldn't have been using it in the
first place.)
- Since I would like to eventually figure out the sound positioning issues with the newer
FMODs, the following have been added:
* snd_drawoutput now labels its outputs with the speakers they represent.
* DCanvas::DrawTextA was added as an alias for DrawText, since the Windows headers #define
DrawText to a Unicode/non-Unicode variant.
* The loopsound console command was added to spawn an actor at the player's location and
have it loop a sound infinitely.
Hopefully I can figure it out. FMOD's 3D example works, so I assume the problem lies with
my code, though I don't really know where to begin looking for the problem.
SVN r3350 (trunk)
2012-02-10 00:53:50 +00:00
Christoph Oelckers
5d7ee4dbfd
- fixed: Line type 49 was wrong for all games. Fixed by adding a new Ceiling_CrushAndRaiseDist special. (thanks to Gez for the patch)
...
SVN r3348 (trunk)
2012-02-09 19:59:32 +00:00
Christoph Oelckers
893455ef61
- sync source with latest GZDoom:
...
Includes:
- Made the move tried from checking missile spawns ignore drop off height. This solves the Voodoo Gun ghostly civilian issue.
- Fixed: the NOTELEPORT flag is removed from Dehacked missiles which lose the MISSILE flag. This caused problems with certain special effects based on dehacked spawn cubes.
- Fixed: all Boom silent teleporters preserve relative height.
- support for palette independent particle colors if the renderer can handle them.
SVN r3329 (trunk)
2011-12-06 08:36:28 +00:00
Randy Heit
b41dbf8a52
- A_SetPitch now clamps the player's pitch within the valid range. It can
...
be made to clamp other actors' pitches to within the range (-90,+90)
degrees with the SPF_FORCECLAMP flag.
- Transmit the local viewpitch limits to the other players.
SVN r3323 (trunk)
2011-12-06 01:25:37 +00:00
Randy Heit
7d502e7789
- Added SMF_CURSPEED flag for A_SeekerMissile to cause it to use the missile's current speed rather than its Speed property.
...
SVN r3318 (trunk)
2011-11-24 04:27:47 +00:00
Randy Heit
4d46655de6
- Fix: Use correct pickup flash color.
...
SVN r3316 (trunk)
2011-11-17 02:33:26 +00:00
Randy Heit
4816b3182b
- Add compat_badangles to the menu.
...
SVN r3309 (trunk)
2011-11-02 02:44:01 +00:00
Randy Heit
de956a9ab6
- Added a fourth paremeter to Floor_LowerToHighest. Set it to 1 to always apply
...
the offset to the target height. (This is Heretic's behavior.)
SVN r3304 (trunk)
2011-10-27 01:35:30 +00:00
Randy Heit
3d214602c4
- Fixed: Strife line type 11 has the same Teleport_NewMap/Exit_Normal semantics
...
as line type 52.
SVN r3303 (trunk)
2011-10-27 01:05:59 +00:00
Christoph Oelckers
46cedffafb
Fixed floor crushers in Strife.
...
SVN r3302 (trunk)
2011-10-23 10:01:59 +00:00
Randy Heit
f51f4866e4
- Fix mapcolor for Strife's passcard.
...
SVN r3299 (trunk)
2011-10-03 00:38:20 +00:00
Christoph Oelckers
3c47a30249
- added Gez's submission for inventory restrictions but changed the added checks to be in the main CallTryPickup function.
...
SVN r3296 (trunk)
2011-09-23 08:23:51 +00:00
Braden Obrzut
eafb9da2c1
- Backported GZDoom r1246:
...
* Fixed possible crash when texture for menu item patch cannot be loaded. (From Alexey's Mac OS X port.)
* Fixed iwadinfo.txt definitions of Hexen and Freedoom demos (also from Alexey's port.)
* Added missing LOF_NOJUMP definition.
SVN r3284 (trunk)
2011-08-23 02:39:20 +00:00
Braden Obrzut
c12b04c130
- Fixed: autosave count has a maximum of 20 not 32.
...
SVN r3282 (trunk)
2011-08-18 21:40:03 +00:00
Braden Obrzut
f6ddad95b7
- Set the CMAKE_MODULE_DIR so that we can use find_package instead of include for FluidSynth.
...
- Fixed: FadeTo() accepted parameters out of range.
- Fixed: "Enable autosaves" menu option didn't handle all possible values of disableautosave.
SVN r3280 (trunk)
2011-08-16 21:59:35 +00:00
Braden Obrzut
f42358ad08
- Backported FMOD Ex 4.34 fixes from gzdoom-macosx. (With changes to continue to allow compilation with 4.22-4.28.)
...
SVN r3278 (trunk)
2011-08-13 21:11:09 +00:00
Christoph Oelckers
f84368677a
- updated OpenAL branch.
...
SVN r3269 (openal)
2011-07-08 22:00:23 +00:00
Christoph Oelckers
ba661308d4
- added GZDoom's option not to count monsters in E1M8-style end of level sectors, but controlled by a dmflag.
...
SVN r3267 (trunk)
2011-07-07 21:55:55 +00:00
Christoph Oelckers
24593fe008
- added FDARI's A_Warp submission.
...
SVN r3238 (trunk)
2011-06-14 22:45:42 +00:00
Christoph Oelckers
4d7fcbf1b8
- added Major Cooke's Death/Paintype submission.
...
SVN r3237 (trunk)
2011-06-13 17:15:09 +00:00
Christoph Oelckers
6ba0689b8d
- added DavidPH's A_AlertMonsters range submission.
...
SVN r3233 (trunk)
2011-06-13 10:30:30 +00:00
Christoph Oelckers
f69181f851
- added FDARI's latest actor pointer submission.
...
SVN r3222 (trunk)
2011-06-07 23:05:24 +00:00
Christoph Oelckers
5df9af462a
- added DavidPH's A_PainAttack extension submission.
...
SVN r3219 (trunk)
2011-06-06 13:23:28 +00:00
Christoph Oelckers
60a411c9ad
- added A_GunFlash extension submission.
...
SVN r3217 (trunk)
2011-05-26 23:29:36 +00:00
Randy Heit
59b6c5ef5c
- Removed a couple warnings about implicit vector truncation reported by fxc. (Apparently, it
...
also decided to compile some other shaders slightly differently, too.)
- Fixed: The InGameColormap had been designed without taking alpha into consideration.
As the least likely parameter to be used, desaturation has been moved into a constant
register to make room for the alpha parameter to live in the vertex's color value.
SVN r3208 (trunk)
2011-05-15 22:30:20 +00:00
Randy Heit
68e34e1e5c
- Fixed: Wrong speed for Boom line type 175.
...
SVN r3206 (trunk)
2011-05-15 19:28:17 +00:00
Randy Heit
29e486495b
- Fixed: The sign in Eternall.wad, map25 on line 2236 rendered at the wrong height because Doom
...
ignored the Y locations of patches drawn on two-sided midtextures and always drew them at the
top of the texture. Added a compatibility flag.
SVN r3205 (trunk)
2011-05-13 03:29:48 +00:00
Randy Heit
381fb8d304
- Added optional fullthrustdistance to A_RadiusThrust to specify the distance at which thrust
...
starts diminishing.
SVN r3202 (trunk)
2011-05-11 04:31:31 +00:00