Sally Coolatta
ed88e4dd7c
This should be set for server too!!
2020-08-27 19:36:37 -04:00
Sally Coolatta
5e9e3e163d
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
7a19d9a9df
Convert caret color codes to SRB2 color codes
2020-08-27 15:44:06 -07:00
James R
dcad2cd1fa
Convert from caret colors when sending SERVERINFO
2020-08-27 15:43:20 -07:00
Sally Coolatta
54c487feff
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
Sal
f93c5f435d
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
James R
df4d57aab4
Do not reset nodetoplayer before XD_REMOVEPLAYER
2020-08-24 20:23:54 -07:00
James R
48d071451e
servertics_pak.starttic -> UINT8
2020-08-24 19:48:11 -07:00
Steel Titanium
23b1f8fc5e
Initialize this variable
2020-08-24 01:25:34 -04:00
Steel Titanium
94ca85b229
Hopefully the last time...
2020-08-24 01:18:38 -04:00
Steel Titanium
6c0c0d710f
Remind me why NONET exists?
2020-08-24 01:13:59 -04:00
Steel Titanium
0021128446
This is just stupid
2020-08-24 01:06:10 -04:00
Steel Titanium
858f345802
Haha NONET...
2020-08-24 00:56:53 -04:00
Louis-Antoine
0846079c06
Fix bonus items sometimes overriding apples in Snake minigame
2020-08-24 00:34:44 +02:00
Sryder
23ec089d51
Fix splitscreen joining destroying textcmd buffer
2020-08-23 19:18:02 +01:00
Hannu Hanhi
baaf19249b
Add tic and ui times to render stats
2020-08-23 20:09:55 +03:00
James R
481f8c2caa
Avoid underflow hacks completely with asktime
2020-08-22 18:38:20 -07:00
Sally Coolatta
8c79d62b22
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-22 07:28:21 -04:00
Sally Coolatta
1899b31fa7
Add envelope icon, add sounds
2020-08-22 04:54:08 -04:00
Sally Coolatta
5cab1b7b23
Menu is pretty now
2020-08-22 03:52:07 -04:00
Sally Coolatta
b761349076
Add some options, maxplayer/allownewplayer dont need to be netvars anymore
2020-08-22 01:53:27 -04: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
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
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
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
Sally Coolatta
3e446a167c
Restructure how damage works in kart COMPLETELY
...
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
Sryder
ac68aeae2b
Fix building of debug binary
2020-08-18 15:32:09 +01:00
Sally Coolatta
75d05702fb
Fix Got_AddPlayer
2020-08-18 04:14:17 -04:00
Sally Coolatta
f5bf0371de
Revert "TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig"
...
This reverts commit 49e2f98beb
2020-08-18 03:54:31 -04:00
Sally Coolatta
0576729ff4
Update presence when maxplayers is changed
2020-08-17 06:52:46 -04:00
Sally Coolatta
1d5251e1f1
Fix ZONE being all caps, standardize the function comments
2020-08-17 06:13:32 -04: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
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
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
b5a378f850
Merge remote-tracking branch 'public/master' into discord-rpc-support
2020-08-16 22:12:36 -04:00
Sally Coolatta
632df264a3
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-16 20:57:31 -04:00
Sally Coolatta
a251c3909b
Lots of little fixes
...
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
2020-08-16 00:29:04 -04:00
Sally Coolatta
49e2f98beb
TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig
...
Bare minimum for levels to load again, need to figure out why the 2.2 merged version isn't working
2020-08-16 00:15:05 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -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
065471392c
Disable showjoinaddress by default
2020-08-14 21:05:23 -07:00
Louis-Antoine
8471f9e71f
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
...
# Conflicts:
# src/d_clisrv.c
# src/d_clisrv.h
# src/d_net.c
# src/p_saveg.c
# src/p_saveg.h
2020-08-13 13:53:10 +02:00
