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
FlykeSpice
c09cb6d762
Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
FlykeSpice
00137ef4ea
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04: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
James R
1bf0794d6a
Copy the saved wad directory to srb2path
2020-08-17 21:27:59 -07:00
James R
c0cac645f8
hate hate hate hate
2020-08-17 21:22:25 -07:00
Sally Coolatta
234983909a
Don't show gametype when watching replays
2020-08-17 23:33:55 -04:00
James R
2a2d43a20b
Save srb2path to %LOCALAPPDATA%\SRB2Kart\lastwaddir, and chdir here if srb2.srb cannot be found
...
Windows code goes brrr
2020-08-17 20:11:32 -07:00
Latapostrophe
392b24b769
Merge remote-tracking branch 'stjr/io' into kart-io
2020-08-17 20:22:02 +02:00
Sally Coolatta
c76c1b8420
Show game speed and encore
2020-08-17 09:08:05 -04:00
Sally Coolatta
27654ffb6a
Don't allow invites if allowjoin is off
2020-08-17 06:55:43 -04:00
Sally Coolatta
d163f67700
Update presence when maxplayers is changed
2020-08-17 06:52:46 -04:00
Sally Coolatta
83192827dc
Fix ZONE being all caps, standardize the function comments
2020-08-17 06:13:32 -04:00
Latapostrophe
d56fdbb933
Kill line riding for offroad
2020-08-17 12:01:16 +02:00
Sally Coolatta
da5bda72ee
Add distinct images for map hell & normal custom maps
2020-08-17 04:42:22 -04:00
Sally Coolatta
a04361a151
Check supported skins by name instead of number, so we can have bonuschars images
2020-08-17 04:42:05 -04: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
9f4ad1303e
Put the cvar in the menu
2020-08-17 02:31:30 -04:00
Sally Coolatta
886db8cde1
Guard discord.h, add cvar to disable rich presence
2020-08-17 02:25:05 -04:00
Sally Coolatta
41a401f703
Merge branch 'master' into next
2020-08-17 02:05:31 -04:00
Sally Coolatta
8d386fba66
Display time elasped/time limit
2020-08-17 02:05:16 -04:00
James R
7a05a8acf7
Do not do master server things when NOCURL
2020-08-16 21:42:58 -07:00
Sally Coolatta
d709e9782d
Use curl to retrieve your own IP address properly
2020-08-17 00:29:52 -04:00
James R
5dc3ca3934
Remove HAVE_CURL guards on sending httpsource
2020-08-16 20:39:46 -07:00
Sally Coolatta
47f95e22d5
Allow lowercase level name / zone title
...
Might have some other side-effects, we'll need to see
2020-08-16 22:13:21 -04:00
Sally Coolatta
f5bd9d097f
Merge remote-tracking branch 'public/master' into discord-rpc-support
2020-08-16 22:12:36 -04:00
Sally Coolatta
07c916f6d2
Little fixes
2020-08-16 21:31:03 -04:00
