Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
Lachlan Wright
b37d6ba94d
Merge branch 'name-change-spam' into 'next'
...
Don't let players change their name more than five times per minute
See merge request STJr/SRB2!1155
2020-09-25 09:36:39 -04:00
Lachlan Wright
1ec61bb8f4
Merge branch 'clarity' into 'next'
...
Add-on clarity from Kart
See merge request STJr/SRB2!1153
2020-09-25 09:33:04 -04:00
Lachlan Wright
9f58d6f053
Merge branch 'snake-fixes' into 'next'
...
Fix bonus items sometimes overriding apples in Snake minigame
See merge request STJr/SRB2!1134
2020-09-25 09:23:33 -04:00
Lachlan Wright
0060bac482
Merge branch 'more-stats' into 'next'
...
Add tic and UI times to render stats
See merge request STJr/SRB2!1125
2020-09-25 08:54:01 -04:00
James R
c0abb2ca09
Don't let players change their name more than five times per minute
...
(ported 29488856604e9d006c37
2020-09-22 12:04:28 -07:00
toaster
2e922a3673
Null out the messages Sal added while trying to fix the thing
2020-09-22 13:21:24 +01:00
toaster
e053fd249b
Game works now
2020-09-22 13:19:35 +01:00
Sally Coolatta
ef8f2e6fa4
Minor touchups to netcode
2020-09-22 01:53:28 -04:00
Sally Coolatta
99a1bacb81
Turning code overhaul
...
Packet drops are still broken, but at least netgames are playable now.
2020-09-22 00:35:44 -04:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
Zippy_Zolton
bf857e1c59
Add-on clarity from Kart
2020-09-20 13:07:28 -05:00
James R
15cb3202e2
Merge branch 'master-server-2' into 'next'
...
Master Server 2
See merge request KartKrew/Kart-Public!224
2020-09-12 20:25:42 -04:00
James R
7b1f974397
Basically, update master server code to v2
...
Removes rooms, replaced with cv_advertise and "Advertise" on the host menu.
According to the new API, SRB2APPLICATION is sent instead of MODID. A contact
field was added, but there is no means of accessing it or setting it.
As a slight change, the server list will be populated even on an outdated
version of the game. (The new API was designed with this in mind.) The update
alert is still presented first of course.
2020-09-11 06:11:41 -07:00
James R
2948885660
Don't let players change their name more than five times per minute
2020-08-31 20:08:22 -07:00
Sally Coolatta
1a0e134d10
Bruh, lowercase
2020-08-30 23:31:54 -04:00
Sally Coolatta
40b0a2479e
Wrong file
2020-08-30 23:26:00 -04:00
Sally Coolatta
2d7c835c4d
Dedicated servers can change discordinvites without needing RPC support
2020-08-30 23:20:06 -04:00
James R
ffff6accce
Merge remote-tracking branch 'origin/master' into next
2020-08-30 19:01:04 -07:00
Sal
d55e5e8d8d
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
754347987d
Fix stupid NONET
...
(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
2020-08-29 18:19:39 -07:00
James R
e6c914c7b2
Fix stupid NONET
2020-08-29 17:51:59 -07:00
James R
d31fb748b2
Do not do master server things when NOCURL
...
(cherry picked from commit b681b6e9e6
2020-08-29 17:45:28 -07:00
Sally Coolatta
18a7f1b3f6
Add join/leave notification sounds
2020-08-27 20:10:25 -04:00
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
