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
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
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
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