Commit graph

1241 commits

Author SHA1 Message Date
AJ Martinez
4f1642bbce Clarify addon-related messages 2020-08-05 00:40:56 -05:00
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
69b6ba2f18 I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
2020-07-28 03:34:39 -04:00
Steel Titanium
058b41a834 Port netticbuffer from Kart 2020-07-19 15:24:27 -04:00
James R
84d9aa93c7 Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
James R
f4989f36bd Fix a lot of stuff related to the version automation 2020-07-10 22:39:46 -07:00
Louis-Antoine
49ad2c7313 Revert "Fix computation of very high pings"
This reverts commit 8b78811651.
2020-07-11 01:55:40 +02:00
Louis-Antoine
e3ef4d966a Fix timeout 2020-07-07 02:06:26 +02:00
Ashnal
44b9f8e25a Let's just ALWAYS go into ask file list mode
Easier to maintain and understand a single code path
Rather than switching behavior based on amount of addons
2020-07-04 01:12:38 -04:00
Ashnal
8790661b20 Remove Checking Files spam 2020-07-02 21:48:45 -04:00
Ashnal
8df8d1d028 Correct total files to load off by one 2020-07-02 17:47:10 -04:00
Ashnal
a4c004fee3 Changed "this server has a lot of addons!" to
"Checking server addon list ..." to be more informative
2020-07-01 23:52:43 -04:00
Ashnal
8cfc3520e5 Connection screen no longer freezes up while
searching for addons on disk
Game will run one tic after every file status is updated
2020-07-01 23:48:14 -04:00
Ashnal
3cb4e3cc18 Fix X/0 files display bug for legacy downloader
Also made "Waiting to Download" consistent with other states
2020-07-01 21:40:21 -04:00
Sal
48409ce627 Merge branch 'chatbug-fix' into 'master'
clientside ack fix

See merge request KartKrew/Kart-Public!186
2020-07-01 18:35:57 -04:00
James R
71dedde5eb Merge branch 'delete-connection-screen-and-midgame-joins' into 'next'
Delete connection screen and midgame joins

See merge request STJr/SRB2!1021
2020-06-28 18:41:07 -04:00
Ashnal
f0fac04dfd Experiemntal clientside ack fix
Stops the client from using reliable packets before joining a server
Clients can time out during addon loading
sending reliable packets before then can cause out of order acks
This causes joinbug, chatbug, and chatspam, as well as
general server instability due to unnecesary packetspam
2020-06-27 23:43:15 -04:00
Ashnal
d1a2e4ce89 Adjust text position 2020-06-27 23:40:13 -04:00
Ashnal
4376ab84dc Add progress bar for file loading 2020-06-27 23:26:38 -04:00
Ashnal
31ea4637d8 Adjustment to new progress text 2020-06-27 21:17:21 -04:00
Ashnal
f8f6dff748 New "Overall Download Progress" bar
Shows progress of all file downloads pre-join
2020-06-27 21:17:04 -04:00
Ashnal
566cc99cab Load one file per tic
Prevents game from locking up when loading large file lists
2020-06-27 20:58:33 -04:00
SteelT
07c84dc854 Merge branch 'increase-input-buffer-more' into 'next'
Increase the length of the player input buffer even more

See merge request STJr/SRB2!951
2020-06-27 13:32:19 -04:00
Louis-Antoine
36ad16452c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
Louis-Antoine
8b78811651 Fix computation of very high pings 2020-06-26 15:34:26 +02:00
Sally Coolatta
59add5abd4 Merge branch 'master' into trick-panels 2020-06-14 20:46:01 -04:00
James R
0349cc4127 Merge remote-tracking branch 'origin/master' into http-mserv 2020-06-12 23:36:39 -07:00
Zachary McAlpin
1b831c0bbe Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
LJ Sonic
3203d4a62e Merge branch 'next' into 'better-download'
# Conflicts:
#   src/d_clisrv.c
2020-06-10 07:57:49 -04:00
LJ Sonic
5e7ffb055f Merge branch 'snake' into 'next'
Add a Snake minigame to the file transfer screen

See merge request STJr/SRB2!903
2020-06-10 07:38:37 -04:00
Zachary McAlpin
3a8e053d9d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-09 19:54:47 -05:00
Sally Coolatta
844f24203c Whoops, use va to put these together! 2020-06-09 16:51:38 -04:00
Sally Coolatta
ef9e6081c9 Log the server connection messages rather than print
Immersion breaking when you transition from menu to gameplay!
2020-06-09 16:50:18 -04:00
Sal
7555177cb1 Merge branch 'viewpoint-reset' into 'master'
Reset some viewpoints properly (closes #69)

Closes #69

See merge request KartKrew/Kart!282
2020-06-08 15:01:25 -04:00
Sally Coolatta
3e36e15628 Merge master 2020-06-08 00:52:37 -04:00
Sally Coolatta
559b879a28 move bot ticcmd to SV_Maketic 2020-06-07 03:41:56 -04:00
James R
cbcbe9f15b Reset DISPLAYPLAYERS if someone leaves 2020-06-06 22:28:13 -07:00
Sally Coolatta
b7a8c1f128 Merge branch 'master' into trick-panels 2020-06-05 18:41:21 -04:00
Sally Coolatta
f4c0011a76 Merge branch 'master' into grand-pricks 2020-06-04 14:41:56 -04:00
Sryder
b7582007fa Merge branch 'gentlemen-ping-fix' into 'master'
Don't show ping if no one else is racing

See merge request KartKrew/Kart!277
2020-06-04 08:01:41 -04:00
James R
e11101f69a Don't show ping if no one else is racing 2020-06-03 17:09:33 -07:00
Sally Coolatta
086ea73c2f Merge branch 'master' into respawn-updates 2020-06-01 15:49:30 -04:00
Louis-Antoine
293c8ad75b Fix food occasionally spawning inside the snake 2020-06-01 15:21:16 +02:00
LJ Sonic
05e8d12427 Merge branch 'next' into 'better-download'
# Conflicts:
#   src/sdl/i_system.c
#   src/win32/win_sys.c
2020-06-01 08:16:53 -04:00
LJ Sonic
aeeb6e1b02 Merge branch 'next' into 'fix-spawn-desynch'
# Conflicts:
#   src/p_map.c
2020-06-01 08:15:02 -04:00
Sally Coolatta
ede66a6632 Trick panels 2020-05-31 21:23:22 -04:00
Zachary McAlpin
8826eeeeb9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-29 15:32:59 -05: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
Sally Coolatta
285de3357d Add back to resynch & savegame, shorten names of a few variables 2020-05-29 13:12:07 -04:00