zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-08 05:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
4364 commits 131 branches 149 tags 198 MiB
Commit graph

3935 commits

Author SHA1 Message Date
Christoph Oelckers
09e0758507 Merge branch 'fix_cmake_unix' of https://github.com/alexey-lysiuk/gzdoom 2014-10-21 14:27:37 +02:00
Christoph Oelckers
20b740d5fc Merge branch 'DBot' of https://github.com/ChillyDoom/zdoom 2014-10-21 14:20:01 +02:00
Edward Richardson
ed51083572 Change u_short as well. 2014-10-21 23:44:14 +13:00
Edward Richardson
759f1bb81b Fix handshakes between GCC and MSVC 
u_long has two different sizes between Linux GCC and MSVC
Stopped netgames from starting up if player count wont fit
 2014-10-21 23:38:45 +13:00
John Palomo Jr
82255c4dfd Using PickActor will only set the TID if the picked actor doesn't have a TID already. An optional 8th parameter (bool forceTID) was added to revert to the old behavior. 2014-10-19 20:52:48 -04:00
alexey.lysiuk
1715b25a3e Fixed Unknown CMake command "CHECK_LIBRARY_EXISTS" error on Unix targets 
Previously it worked somehow but not with CMake 3.0.2
 2014-10-18 12:33:39 +03:00
ChillyDoom
c400dcf736 - Made DBot inherit from DObject. 2014-10-15 17:54:12 +01:00
ChillyDoom
db323643f8 - Renamed FBot to DBot and made it inherit from DThinker. 
- Fixed: Bots added by players other than the net arbitrator did not have their skill set.
 2014-10-14 19:57:11 +01:00
Christoph Oelckers
c9252d1919 Merge branch 'multi' of https://github.com/Edward850/zdoom 2014-10-14 11:54:40 +02:00
Edward Richardson
29cf6b0daa Fixed PredictionActor size and typo 2014-10-14 12:54:03 +13:00
ChillyDoom
83d84eaae9 - Moved bot related variables from player_t into a new FBot class. 2014-10-13 18:40:25 +01:00
Christoph Oelckers
952d03da7c Merge branch 'multi' of https://github.com/Edward850/zdoom 2014-10-13 10:37:51 +02:00
ChillyDoom
5de6b535ae - Removed unnecessary 'id' variable from AActor. 
- Removed unused 'backpack' variable from player_t.
- Removed duplicate code from b_move.cpp.
- General cleanup.
 2014-10-13 08:45:36 +01:00
Edward Richardson
0cd736b487 Prevent lerping when tic duplication not 1 
Network dup makes player prediction inaccurate
 2014-10-13 17:09:29 +13:00
Edward Richardson
3e4446e46b Moved prediction lerp reset to cover all cases. 2014-10-13 16:49:53 +13: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
Christoph Oelckers
e6f3007bef Merge branch 'scoreboardtoggle' of https://github.com/ChillyDoom/zdoom 2014-10-12 08:27:35 +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
MajorCooke
47029a3efc DoKill bug 
-Fixed: DoKill did not target 'killtarget' for missiles, causing crashes and making the function not work properly.
 2014-10-07 11:33:08 -05:00
Christoph Oelckers
3eaebabdf1 - fixed: EV_Teleport must not access the thing's player pointer before ensuring that 'thing' is a valid pointer. 2014-10-06 17:40:02 +02:00
Edward Richardson
e1b8b4a871 Started work on prediction lerping 2014-10-06 15:27:13 +13:00
Edward Richardson
7175374350 Keep gateway sockets open during handshake 2014-10-05 19:46:34 +13:00
Edward Richardson
c9d603d1c3 Unreliable isn't exactly the problem 2014-10-05 18:52:56 +13:00
Edward Richardson
0c1fde81ad Remove PacketServer auto select 
PacketServer has the tendency to amplify netgame latency times, so it
really shouldn't be auto selected.
Added a notice in case it's used.
 2014-10-05 18:32:32 +13:00
Edward Richardson
ae71f94ed2 Remove disconnecting players safely 
Players who were disconnecting would be removed outside of the playsims
control, causing problems with sector lists.
 2014-10-05 18:04:11 +13:00
Edward Richardson
0f9a8176f5 Unprediction needs to restore selected inventory 2014-10-05 16:57:31 +13: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
c66c497811 Merge branch 'master' of https://github.com/crimsondusk/zdoom 2014-09-29 00:43:19 +02:00
Christoph Oelckers
cfb623d517 Merge branch 'master' of https://github.com/MajorCooke/zdoom 2014-09-29 00:42:59 +02:00
Christoph Oelckers
82656df8c8 Merge branch 'Get-linetarget-from-any-actor' of https://github.com/fdari/zdoom 2014-09-29 00:42:35 +02:00
Christoph Oelckers
81076abba2 Merge branch 'canraise' of https://github.com/GitExl/zdoom 
Conflicts:
	src/p_acs.cpp
 2014-09-29 00:42:09 +02:00
