Commit Graph

7315 Commits

Author SHA1 Message Date
X.organic 002c75e9e2
Merge branch 'uint8-wads-and-skins' into futurepk3
Worth doing now that that's been merged into next. Also pulls in a
little bit of master.
2022-08-23 03:19:28 +02:00
Eidolon 377ed30207 Merge branch 'cmake-remove-win32' into 'master'
cmake: remove win32 subdirectory

See merge request KartKrew/Kart-Public!296
2022-08-23 00:49:45 +00:00
Eidolon 72120025e6 cmake: remove win32 subdirectory 2022-08-22 19:43:59 -05:00
Sal 153b5acc84 Merge branch 'x-y-deadzone' into 'master'
Make separate deadzones for x/y axis + menu options

See merge request KartKrew/Kart-Public!265
2022-08-22 23:47:49 +00:00
Sal 9160c6bef4 Merge branch 'uint8-wads-and-skins' into 'next'
Increase maximum WAD and skin counts

See merge request KartKrew/Kart-Public!291
2022-08-22 23:47:05 +00:00
Lonsfor 75efde143b
Separate deadzones for menus 2022-08-22 15:52:22 -04:00
Lonsfor c9a6f9f9a3
Change minimum deadzone for menus from 3/4 to 1/2 2022-08-22 15:52:22 -04:00
Lonsfor 8724b01ae4
Set minimum deadzone for menus and prevent setting deadzone to 0 (c Ashnal) 2022-08-22 15:52:22 -04:00
Lonsfor 080a4f080a
Menu options for deadzones 2022-08-22 15:52:22 -04:00
Lonsfor 0e1a91c655
Separate deadzones for players 2 3 and 4 2022-08-22 15:52:20 -04:00
Lonsfor 2dd21de302
Add separate x/y deadzones 2022-08-22 15:50:27 -04:00
X.organic f92c5b96ac
Fix a performance regression in query functions
This commit brings back the old code for W_CheckNumForNamePwad, using memcmp
instead of strncmp, which is readily inlined by modern C compilers and has
more acceptable performance in P_AddWadFile. Also removes some redundant
strlens, saving the result of one call instead.

This commit increases this branch's distance from SRB2 2.2, per Ashnal
and SteelT's note that I shouldn't worry too much about it, especially
when there's performance on the line.
2022-08-22 13:25:24 +02:00
X.organic 3305303ea7
Merge branch 'master' (1.5) into futurepk3 2022-08-21 22:10:12 +02:00
James R 08f49671ef Send ASKINFO packet after hole punching
Time spent in I_NetRequestHolePunch no longer counts
toward ping measurement in the server list.
2022-08-21 04:15:59 -07:00
James R 1551e4572d Do not query DNS for holepunchserver more than once per tic 2022-08-21 03:45:55 -07:00
X.organic b4ebbbad89
Remove the last SINT8 handling skin indices
Thanks to Callmore's insistence on me sweeping through functions that
return -1 on error.
2022-08-21 11:50:02 +02:00
Eidolon 2f17fdca6c Merge branch 'match-refresh-vsync' into 'master'
Don't sleep w/ fpscap 0 and vsync enabled

See merge request KartKrew/Kart-Public!294
2022-08-20 21:23:50 +00:00
Eidolon f008e63037 Don't sleep w/ fpscap 0 and vsync enabled 2022-08-20 15:55:17 -05:00
X.organic 477c848615
Bring the maximum WAD file count up to 255
Per @TehRealSalt's recommendation.
2022-08-20 21:45:22 +02:00
Eidolon 6514d3cfc3 Merge branch 'interp-visportals' into 'master'
fix portal interp view positioning and camera reset

Closes #14 and #12

See merge request KartKrew/Kart-Public!293
2022-08-20 18:48:27 +00:00
Eidolon ca5884cf5e reset cam interpolation on P_ResetCamera 2022-08-20 13:42:34 -05:00
Eidolon a3bc32f7a0 fix portal interp view positioning 2022-08-20 13:00:37 -05:00
Sal a37ae53ff7 Merge branch 'cmake-15-fixes' into 'master'
Various fixes for 1.6

Closes #17, #15, and #11

