Commit graph

7235 commits

Author SHA1 Message Date
Sal
4cec473d6f Merge branch 'cvar-default-suggestions' into 'master'
A few cvar default suggestions

See merge request KartKrew/Kart-Public!263
2022-03-29 22:19:02 +00:00
Sal
7b113b5f39 Merge branch 'Rocket-sneaker-cleanup' into 'next'
Properly detach rocket sneakers when the player dies

See merge request KartKrew/Kart-Public!271
2022-03-29 22:18:30 +00:00
Sal
4d6c57551c Merge branch 'discod-join-minor-improvements' into 'master'
Discord joins now force menu close and title demo stop

See merge request KartKrew/Kart-Public!270
2022-03-29 22:17:55 +00:00
Sally Coolatta
6c8938af6b not on player join 2022-03-29 17:17:57 -04:00
Sally Coolatta
a031998f5f Fix compile errors 2022-03-29 15:46:02 -04:00
Sally Coolatta
fce57a1027 startedInFreePlay 2022-03-29 15:42:31 -04:00
U-DESKTOP-Q6QDT0F\PC
abd7ecef72 from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/840?commit_id=0d92bf3dd09cd4712a63fc79cc7520ed18556bf6 2022-03-23 08:18:56 -03:00
U-DESKTOP-Q6QDT0F\PC
46b1effacd from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1192 2022-03-23 08:18:56 -03:00
minenice55
a88c115b84 port P_CheckSight from vanilla
mostly a copy/paste job, this fixes issues with certain sloped surfaces improperly obstructing sight (ported files from srb2 commit 4c9b83b6bdd8cd3e2626505940de75668e3db0c2)
2022-01-11 19:52:50 -05:00
toaster
71d49bcc3b With Sal's feedback, make nospectategrief get set 20 seconds into the map, not on lap 3 2021-12-15 23:21:43 +00:00
toaster
d398698729 Per Sal's request (slightly modified):
* Do not allow any joining spectators if anybody got onto the last lap while not in FREE PLAY (this is the same condition as nospectategrief, for consistency).
* Reset nospectategrief to 0 if there is literally nobody playing, to prevent a fully locked-out server.
* This means it's not a problem to reset spectatorreentry even with the map command.
* Change the default for spectatorreentry to 30 seconds, from 60.
2021-12-15 17:28:31 +00:00
toaster
19ac63bd6c Fix for beocming a spectator while an SPB is on your trail having it continue to follow you around. Done here because it's related to spectators messing up other people's fun. 2021-12-08 20:57:52 +00:00
toaster
bac683085c Disable the "%s became a spectator" message if you haven't actually entered the game, to prevent an avenue for spam. 2021-12-04 15:59:24 +00:00
toaster
d557b7f962 Allow antigrief to be tested in dev builds (copy of internal commit) 2021-12-03 20:41:57 +00:00
toaster
375a635c8a Merge branch 'spectator-little-things' of https://git.do.srb2.org/KartKrew/Kart-Public.git into public_speclil 2021-12-02 18:07:50 +00:00
toaster
71f2d638e6 Merge branch 'next' of https://git.do.srb2.org/KartKrew/Kart-Public.git into public_next
# Conflicts:
#	src/f_finale.c
2021-12-02 17:42:50 +00:00
toaster
56df30a009 Merge branch 'credits-update-14' into 'public_next'
Credits changes for 1.4

See merge request KartKrew/Kart!469
2021-12-02 16:58:53 +00:00
James R
1cd08dc5f1 Add Ivo's name to the credits 2021-11-29 14:05:33 -08:00
James R
07d5cbcab0 Remove name at contributor's request 2021-11-29 13:53:45 -08:00
SteelT
fd88c139a6 Merge branch 'master' into next 2021-11-21 16:01:29 -05:00
SteelT
651d04f91b Merge branch 'opulence' into 'public_next'
Add Opulence objects

See merge request KartKrew/Kart!442
2021-11-04 22:31:12 +00:00
Ashnal
55055b7536 Small logging improvements for addon loading
Adds back the "Loading file" message when a file is loaded
Adds individual file errors for things loaded with W_InitMultipleFiles (-file param)
Errors for a given file will now appear between "Loading file" and
the "Added file" or "not adding file" messages, making troubleshooting easier
2021-09-25 18:04:46 -04:00
Ashnal
f4bf6edfe6 Properly detach rocket sneakers when the player dies
This includes both death pits and spectating
2021-09-12 23:06:18 -04:00
Sal
520b1f2a75 Merge branch 'linespecial-fixes-jug' into 'next'
Delayable linedefs crash fix