Teemu Piippo
770547e661 - added udmf key midtex3dimpassible which causes the midtex to behave like a finite-height impassible line; practically this means the mid texture lets projectiles pass through it. 2014-09-28 17:17:19 +03:00
MajorCooke
96c6e7d9bf Minor fix; didn't mean to include that flag check. 2014-09-28 08:20:27 -05: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
fdari
a2f7b86a0f IsPointerEqual (ACS and Decorate) 
Decorate: IsPointerEqual(int aaptr_selector1, int aaptr_selector2)
ACS: IsPointerEqual(int aaptr_selector1, int aaptr_selector2, int tid1 = 0, int tid2 = 0)

Compare the pointers values returned by two pointer select operations. Returns true if they both resolve to the same value. Null values can be explicitly tested using IsPointerEqual(AAPTR_NULL, ...)

ACS: IsPointerEqual(int aaptr1, int aaptr2, int tid1 = 0, int tid2 = 0)

This function lets you compare pointers from other actors than the activator, using tids. Tid1 determines the actor used to resolve aaptr1, Tid2 does the same for aaptr2. If tid1 and tid2 are equal, the same actor will be used for resolving both pointers (that could always happen randomly; this way you know it will happen).
 2014-09-28 11:52:37 +02:00
MajorCooke
97d5d614c4 - Fixed: SXF_NOPOINTERS didn't clear LastHeard, causing monsters to spawn with targets. 2014-09-27 16:50:24 -05: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
Christoph Oelckers
e025f40902 - more redundancy removal: Consolidated the common part of the A_Kill* functions into a subfunction. 2014-09-27 08:54:18 +02:00
Christoph Oelckers
afaa88a460 - consolidated the common portion of the 6 different A_Damage* functions into a subfunction. 2014-09-27 08:48:36 +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
Edoardo Prezioso
54ccf5d44d - Fixed a possible uninitialized condition. 
In the function R_RebuildViewInterpolation, the pointer 'iview' was not initialized when the player or its camera were NULL, hence 'iview == NULL' was garbage. Also, the function FindPastViewer does not return NULL, hence the mentioned check is not needed at all. Just return early if the player camera does not exist.
 2014-09-26 11:11:35 +02:00
Christoph Oelckers
0f62983aee Merge branch 'master' of https://github.com/Edward850/zdoom 2014-09-26 08:31:20 +02:00
Christoph Oelckers
80060cf1ac Merge branch 'checkclass' of https://github.com/MajorCooke/zdoom 2014-09-26 08:30:33 +02:00
MajorCooke
6586fa29fd - Added FDARI's A_JumpIf CheckClass submission. 
- bool CheckClass(string classname, int ptr_select = aaptr_default, bool
match_superclass = false)
 2014-09-25 23:56:10 -05: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
e25b91d5a1 Cleanup 2014-09-26 16:11:52 +12:00
Edward Richardson
84cf799803 Final changes to balancing 2014-09-26 15:48:46 +12:00
Edward Richardson
8f82243f4c Don't balance if already the slowest node 
- Network balancing shouldn't be run if already too far behind
- Don't save network settings
- Added net_fakelatency for debug builds
 2014-09-26 15:48:45 +12: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
53b6e7d4d5 Added silent line teleport prediction 
- Allow activation of line teleport specials during prediction
- Moved prediction functions to improve uncapped framerates
 2014-09-26 15:48:45 +12:00
Edward Richardson
ad0a1ad865 Readded -extratic for compatibility with launchers 2014-09-26 15:48:45 +12:00
Edward Richardson
530f474673 Shifted netmode reporting for guests 
- The netmode is now reported after a guest has received it.
- Minor code cleanup
 2014-09-26 15:48:44 +12:00
Edward Richardson
c661da2995 Stop negative tic counts from corrupting messages 2014-09-26 15:48:44 +12:00
Edward Richardson
42e6737803 Player prediction now updates listener 2014-09-26 15:48:44 +12:00
Edward Richardson
4db8b3e421 Made delay updates less erratic 2014-09-26 15:48:44 +12:00
Edward Richardson
c585eee82b Don't need to MAX() mode 2 2014-09-26 15:48:43 +12:00
Edward Richardson
78f8bf19d2 Extratics mode 3 didn't work well 
- Removed Extratics mode 3
- Fixed a typo
 2014-09-26 15:48:43 +12:00
Edward Richardson
4041f56cc8 Bumped net version 2014-09-26 15:48:43 +12:00
Edward Richardson
ded3bc73be New extratic method 
- Extratic changed to server var, that can be changed at any time
(net_extratic)
- Added net_extratic 2 which resends all unconfirmed tics
- Corrected bad variable typo in delay reporting
 2014-09-26 15:48:43 +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