See merge request KartKrew/Kart-Public!292
2022-08-20 17:26:02 +00:00
Eidolon 593cbbea65 Don't popup MS rules in dedicated mode 2022-08-20 12:20:09 -05:00
Eidolon af3df72c29 cmake: build sdl target with threads support 2022-08-20 12:13:48 -05:00
Eidolon b426602b24 cmake: remove patch.dta from assets script 2022-08-20 12:05:53 -05:00
X.organic d820b8e0c7
Increase maximum skin count to 255
This time without spare slots, because I don't see shenanigans like
WAD_MUSIC happening with skin indices. Verified to work by saving a
replay with 139 skins as the 133th skin and playing it back a few times.
Shouldn't cause issues with netcode either because there are no SINT8s
handling skin indices.
2022-08-20 14:08:14 +02:00
X.organic 09ae350603
Increase maximum WAD count to 250
Can be increased up to 255 safely, just not 256. 5 slots left for
shenanigans like Moe Mansion's WAD_MUSIC.
2022-08-20 14:05:32 +02:00
James R 993b3c96ac Update version to 1.5 2022-08-19 21:19:42 -07:00
James R 2edc840037 Draw PINGD before delay number 2022-08-19 21:13:05 -07:00
James R 54b5955a74 Ping counter: change patch name PINGF to PINGD
Update gfx.kart hash
2022-08-19 20:45:16 -07:00
James R be3dfa45d0 Rename rendezvousserver to holepunchserver 2022-08-19 20:19:45 -07:00
James R f2534f8cb5 Master server: use I_OutputMsg during startup
CONS_Printf calls CON_Drawer during startup, thread
collision stuff.
2022-08-19 20:05:05 -07:00
James R 2137a096e6 Reset remotenode when discarding STUN/hole punch packet
Fixes some wild behavior when a lot of hole punching
requests are coming in.
2022-08-19 19:55:08 -07:00
X.organic 8cd9b64716
Merge branch 'master' (1.4) into futurepk3
Now that 1.4 is out, maybe this will come in handy in 1.5, should 1.5 be
released. If not, I guess Ring Racers will make this branch redundant
once that comes out.
2022-08-20 03:10:32 +02:00
toaster c5e131460e Finalise credits for real. 2022-08-19 22:30:23 +01:00
James R c6e3f780e7 Revert "Merge branch 'consoleplayer-dedicated' into 'next'"
This reverts commit 5ec44ba3fa, reversing
changes made to 4c5d69b714.
2022-08-18 18:14:23 -07:00
toaster f2017fd31a Only display master server rules popup once per game boot.
Doesn't prevent it from happening later if the rules weren't successfully fetched, though.
2022-08-17 13:52:31 +01:00
X.organic b3dd979762
Finish SRB2 2.2 PK3 loading backport
Implements W_VerifyPK3, thus allowing music PK3s - even those created
with an archiver, thanks to the preceding commit - to be loaded as
"unimportant" files, like music WADs can be.
2022-08-16 21:54:04 +02:00
toaster 5812d7343d maps.kart hash finalised. 2022-08-16 20:39:48 +01:00
toaster 426b089d1d Fix VHS effect speeding up with interpolation. 2022-08-16 20:37:19 +01:00
toaster 2733571d27 Fix the interp-related Ancient Tomb FOF flickering.
Notably caused by a difference in behaviour between Software and GL that was already resynchronised in the 2.2 codebase.
2022-08-16 20:08:52 +01:00
X.organic 0a12b025ff
Start of SRB2 2.2 PK3 loading backport
Backports the fixed ResGetLumpsZip code, registration of longname
fields and support for PK3s without trailing directory entries.
2022-08-16 20:36:51 +02:00
toaster 9e3fdfeeb7 Update maps.kart hash one more time... 2022-08-13 12:07:30 +01:00
toaster c09f5c0425 Fix a regression in non-ramp sector (no step down) functionality.
Seems to be a regression in internal too. Requires more analysis on behaviour in the 2.2 engine, but essential for maintaining compatibility in 2.1 (such as with Opulence wobbly carpet).
2022-08-12 22:13:45 +01:00
toaster cf882f4a30 Utilise `execversion` to one-time reset two cvars on upgrade to v1.4.
- `cv_masterserver` - Replaces a hack checking for the original SRB2 MS addres every time, and additionally catches those who tested an early version of the http MS.
- `cv_usegamma` - This was previously WAY too easy to accidentially change. This way, a user who has had this accidentially happen will automatically return to baseline.
2022-08-11 23:46:41 +01:00
toaster a60052b35d Fix changing gamespeed from the menu, for real
I originally wrote a ridiculous attempt at reimplementing the existing value rollaround. For one reason or another, that sidesteps net transmission. Let's just avoid all those hacks and limit our influence to changing the maximum allowed range.
2022-08-11 23:18:48 +01:00
toaster c657a47d56 Don't force a NEW CHALLENGER!! map reset if spectators enter during the introtime.
Doesn't affect the conditions that allow entry -- just avoids pointlessly resetting the map if it occurs during the period where literally nothing can happen.
2022-08-11 22:45:32 +01:00
toaster 66ac4bc309 Fix interp-related skybox freak for splitscreen p1. 2022-08-11 22:37:25 +01:00
toaster 8cbedf789a Copyright update. 2022-08-10 00:13:49 +01:00