Sally Coolatta
6ca451da45
Wrong file
2020-08-30 23:26:00 -04:00
Sally Coolatta
7dea9d28b9
Dedicated servers can change discordinvites without needing RPC support
2020-08-30 23:20:06 -04:00
James R
5e9c197f8a
Merge remote-tracking branch 'origin/master' into next
2020-08-30 19:01:04 -07:00
Sal
b0f89a5dba
Merge branch 'easy-colors' into 'master'
...
Caret color codes in server name
See merge request KartKrew/Kart-Public!218
2020-08-30 21:49:03 -04:00
James R
daf6e66268
Fix stupid NONET
...
(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
2020-08-29 18:19:39 -07:00
Sally Coolatta
82bfdf9ccc
Add join/leave notification sounds
2020-08-27 20:10:25 -04:00
Sally Coolatta
17318ceec7
This should be set for server too!!
2020-08-27 19:36:37 -04:00
Sally Coolatta
51dce9707f
Attach initial join discord info to servercfg, so that we don't have a pause from needing to also send XD_DISCORD
...
XD_DISCORD is now reserved for when the options are changed mid-game
2020-08-27 19:14:45 -04:00
James R
54c3aed86c
Convert caret color codes to SRB2 color codes
2020-08-27 15:44:06 -07:00
James R
f802e9fbcb
Convert from caret colors when sending SERVERINFO
2020-08-27 15:43:20 -07:00
Sally Coolatta
cb5ab33a93
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
Sal
34b6998b2e
Merge branch 'various-compiling-fixes' into 'next'
...
Various compiling fixes
See merge request KartKrew/Kart-Public!212
2020-08-25 18:36:51 -04:00
Steel Titanium
c6164a1947
Initialize this variable
2020-08-24 01:25:34 -04:00
Steel Titanium
41c742a699
Hopefully the last time...
2020-08-24 01:18:38 -04:00
Steel Titanium
87d2ad0c23
Remind me why NONET exists?
2020-08-24 01:13:59 -04:00
Steel Titanium
04b7051141
This is just stupid
2020-08-24 01:06:10 -04:00
Steel Titanium
509c57a8d6
Haha NONET...
2020-08-24 00:56:53 -04:00
James R
5daaef7e87
Avoid underflow hacks completely with asktime
2020-08-22 18:38:20 -07:00
Sally Coolatta
5de27be169
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-22 07:28:21 -04:00
Sally Coolatta
3c128660b4
Add envelope icon, add sounds
2020-08-22 04:54:08 -04:00
Sally Coolatta
98f586a2f9
Menu is pretty now
2020-08-22 03:52:07 -04:00
Sally Coolatta
571c670670
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 01:53:27 -04: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
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
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
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
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
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
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
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
Sally Coolatta
f5bd9d097f
Merge remote-tracking branch 'public/master' into discord-rpc-support
2020-08-16 22:12:36 -04:00
Sally Coolatta
c8fa1dcfb5
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-16 20:57:31 -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
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
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
AJ Martinez
8284caf1bc
Clarify addon-related messages
2020-08-05 00:40:56 -05:00
Ashnal
2c0671d8fd
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
7da3d70f6c
Remove Checking Files spam
2020-07-02 21:48:45 -04:00
Ashnal
774b917c0e
Correct total files to load off by one
2020-07-02 17:47:10 -04:00
Ashnal
6fe8a6c96a
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
03d479fdb6
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
