TehRealSalt
e770f82ad7
Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back
2017-10-17 16:36:29 -04:00
TehRealSalt
5fe2f4928f
Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
...
# Conflicts:
# src/doomdef.h
# src/sdl/i_main.c
# src/sdl/i_video.c
# src/y_inter.c
2017-10-17 15:53:34 -04:00
TehRealSalt
cce7b4374a
Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back
2017-10-17 00:45:30 -04:00
TehRealSalt
727d55b64e
Merge remote-tracking branch 'refs/remotes/srb2public/public_flatsprite' into zarrotsu
...
# Conflicts:
# src/doomdef.h
2017-10-17 00:40:38 -04:00
TehRealSalt
540bea911a
First, minor steps to Record Attack support
...
To-Do:
- fix demo desync (desync is only super noticeable on slopes, but a
message pops up when the player starts moving regardless)
- fix ghosts not appearing
- replace that dumb level tally
- remove a bunch of things that made the assumption that race & record
attack would never mix (ex: "next map x doesn't support race mode, using
map y anyway" message)
2017-10-15 02:33:28 -04:00
Monster Iestyn
ea372fae53
Merge branch 'master' into next
2017-09-29 17:15:57 +01:00
Monster Iestyn
c90ddbca36
Merge branch 'makefile-ports-tweaks-cleanup-etc' into 'master'
...
Makefile ports tweaks cleanup etc
See merge request !211
2017-09-28 17:31:33 -04:00
Alam Ed Arias
ec125628ab
Merge branch 'master' into next
2017-09-28 10:16:35 -04:00
Alam Ed Arias
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
Monster Iestyn
900bab9b13
Fix includes for SDL 1.2-only ports' files
2017-09-14 21:15:38 +01:00
Monster Iestyn
9c4e2eeeef
Merge branch 'next' into netcode-fixes-the-sequel
2017-08-23 19:17:25 +01:00
ZTsukei
a8a4f06aa3
Corrected type masking in d_clisrv.c
2017-08-10 17:37:31 -04:00
ZTsukei
80990da828
v1.3.18
...
-------
Fixed really poorly done netcode stuff. This should fix the kartstuff desyncing, maybe collision stuff too?
Fixed Megashroom's growth animation lasting too long.
2017-08-09 18:14:20 -04:00
Monster Iestyn
f0ffd691f4
Merge branch 'master' into next
2017-07-07 22:47:34 +01:00
Monster Iestyn
4752109233
Some more tweaks of my own:
...
*Add CONS_Printf messages for !netgame checks
*Arg count is checked first regardless of netgame status for both kick and ban, < 2 is checked instead of == 1 just in case these weren't called from console for some stupid reason?
*Moved Command_Kick's buffer vars to within the code that actually does kicking stuff
2017-07-07 22:40:00 +01:00
toasterbabe
9a1e1180ff
Also account for bans, pff.
2017-07-05 16:29:21 +01:00
toasterbabe
60e21381ab
Don't kick Tails!
...
Also, a movement for the WRITESINT8 to prevent modification to buf if the function bails early.
2017-07-05 16:20:23 +01:00
ZTsukei
3cdcaa6f2f
G_PlayerReborn desync fix, maybe?
2017-06-26 21:41:05 -04:00
Monster Iestyn
02c098574c
ah, turns out the TIC n debugfile print is a remnant of when Doom Legacy printed the consistancy return value... which we'll do here now too, in that case
2017-06-10 17:09:08 +01:00
Monster Iestyn
b9828f78e8
Fix stupid lack of newline with this message
2017-06-09 23:22:27 +01:00
Monster Iestyn
2e42c9621c
Eck, potted another node/player confusion for clients reciving PT_PING
2017-06-01 20:46:44 +01:00
Monster Iestyn
fe15305df0
Merge the two NEWPING parts of NetUpdate into one block
2017-06-01 20:43:24 +01:00
Monster Iestyn
3d86e7135d
Fix confusion between nodes and players in ping updating code and PT_PING packet sending code
2017-06-01 19:01:57 +01:00
Monster Iestyn
806b101984
Merge branch 'master' into next
2017-05-27 20:10:48 +01:00
Monster Iestyn
d20efa5a74
Entirely ignore PT_ASKINFOVIAMS packets, since it turns out it's not even sent by the MS anyway
2017-05-27 19:06:46 +01:00
Monster Iestyn
11d57fba1b
Merge branch 'master' into next
2017-05-26 23:02:06 +01:00
Monster Iestyn
ab5835cd3b
Remove cruft from my initial days of fumbling with this branch
...
textcmd[0] for PT_NODETIMEOUT can't hold anything < 0 anyway, and you'd probably have to really try to get >= MAXNETNODES
2017-05-26 15:26:00 +01:00
Monster Iestyn
aecc97ded3
PT_REQUESTFILE checking:
...
* if you sent it to a client rather than the server, game over, your connection is closed
* if files that don't exist or are too large are requested are listed, game over, your connection is closed (they should have been checked on YOUR side beforehand, silly)
* if the server has downloading disabled anyway, ...yeah, you get the idea
Don't worry, I made sure Got_RequestFilePak cleaned up the full file request list for the node in case of failure
2017-05-26 13:39:54 +01:00
Monster Iestyn
a23e9bc32b
Fix size_t printing
2017-05-25 18:10:20 +01:00
toasterbabe
47e171250f
* Prevent joining a server if you have too many files loaded to add the remainder.
...
* Made the check in Got_RequestAddfilecmd more comprehensive, since I might as well. Just something to tweak a little later in internal.
2017-05-25 16:06:39 +01:00
Monster Iestyn
c92aaa74a4
I think PT_CLIENT2MIS was meant to do this too, probably
2017-05-23 18:46:34 +01:00
Monster Iestyn
7147e0fcaf
Improve previous PT_TEXTCMD/PT_TEXTCMD2 check, add another one to ignore zero size textcmds!
2017-05-23 17:35:32 +01:00
Monster Iestyn
0b0b738a6f
Don't allow non-servers to receive PT_RESYNCHGET
2017-05-23 16:34:56 +01:00
Monster Iestyn
ff1cc07a1d
Implemented toaster's suggestion to make a macro here
2017-05-23 16:29:09 +01:00
Monster Iestyn
9e3bdc5ee2
Prevent bad PT_TEXTCMD/PT_TEXTCMD2 textcmd[0] sizes?
2017-05-23 16:13:42 +01:00
Monster Iestyn
fdfd6e1c0b
Whoops don't do that for PT_REQUESTFILE
2017-05-22 22:20:08 +01:00
Monster Iestyn
c70839334e
Added a bunch of missing checks to prevent non-server players from sending other non-server players stuff
2017-05-22 22:17:51 +01:00
Monster Iestyn
3784d765e4
Remove extra whitespace I added
2017-05-22 20:47:38 +01:00
Monster Iestyn
28444c12dd
Some more things I overlooked in this fix
2017-05-22 16:54:39 +01:00
Monster Iestyn
247ed56e17
Don't allow nonsense PT_ASKINFOVIAMS packets, nor any at all if offline
2017-05-22 16:44:50 +01:00
Monster Iestyn
5a1fc6098e
Attempts to prevent stupid stuff from happening
2017-05-19 11:25:28 +01:00
ZTsukei
cfdb127630
v1.3.04 - The Bouncy One
...
--------
Hardcoded Collide.lua.
Added player boolean array "Collide", used by Collide.lua.
Walls are now bouncy by default again, like they were in 1.09.
Buffed Orange Drift sparks, the boost now lasts 60 frames up from 40.
2017-04-17 13:20:52 -04:00
Sryder
1970f4f280
kartspeed and kartweight not being set from a resynch
2017-03-06 16:05:02 +00:00
ZTsukei
5d0b9ef551
Friction updated. Added KARTSTUFF to lua. Added ->kartstuff to network syncing stuff (surprised it even worked before now???), also maybe items correctly reset at the end of level now.
2017-02-27 17:55:26 -05:00
ZTsukei
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
Monster Iestyn
6efb15c6e8
Fix Ban_Add usage for NONET
2017-02-20 21:36:05 +00:00
Monster Iestyn
7424df8180
Make sure I_Ban and Ban_Add are only used by the server
...
Also make sure the server actually uses Ban_Add if an admin banned someone
2017-02-20 19:58:29 +00:00
ZTsukei
493436dc1a
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 15:54:23 -05:00
Sryder
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Monster Iestyn
8a421a05d9
admin bans with custom ban messages should now be recognised by the server properly
2017-02-10 20:31:58 +00:00
