Commit graph

6813 commits

Author SHA1 Message Date
Ashnal
28c07d2224 Merge remote-tracking branch 'public/next' into conenction-screen-improvements 2020-08-19 19:08:33 -04:00
Ashnal
b53181a62a COnfirm box now respects rebindable accelerate and brake on keyboards 2020-08-19 18:01:56 -04:00
Sal
37ca880353 Merge branch 'kimmy-osx-fixes' into 'master'
[OSX] Fix "SIGILL: illegal instruction" on macOS Catalina

See merge request KartKrew/Kart-Public!194
2020-08-18 03:52:47 -04:00
Latapostrophe
e0dc13e70b Merge remote-tracking branch 'stjr/io' into kart-io 2020-08-17 20:22:02 +02:00
Latapostrophe
1598bfa143 Kill line riding for offroad 2020-08-17 12:01:16 +02:00
Ashnal
98ad0248f9 Move code down so declarations are above to appease C90 2020-08-17 04:03:02 -04:00
Ashnal
42f677447d Move declaration to appease C90
also remove some extra tab characters
2020-08-17 03:56:13 -04:00
Ashnal
30f687d0df Fixes for file accounting
mainwads+1 to not use the first mainwad
2020-08-17 03:51:19 -04:00
Ashnal
196514ff21 New message boxes for downloads and full server waiting
Downloads must be confirmed before proceeding
Allows downloading mods for full servers
Client will wait for a slot to open on a full server to join
This has a 5 minute timeout
2020-08-17 03:47:23 -04:00
Sally Coolatta
0c412459bf Merge branch 'master' into next 2020-08-17 02:05:31 -04:00
James R
b681b6e9e6 Do not do master server things when NOCURL 2020-08-16 21:42:58 -07:00
James R
5d739bec6d Remove HAVE_CURL guards on sending httpsource 2020-08-16 20:39:46 -07:00
Sally Coolatta
d31c33e035 No previous prototype for K_DropKitchenSink 2020-08-16 21:18:33 -04:00
Kimberly Wilber
4548662536 [OSX] Fix "SIGILL: illegal instruction" on macOS Catalina
on OSX, strncpy may copy to overlapping (protected) memory. this
sometimes happens when loading WAD files.

This patch eliminates these problems for me
2020-08-15 12:16:05 -04:00
Ashnal
c91d004409 Improve total downloads bar
Now has total file size AND number of files
2020-08-15 01:03:45 -04:00
James R
b426ed81dd dumbass doesn't test changes before pushing directly to next
(cherry picked from commit be14b8a564a89a5afb84ac19f1586f3db7f68367)
2020-08-14 08:27:25 -07:00
Sal
80d37b1939 Merge branch 'http-mserv' into 'master'
Make the HTTP Master Server official

See merge request KartKrew/Kart-Public!193
2020-08-10 16:49:47 -04:00
James R
8e493bddc3 Add http-mserv to fuck 2020-08-09 23:32:43 -07:00
Sal
15ff58280a Merge branch 'maxnetnodes-2-electric-boogaloo' into 'master'
Bump MAXNETNODES to 127

See merge request KartKrew/Kart-Public!192
2020-08-09 22:28:50 -04:00
James R
3cb1a53b3f Bump MAXNETNODES to 127 2020-08-09 18:26:34 -07:00
Ashnal
6af76ee948 Now that the server doesn't erroneously send the last mainwad
As the first part of fileneeded, we must load file 0
2020-08-09 00:48:53 -04:00
Ashnal
6ff69726a6 Redo logic for lots of files vs not
Now new CL state for checking files so it can spread over tics
whether we ask for the extended list or not
2020-08-09 00:47:55 -04:00
Sal
954a21123a Merge branch 'indirectitemcooldown' into 'next'
Fix Shrink, SPB and Hyudoro cooldowns never resetting?

See merge request KartKrew/Kart-Public!191
2020-08-06 12:19:27 -04:00
Sally Coolatta
ddfd7a4772 Merge branch 'master' into next 2020-08-06 12:15:55 -04:00
AJ Martinez
e5463afb58 Fix Hyudoro cooldown never resetting 2020-08-06 10:51:53 -05:00
AJ Martinez
2422d1c5b7 Fix indirect item cooldown never resetting 2020-08-06 10:34:16 -05:00
Sal
8c6b8cd268 Merge branch 'master' into 'master'
Clarify addon-related messages

See merge request KartKrew/Kart-Public!190
2020-08-05 06:48:44 -04:00
AJ Martinez
4f1642bbce Clarify addon-related messages 2020-08-05 00:40:56 -05:00
Sal
46094d3027 Merge branch 'mine-punt-sync-fix' into 'next'
Fix desyncs caused by K_PuntMine

See merge request KartKrew/Kart-Public!189
2020-07-25 03:55:28 -04:00
Sal
b7aaef7021 Merge branch 'rocket-sneaker-hnext-fix' into 'next'
Rocket sneaker and sink hnext fix

See merge request KartKrew/Kart-Public!188
2020-07-25 03:55:22 -04:00
Ashnal
96e098b451 Appease C91 2020-07-23 21:05:00 -04:00
Ashnal
8c5e725a8d Also lets do this for kitchen sinks
They also ignored in K_DropHnextList
2020-07-23 20:12:35 -04:00
Ashnal
f4d648526d Moved K_DropRocketSneaker call into K_StripItems
This should catch when DropHnextList misses it
Should probably fix sinks too ...
2020-07-15 09:17:35 -04:00
Ashnal
f60b6c881d Properly handle rocket sneakers when shrinking 2020-07-14 19:50:37 -04:00
Ashnal
fef23cf779 Some safeguards for K_DropRocketSneaker usage 2020-07-14 19:45:15 -04:00
Ashnal
bb6a5662c2 Fixing RocketSneakers
New function specifically for dropping rocketsneakers K_DropRocketSneaker
Used by Eggbox touchspecial to properly dispose of shoes and clean up hnext
Now also used by the shoe thinker to drop themselves
Fixes angle of spent shoe launch
2020-07-14 18:45:45 -04:00
Ashnal
fb51f60e20 Add clean up to K_PuntMine
This cleans up hnext when a mine shield is P_RemoveMobj'ed while being punted
Otherwise, hnext could point to a removed mobj and cause undefined behavior
This also fixes the bug where if you have multiple mines in your slot, drag one
and have it punted, all your unused mines would disappear.
This should/may fix the crashes/desyncs I've observed in gameplay when a held mine is punted.
2020-07-14 00:21:46 -04:00
Ashnal
7174299635 Remove now unused ret var 2020-07-04 22:25:02 -04: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
f2990180f6 Fix file number accounting
Should ensure appropriate accounting and prevent loading of
server files if it would put us over MAX_WADFILES
2020-07-02 20:57:33 -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
3468d7808f Merge branch 'fix-pk3-leak' into 'master'
Fix memory leak in W_ReadLumpHeaderPwad

See merge request KartKrew/Kart-Public!182
2020-07-01 18:36:48 -04:00
Sal
b7ba97601b Merge branch 'http-useragent-fix' into 'master'
Fix user agent for HTTP downloads being set as SRB2Kart/v1.1.2

See merge request KartKrew/Kart-Public!185
2020-07-01 18:36:33 -04:00
Sal
0043ccd314 Merge branch 'ogl-color-fix3' into 'master'
Ogl colormap fix third attempt

See merge request KartKrew/Kart-Public!184
2020-07-01 18:36:19 -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
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