stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-05 16:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
6794 commits 60 branches 11 tags 94 MiB
Commit graph

6794 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
8367a8553c "Asynchronous" file queue calls findmultiplefiles on another thread, then reads the file on the main thread 
This replaces the exec command's threading from before.
(See d0e7ba309a59580988225816d104e343b64d67d0.) The order of exec commands
alone is guranteed. And it removes the need to put mutexes on the command
buffer. I plan to use this system for addfile too...
 2020-08-24 06:00:01 -07:00
James R
7fcbe073c3 Make mutex and cond functions no-op with NULL pointers 2020-08-24 04:34:18 -07:00
James R
83560485d1 Let findmultiplefiles use a mutex when accessing each file query 2020-08-24 04:33:44 -07:00
James R
bb07f12b42 W_InitMultipleFiles with one findmultiplefiles call 
This speeds up file searching for base resources and pwads by using one
directory traversal. Previously findfile could be called for each wad. And
although subsequent traversals after the first are faster, it's still a waste.
 2020-08-22 01:53:22 -07:00
James R
60a4b403dd Multiple files filesearch and findmultiplefiles 2020-08-22 01:50:54 -07:00
James R
731c6bf56d Merge remote-tracking branch 'origin/next' into findfile-with-threads 2020-08-20 22:45:58 -07:00
Sal
0ca9f8f07d Merge branch 'conenction-screen-improvements' into 'next' 
Connection screen improvements

See merge request KartKrew/Kart-Public!187
 2020-08-21 00:11:37 -04:00
Ashnal
9e1d7146ad Fixed retry timeout to no ttrigger when starting a local server 2020-08-20 23:38:04 -04:00
Ashnal
247239c2bc Add return false to the connect timeout 2020-08-20 23:09:12 -04:00
James R
5b0cb1afcb Merge remote-tracking branch 'origin/master' into next 2020-08-20 19:55:03 -07:00
Sal
79c299bf31 Merge branch 'port-port-port' into 'master' 
2.2's random client port

See merge request KartKrew/Kart-Public!201
 2020-08-20 12:19:52 -04:00
Sal
67b37e54b6 Merge branch 'snapback' into 'master' 
Instantaneous lookback camera (v2 backport)

See merge request KartKrew/Kart-Public!203
 2020-08-20 12:19:41 -04:00
Sal
4c363db516 Merge branch 'gme-fixes-cleanup' into 'master' 
GME cleanup and fixes

See merge request KartKrew/Kart-Public!202
 2020-08-20 02:07:19 -04:00
lachwright
d0d6128053 Instantaneous lookback camera (v2 backport) 2020-08-20 13:41:03 +08:00
Ashnal
aa2b25e667 Well actually, lets fix all comparisons of askset to use the same comparison 
If we initialize to I_GetTime() - NEWTICRATE*3 it never underflows and everything is good
 2020-08-20 00:54:18 -04:00
Steel Titanium
e3f07b33bb GME cleanup and fixes 
Just some stuff backported from SRB2 2.2, well mostly

get_zlib_error function to reduce code duplication

Return false if it fails to load the VGZ lump

Reduce redundant calls to gme_set_equalizer

Fix sometimes loading a VGZ crashing the game
 2020-08-19 22:39:12 -04:00
