James R
481f8c2caa
Avoid underflow hacks completely with asktime
2020-08-22 18:38:20 -07:00
Sal
64b38df5b9
Merge branch 'dehacked-slipup' into 'next'
...
Correct misplaced MT_ARIDTOAD listing
See merge request KartKrew/Kart-Public!206
2020-08-22 08:16:41 -04:00
lachwright
9feee5348d
Correct misplaced MT_ARIDTOAD listing
2020-08-22 17:35:31 +08:00
Sal
6dace9aeff
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
7c5a969473
Fixed retry timeout to no ttrigger when starting a local server
2020-08-20 23:38:04 -04:00
Ashnal
60cfc091e5
Add return false to the connect timeout
2020-08-20 23:09:12 -04:00
James R
a09592b5da
Merge remote-tracking branch 'origin/master' into next
2020-08-20 19:55:03 -07:00
Sal
d698705f5e
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
4bf5e5a020
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
d9cc5f1627
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
49fa372b8d
Instantaneous lookback camera (v2 backport)
2020-08-20 13:41:03 +08:00
Ashnal
538ec7e61d
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
8ad5eaad2e
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
2c3b30de90
-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 17749b9e3e )
2020-08-19 18:16:54 -07:00
James R
e3a383aafc
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 5921e1a567 )
2020-08-19 18:16:53 -07:00
James R
d365ea7981
Use a random port when connecting
...
(cherry picked from commit 8368449e6c )
2020-08-19 18:16:53 -07:00
James R
328dd607d8
Fix tiny mistake with the last commit
2020-08-19 17:55:01 -07:00
James R
240cc0b1d1
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
6cda24cd2b
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
ed82eda30b
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
810c93f15a
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
37da22c5eb
Added m_menu_mutex to M_Drawer in connection screen
2020-08-19 19:52:24 -04:00
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
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