Christoph Oelckers
ccbdcfea81
Merge branch 'master' of https://github.com/j-palomo/zdoom
2014-10-21 14:28:31 +02:00
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
b2110db1f5
Extended list of display resolutions
2014-10-18 14:55:27 +03:00
alexey.lysiuk
949325df68
Merge branch 'fix_cmake_unix' into z_osx_clean
2014-10-18 12:36:09 +03: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
alexey.lysiuk
c29772de25
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-10-18 12:22:10 +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
alexey.lysiuk
25b808cd82
Merge https://github.com/rheit/zdoom into z_osx_clean
2014-10-12 15:19:11 +03: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
981b5f32e0
Merge branch 'master' of https://github.com/MajorCooke/zdoom
2014-10-02 11:48:20 -05:00
MajorCooke
5030832df0
- Added DMSS_NOFACTOR for all A_Damage functions.
2014-10-02 11:48:07 -05:00
MajorCooke
3050ea9a6d
- Fixed: A_RemoveTracer/Target didn't take flags into account.
2014-10-02 11:27:22 -05:00
MajorCooke
7a6e704af6
Merge pull request #4 from rheit/master
2014-09-29 14:23:28 -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