James R
94512c49e4 -clientport (it's back!) and -serverport, which is an alias to -port 
If you ever need to, you can change the client port number.

(cherry picked from commit 843d9b9f0a345330d97c579e94f208eb2b65c156)
 2020-08-19 18:16:54 -07:00
James R
b77541b51d Use a pointer for port_name 
Using strcpy is stupid because we don't know how long the argument would be.
There's no need for a buffer anyway.

(cherry picked from commit 4e321012894b2aa87e312597f19be26b30545a8b)
 2020-08-19 18:16:53 -07:00
James R
b1f5e66a23 Use a random port when connecting 
(cherry picked from commit f584b61c93a97e1a9852f306acba673ced21e03a)
 2020-08-19 18:16:53 -07:00
James R
65968f00d3 Fix tiny mistake with the last commit 2020-08-19 17:55:01 -07:00
James R
1cd7c3b747 Rearrange time comparsion on asksent to make it underflow friendly 
This fixes '-connect'. NEWTICRATE*5 is subtracted from asksent after
CL_LOADFILES. If this happens too early, an underflow will occur.
 2020-08-19 17:49:47 -07:00
Sal
a335d6b583 Merge branch 'fix-nocurl' into 'master' 
Fix NOCURL compiling

See merge request KartKrew/Kart-Public!197
 2020-08-19 20:36:14 -04:00
Sal
c6f85cde59 Merge branch 'httpsource-without-curl' into 'master' 
Let servers send httpsource without curl

See merge request KartKrew/Kart-Public!196
 2020-08-19 20:36:06 -04:00
Sal
ed41d5df9e Merge branch 'kart-io' into 'next' 
Lua Input/Output library

See merge request KartKrew/Kart-Public!200
 2020-08-19 20:35:56 -04:00
Ashnal
cadb4719cf Added m_menu_mutex to M_Drawer in connection screen 2020-08-19 19:52:24 -04:00
Ashnal
648a950ac8 Merge remote-tracking branch 'public/next' into conenction-screen-improvements 2020-08-19 19:08:33 -04:00
Ashnal
7c5740d98f COnfirm box now respects rebindable accelerate and brake on keyboards 2020-08-19 18:01:56 -04:00
Sal
8ee7443705 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
392b24b769 Merge remote-tracking branch 'stjr/io' into kart-io 2020-08-17 20:22:02 +02:00
Ashnal
eb81bea943 Move code down so declarations are above to appease C90 2020-08-17 04:03:02 -04:00
Ashnal
03150e5fe6 Move declaration to appease C90 
also remove some extra tab characters
 2020-08-17 03:56:13 -04:00
Ashnal
afc6bdbc7e Fixes for file accounting 
mainwads+1 to not use the first mainwad
 2020-08-17 03:51:19 -04:00
Ashnal
9a9d81bbe0 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
41a401f703 Merge branch 'master' into next 2020-08-17 02:05:31 -04:00
James R
2f32891919 Do not multithread loading the first config 
Resolution in particular relies on this to be done in order...
 2020-08-16 22:44:42 -07:00
James R
7a05a8acf7 Do not do master server things when NOCURL 2020-08-16 21:42:58 -07:00
James R
5dc3ca3934 Remove HAVE_CURL guards on sending httpsource 2020-08-16 20:39:46 -07:00
James R
680d802d10 Fix major bruh 2020-08-16 20:07:14 -07:00
Sally Coolatta
df0cc6a727 No previous prototype for K_DropKitchenSink 2020-08-16 21:18:33 -04:00
James R
da6c159012 Fix bruh 2020-08-15 21:18:29 -07:00
James R
d0e7ba309a Multithread the exec command 
The command itself can be entirely multithreaded, but the reason I did so was
just for findfile, which can block for a long time on a slow disk.
 2020-08-15 20:55:44 -07:00
James R
c334230bb0 CONS_Printf: don't blit the screen during startup if this isn't the main thread 2020-08-15 20:55:11 -07:00
James R
db417a8761 Don't work on mutexes or conditions if threads are stopped 2020-08-15 20:52:16 -07:00
James R
346f5c95f5 Mutexes for z_zone stuff 2020-08-15 20:51:31 -07:00
Kimberly Wilber
1bfcec9242 [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
f800159bb8 Improve total downloads bar 
Now has total file size AND number of files
 2020-08-15 01:03:45 -04:00
James R
a772096757 dumbass doesn't test changes before pushing directly to next 
(cherry picked from commit be14b8a564a89a5afb84ac19f1586f3db7f68367)
 2020-08-14 08:27:25 -07:00
Sal
06f36224ee 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
1a1c215a91 Add http-mserv to fuck 2020-08-09 23:32:43 -07:00
Sal
9590a769ba 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