Sally Coolatta
a6396d5734
Utilize SendKick more
2020-08-02 14:07:02 -04:00
Sally Coolatta
6b1e9e4937
Merge d_clisrv.c/h
2020-08-02 13:56:43 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
LJ Sonic
8c5149f180
Merge branch 'possibly-fix-dedi-crash' into 'next'
...
Possible fix for dedicated server crashes (aka the msvcrt.dll!_mbscat crash)
See merge request STJr/SRB2!963
2020-05-28 11:29:00 -04:00
SteelT
2739f989dc
Merge branch 'fix-input-buffer' into 'next'
...
Allow input buffer to hold more than 64 tics
See merge request STJr/SRB2!950
2020-05-28 11:27:39 -04:00
Monster Iestyn
9a122fd9c4
Got_AddPlayer: check that I_GetNodeAddress(node) is non-NULL before using strcpy to copy it to the playeraddress array
2020-05-25 21:27:48 +01:00
Sally Coolatta
edfc14c506
Better steering
...
- If they're already turning in one direction, they are more likely to steer in that direction for objects
- Bots have to want to turn in 1 direction for a few frames in a row before it'll let them
Prevents twitching & makes them less indecisive in general
2020-05-24 11:12:38 -04:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
Louis-Antoine
d6aed61ded
Allow input buffer to hold more than 64 tics
2020-05-18 11:34:09 +02:00
Louis-Antoine
dc527a8afb
Use per-node reference tics in ExpandTics
2020-05-17 20:23:07 +02:00
Louis-Antoine
24bd03cd22
Store starttic as a raw value in PT_SERVERTICS packets
...
This avoids some desynch issues and is simpler to handle.
Those packets are always big anyway, so the difference is irrelevant.
2020-05-17 20:09:11 +02:00
Sally Coolatta
8be2d12b99
Merge remote-tracking branch 'public/master'
2020-05-16 00:08:53 -04:00
Sal
c3f2c7618f
Merge branch 'clearbans-please' into 'master'
...
Write empty file on clearbans
See merge request KartKrew/Kart-Public!156
2020-05-15 19:29:11 -04:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
sphere
4d9d125a99
Fix some errors and add some comments. Also, actnum is not an INT32.
2020-05-12 17:20:28 +02:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
ThatAwesomeGuy173
972d052c67
Display refusal message if there is no HTTP source and internal downloads are disabled
2020-05-09 06:06:21 -06:00
Sally Coolatta
d2172fc54b
Bot amount & difficulty is now controlled by cvars
2020-05-07 02:37:06 -04:00
Louis-Antoine
d3d01dd8eb
Fix compiler warning
2020-05-05 14:05:19 +02:00
Sally Coolatta
2188391d42
add botvars to resynch packet
2020-05-04 20:37:52 -04:00
Sally Coolatta
766c6da005
Give bots servernode, D_NumPlayers no longer counts bots
2020-05-04 19:49:18 -04:00
Sally Coolatta
2dfa20f758
Merge branch 'master' into pet-robo
2020-05-03 23:08:00 -04:00
James R
77ddf635a5
Use a random port when connecting
...
(cherry picked from commit f584b61c93a97e1a9852f306acba673ced21e03a)
2020-05-03 18:35:51 -07:00
James R
908013f02e
Download mismatched md5sum with http
...
This is from 7176aaf3
2020-04-26 01:29:40 -07:00
James R
9640cb1635
Fallback you doofus!
2020-04-26 01:28:01 -07:00
Wolfy
f35bdf3bb7
Revert basically every attempted join passwords fix
2020-04-26 01:20:46 -07:00
James R
6613b19220
Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked
2020-04-26 01:16:27 -07:00
James R
720e08c14d
Revert "Reorder join process so password is authenticated before attempting to download"
...
This reverts commit 7176aaf36f
2020-04-26 01:12:40 -07:00
James R
de9a156884
Revert "Don't send httpsource in SERVERINFO if join password is set"
...
This reverts commit ffd120f597
2020-04-26 01:12:39 -07:00
James R
82b3649ad6
Revert "Request a download after completing the join challenge"
...
This reverts commit 98478d6712
2020-04-26 01:11:25 -07:00
Louis-Antoine
ccf4bbe194
Add a minimum delay between connections
2020-04-24 14:05:15 +02:00
Sally Cochenour
372544d28f
Merge branch 'master' into pet-robo
2020-04-22 21:54:40 -04:00
Wolfy
c40f1bf60d
Shut the compiler up
2020-04-21 19:25:18 -05:00
Ashnal
abc17c9448
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
James R
2111cc2be6
More fine tuned versioning
...
You get a PACKETVERSION, for when some packets change format.
You get SRB2APPLICATION, for when you have big fucking mod.
(cherry picked from commit 6bd383621eee92b215f86c9c4b483934d7e60daa)
2020-04-20 19:59:42 -07:00
Sally Cochenour
422f528056
Remove prints, adjust things
2020-04-19 10:12:02 -04:00
Sally Cochenour
21bab775b1
Add difficulty settings
2020-04-19 09:07:29 -04:00
James R
f87e82ca66
Fuck acks!!!!
2020-04-18 18:47:57 -07:00
James R
98478d6712
Request a download after completing the join challenge
2020-04-18 18:45:50 -07:00
James R
f61e916ab6
Whoops I fucked that up
2020-04-13 17:45:02 -07:00
James R
ffd120f597
Don't send httpsource in SERVERINFO if join password is set
2020-04-13 17:40:48 -07:00
James R
7176aaf36f
Reorder join process so password is authenticated before attempting to download
2020-04-13 17:30:42 -07:00
Sally Cochenour
53784f9940
No more modulo bullshit in VERSION
...
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision
# Conflicts:
# src/doomdef.h
2020-04-12 23:32:15 -05:00
Sally Cochenour
da953c9dae
No more modulo bullshit in VERSION
...
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision
2020-04-12 23:51:00 -04:00
Wolfy
9d31786c8c
Fix off by one error in http downloader
2020-04-12 21:14:33 -05:00
wolfs
4a264ffba9
Merge branch 'http-downloads' into 'awful-mix'
...
Support for http downloads
See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
Steel Titanium
47d70e1ae6
Fix cmake using wrong libs if internal libs is turned on
...
Use '\0' instead, just in case
2020-04-12 17:56:12 -04:00
Steel Titanium
4bfb583e91
Remove some of these superfluous ifdef checks.
...
Allows compatibility with non-curl enabled builds.
2020-04-12 15:07:39 -04:00
Sally Cochenour
d0a6c43c89
Minor things
2020-04-09 02:52:41 -04:00