See merge request KartKrew/Kart-Public!269
2021-09-12 00:09:15 +00:00
Sal
8cd205cd28 Merge branch 'freeslot-errors' into 'master'
Error checking for running out of freeslots

See merge request KartKrew/Kart-Public!267
2021-09-12 00:09:01 +00:00
Ashnal
a2900c8811 Discord joins now force menu close and title demo stop
This prevents wierdness from ahving the menu open on teh connection screen
It also prevents the connect command from erroring due to being in a demo
2021-09-10 20:25:13 -04:00
JugadorXEI
ab2bbf3b08 validation against mo (guards against delays) 2021-09-07 22:09:03 +02:00
Ashnal
d303f1b203 Increase Mobj Freeslot limit to 1024 from 512 2021-09-06 16:51:34 -04:00
Ashnal
c8cec767d5 Upgrades P_PatchInfoTables to use 4 digit tempnames, suppoing up to 9999 freeslots 2021-09-06 16:41:50 -04:00
Ashnal
6e7bdc6031 Changed readfreeslots error checking to work like lib_freeslot
Uses loop variable to determine error condition
Also small change to lib_freeslot for SFX for consistent use of I_Error
2021-09-06 16:12:33 -04:00
Ashnal
4b750e0504 Adjust S_AddSoundFx to also use I_Error when exhausting Freeslots 2021-09-06 16:12:13 -04:00
Ashnal
f5bcfc6379 Add I_Errors for when the game exhausts all freeslots of any type. 2021-09-06 16:11:57 -04:00
SteelT
82b1499eb0 Merge branch 'master' into next 2021-09-05 01:30:12 -04:00
Sal
e66eaf001e Merge branch 'james-full-name' into 'master'
Add my full name in the credits

See merge request KartKrew/Kart-Public!264
2021-08-31 04:31:14 +00:00
James R
0fc6ae9873 Update rendezvous server to kartkrew.org 2021-08-30 20:02:54 -07:00
James R
0f122fd5dd Don't accept hole punch requests to local network 2021-08-30 19:00:28 -07:00
James R
64ff789f2f Add my full name 2021-08-30 18:45:56 -07:00
James R
eab8f99eab Document the hole punching protocol 2021-08-30 18:31:17 -07:00
James R
df59f3580d Don't do anything hole punching related if rendezvousserver is unset 2021-08-30 18:27:52 -07:00
James R
307cdf7039 Don't request hole punch to self, and don't register local server for hole punching 2021-08-30 16:52:15 -07:00
James R
b5086b848b Ignore zero length packets 2021-08-30 16:52:14 -07:00
James R
ba5b6aa7af Hole punching 2021-08-30 16:52:13 -07:00
lachablock
4ed6c3665a Add missing explicit break 2021-08-20 20:03:55 +10:00
Ashnal
452390872b Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart-Public into HEAD 2021-08-19 22:50:50 -04:00
Ashnal
dc447c07e9 A few netgame default improvements
Increase timeouts by a few seconds, helps folks joining with slow disks
Beef up the vanilla downloader settings
2021-08-19 22:41:50 -04:00
Ashnal
b0724506bb Set drift and item default axis binds to None 2021-08-19 22:22:23 -04:00
Ashnal
a35d4ea5f4 Switched checking files mode to use a progress bar
Changed the confirmation prompt use MB if >=10MB
Changed the ovearall progress bar to use MB if >=10MB
2021-08-19 21:49:40 -04:00
Sal
52879a7632 Merge branch 'instashield-fix' into 'next'
Instashield crash fix

See merge request KartKrew/Kart-Public!260
2021-08-08 03:27:54 +00:00
JugadorXEI
1d62fb8eb3 Fix duplicated matchgenericflags (was causing crash) 2021-08-07 16:41:22 +02:00
JugadorXEI
31b3a9ac90 Merge branch 'next' of https://git.do.srb2.org/KartKrew/Kart-Public into next 2021-08-05 17:27:57 +02:00