John Palomo Jr
79d9a573bb Added AProp_MeleeRange to SetActorProperty. 2014-09-24 03:56:20 -04:00
GitExl
bb3d2fa535 Add CanRaiseActor ACS function. 2014-09-23 12:10:39 +02:00
Christoph Oelckers
0b44b51b00 Merge branch 'master' of https://github.com/GitExl/zdoom 2014-09-21 22:13:16 +02:00
GitExl
313b229319 Add PickActor ACS function. 2014-09-21 16:43:17 +02:00
Christoph Oelckers
f92cdb0ce7 - fixed: When the SectorAction's TriggerAction method was renamed, the inherited one in the MusicChanger was overlooked. (Bit thanks to the C++ specs for allowing to override a non-virtual method with a virtual one without even showing a warning...) 2014-09-21 09:11:33 +02:00
Christoph Oelckers
cbf72fe992 - fixed: Since the serializing code cannot distinguish between user variables of the same name coming from different actors in an inheritance chain, this kind of name duplication must be prohibited. 2014-09-21 08:32:39 +02:00
MajorCooke
44683657f2 - Added jpalomo's A_SetSpeed patch. 2014-09-20 17:34:57 -05:00
MajorCooke
16a380f82a - Added Blue Shadow's DropInventory ACS function. 2014-09-19 17:27:18 -05:00
MajorCooke
5c4ad9be68 Added Blue Shadow's A_SpawnItemEx changes: (1/2) 
SXF_TRANSFERALPHA and SXF_TRANSFERRENDERSTYLE
 2014-09-19 14:15:31 -05:00
Christoph Oelckers
c2377ff8e1 Merge branch 'setmasterfix' of https://github.com/MajorCooke/zdoom 2014-09-19 09:15:33 +02:00
Christoph Oelckers
0787f73cd4 Merge branch 'clang_3_5_crash' of https://github.com/edward-san/zdoom 2014-09-19 09:14:44 +02:00
MajorCooke
7a62459c00 Allow SXF_SETMASTER to work on non-monsters. 2014-09-18 17:58:06 -05:00
Christoph Oelckers
134c9ade21 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-16 08:44:37 +02:00
Christoph Oelckers
864adde92e - typo for savegame versioning of AActor::weaponspecial: it was introduced in savegame version 4512, not 4511. 2014-09-16 08:42:27 +02:00
Edoardo Prezioso
1c96039d7a - Fixed miscompilation with Clang 3.5.0. 
The optimizer miscompiles the function FBehavior::LoadScriptsDirectory and causes random crashes when zdoom is run with wads containing scripts.
As said in the comment, I just hope that the Clang devs fix it for the next patching release, ie 3.5.1.
 2014-09-15 19:46:43 +02:00
Braden Obrzut
94123d5ef4 - Applied anonymous patch to fix uncapped stuttering in SDL backend. 2014-09-15 12:59:07 -04:00
Christoph Oelckers
4be9a71636 - fixed: The VOC reader didn't advance the read index correctly. 2014-09-15 11:32:40 +02:00
Christoph Oelckers
1b13e6be98 -. fixed:S_LoadSound passed the wrong value for the lump size parameter to LoadSoundVoc. 2014-09-15 11:24:48 +02:00
Christoph Oelckers
ee6e87d94b - use a separate counter from AActor::special1 to count weapon use with some Hexen weapons. special1 is used for some other purposes as well, and when using a separate counter it can be reset to 0 when changing weapons, preventing counting errors. 2014-09-13 12:38:16 +02:00
Christoph Oelckers
de68361f27 - fixed: When a sprite is being renamed by Dehacked it also needs to be changed in the list of original sprite names, otherwise any subsequent attempt to use the altered sprite in a frame definition will fail. 2014-09-13 11:54:19 +02:00
Christoph Oelckers
2ada3fe00e - remove debug stuff. 2014-09-13 11:40:06 +02:00
Christoph Oelckers
50a8297201 - fixed: G_ChangeLevel must resolve warptrans map links before getting the next level's levelinfo. 2014-09-13 11:00:25 +02:00
Christoph Oelckers
f0e9fde336 - fixed: In Raven games, don't chase after monsters in the titlemap or when actor has a goal. 2014-09-13 10:40:56 +02:00
Christoph Oelckers
2be3b776d8 - fixed: A_CustomMissile should not jump to the See state for dead monsters when using CMF_CHECKTARGETDEAD. 2014-09-13 10:15:09 +02:00
Christoph Oelckers
46ec364443 - fixed: When validating the crouch sprite it was assumed that both the regular and the crouch sprite were having full rotations. 2014-09-13 10:08:22 +02:00
Christoph Oelckers
1e82d72349 - fixed: G_FinishTravel must clear the MF2_BLASTED flag off the player pawn because this flag will result in damage from contact with other objects in the map. 2014-09-13 09:56:21 +02:00
Christoph Oelckers
a0f507d18f - fixed: The crosshair setting code checked for existence of lumps, not textures and missed anything defined in a TEXTURES lump. 2014-09-13 09:51:49 +02:00
Christoph Oelckers
109da206a6 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-12 20:59:41 +02:00
Christoph Oelckers
a2c81f1ca9 -fixed the file validity checks in MapData::GetChecksum. 
They need to be done per lump, because MapData::Seek can alter the FileReader being used for a specific lump. Even worse, the FileReader will be NULL when the function as it was is called for a map inside a Zip-file.
 2014-09-12 20:59:23 +02:00