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
Sally Coolatta
df0cc6a727
No previous prototype for K_DropKitchenSink
2020-08-16 21:18:33 -04:00
Sally Coolatta
c8fa1dcfb5
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-16 20:57:31 -04: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
James R
9d9f8fd8a3
Bump MAXNETNODES to 127
2020-08-09 18:26:34 -07:00
Ashnal
cc78ef2c78
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
4c5eb0d6bc
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
97c4e7dfff
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
c63022350d
Merge branch 'master' into next
2020-08-06 12:15:55 -04:00
AJ Martinez
3dada09aa5
Fix Hyudoro cooldown never resetting
2020-08-06 10:51:53 -05:00
AJ Martinez
2add55eb04
Fix indirect item cooldown never resetting
2020-08-06 10:34:16 -05:00
Sal
b320256a47
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
8284caf1bc
Clarify addon-related messages
2020-08-05 00:40:56 -05:00
Sal
8791fd8835
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
341ce8f4a3
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
6d0b1e93c6
Appease C91
2020-07-23 21:05:00 -04:00
Ashnal
733aefa64a
Also lets do this for kitchen sinks
...
They also ignored in K_DropHnextList
2020-07-23 20:12:35 -04:00
