Commit graph

23653 commits

Author SHA1 Message Date
VelocitOni
19fa5c09db Merge branch 'master' into directional-lighting-flag 2023-07-29 02:24:12 -04:00
toaster
9171992a9f Merge branch 'inter-duel' into 'master'
Intermission - DUEL mode

See merge request KartKrew/Kart!1354
2023-07-28 22:09:51 +00:00
toaster
421a9f1990 Merge branch 'max-errors' into 'master'
CMakeLists.txt: add -fmax-errors=5 for GNU

See merge request KartKrew/Kart!1357
2023-07-28 21:54:55 +00:00
toaster
1b5d59746f Adjustments/fixes to Duel Intermission view
- Always show, even in online
- Add Egga Channel/CPU icon if not a local player-controlled character
    - This fixes an infinite loop crash that could previously affect 1v1s VS bots
2023-07-28 22:21:37 +01:00
Oni
bdad8d59ac Merge branch 'sunbeam-palms' into 'master'
Sunbeam Palm

See merge request KartKrew/Kart!1353
2023-07-28 19:15:37 +00:00
James R
b7d4513fba CMakeLists.txt: add -fmax-errors=5 for GNU
Stops compilation after 5 errors, such as in the case of
cascading errors from a missing semicolon.
2023-07-27 18:37:24 -07:00
James R
3eb356f7b9 Comptime.cmake: get rid of CMake < 3.5 compatibility warning 2023-07-27 18:19:14 -07:00
James R
46406931c1 Toggle all manner of directional lighting with MSF_FLATLIGHTING 2023-07-27 17:49:45 -07:00
James R
49e7357704 Add MSF_FLATLIGHTING 2023-07-27 17:49:26 -07:00
James R
9a262a308c Add missing flags to MSF_LIST 2023-07-27 17:47:59 -07:00
James R
3cf2b27b11 Merge branch 'fix-ring-drain' into 'master'
Fix negative ring count in (460) Award Rings not actually subtracting rings

See merge request KartKrew/Kart!1355
2023-07-27 05:44:54 +00:00
James R
092bfd475e P_ProcessSpecial: fix ring drain sign 2023-07-26 18:05:44 -07:00
toaster
2b4cd831e1 Fix on-screen alignment of Duel Intermission boxes
- Now more consistent between time/score and rankings mode
- Symmetrical if you flipped the screen, no slight rightward bias in placement
2023-07-26 16:51:05 +01:00
toaster
8553581d80 Improved behaviour for skipping second half of intermission in offline games
Instead of tying it directly to the number of players, instead base it on whether the points are important to keep track of.
- Match Race or Time Attack
- No next map override, since points will persist to that one
- No maps queued, so points aren't relevant
    - OR maps are queued but you haven't started them yet, so the points will be discarded
2023-07-26 15:51:39 +01:00
toaster
23f479f365 Intermission - DUEL mode
Show players' appearances on intermissions with less than or equal to 2 players, in port priority order, to mimic Sonic 3 Competition.

Also shows player letter and profile name in Match Race, to really drive the reference home.
2023-07-26 14:31:50 +01:00
toaster
03f9ff0847 Character Select menu: Put B, D on the right side of the PLAYER/profile name text, to avoid overlapping the player's eyes 2023-07-26 14:20:46 +01:00
toaster
f040523b19 Implement the Sunbeam Palm decoration
- Randomised tilt
- Randomised leaf angles
- Technically specifiable number of leaves, but the default of 5 is sane enough
2023-07-25 18:01:07 +01:00
Oni
ddf55d4040 Merge branch 'server-param' into 'master'
-server for map command

See merge request KartKrew/Kart!1350
2023-07-24 23:13:50 +00:00
Oni
0b5cae201e Merge branch 'dont-rewrite-the-past' into 'master'
Don't rewrite the past if we might still need to send it

See merge request KartKrew/Kart!1333
2023-07-24 23:12:41 +00:00
James R
3f162db960 Merge branch 'vres-multiref' into 'master'
Double-free emergency fix for virtual resources

See merge request KartKrew/Kart!1352
2023-07-24 22:53:49 +00:00
toaster
b4197a2263 Double-free emergency fix for virtual resources
- vres_GetMap guarantees the same memory for the same lump id, provided it's active
- vres_Free won't delete curmapvirt unless you do some silly temp pointer stuff
2023-07-24 23:40:30 +01:00
Oni
87aab3c881 Merge branch 'music-joining' into 'master'
Fix music on midgame server join

Closes #473

See merge request KartKrew/Kart!1351
2023-07-23 17:51:47 +00:00
Oni
b82392dee6 Merge branch 'more-conversions' into 'master'
More UDMF conversions

See merge request KartKrew/Kart!1336
2023-07-23 17:24:17 +00:00
Oni
5fbed38c82 Merge branch 'springs-scaled' into 'master'
UDMF upscaled springs: Treat as an increased hitbox only, not as a strength multiplier

See merge request KartKrew/Kart!1346
2023-07-23 17:22:52 +00:00
Oni
e2aea58474 Merge branch 'louder-wavedash' into 'master'
Play wavedash sounds at full volume

See merge request KartKrew/Kart!1348
2023-07-23 17:22:36 +00:00
Oni
7912b24e6f Merge branch 'rivals-fix' into 'master'
Rivals and Replays and Re-Entry, oh my

Closes #544 and #577

See merge request KartKrew/Kart!1340
2023-07-23 17:21:06 +00:00
toaster
2dbb11af89 Use S_AttemptToRestoreMusic to handle music after server connection
Resolves #473
2023-07-22 19:24:25 +01:00
toaster
2fd7c7717c P_StartPositionMusic
Consistently sets position or encore hum for multiple contexts
Now can be used in P_RestoreMusic for restoration purposes
2023-07-22 18:55:49 +01:00
toaster
7c952e3509 Tidy P_LoadLevel music starting a little 2023-07-22 18:32:50 +01:00
toaster
67a1fda79b Permit starting a netgame or match race from the console via the map command
None of the following can be combined together, and Grand Prix is still the default with no parameter from the menus.

- `-server`
    - Starts a server
- `-match`
    - Starts a Match (Race) round
- `-skill`
    - Already existed, but can now only be used for GP

Also guarantees the main menu wil be closed, which wasn't previously guaranteed.
2023-07-22 17:02:53 +01:00
toaster
3d383f209e Got_TeamChange: Applying PF_WANTSTOJOIN is NOT a playstate change 2023-07-22 14:37:34 +01:00
toaster
39d9dc99aa FinalisePlaystateChange: Don't reset spectatorReentry timer if it's already nonzero 2023-07-22 14:33:32 +01:00
toaster
e0b47b16e7 Improve Spectator entry handling
- Re-entry SHOULDN'T get stuck nonzero on first join for a given node
    - Set to 0 for all players on level start
    - Set to 0 for all players on level end
    - DEFINITELY never intentionally set on join with teamchange finalisation
    - This basically just prevents people from spamming New Challenger after hopping out mid-session, since the previous version, in addition to being buggy, was a little annoying.
- New Challenger no longer happens on tic 0 of mapload
    - Handles any late, pending PF_PF_WANTSTOJOINs without threat of reset in P_PostLoadLevel
2023-07-22 14:03:11 +01:00
toaster
4885611f47 Move ACS script loading back to P_DoLoadLevel, since on second thought it's just LOADING and not executing anything 2023-07-22 13:17:17 +01:00
toaster
859b3fa350 On second thoughts, let's be EXTRA careful to avoid any potential double frees. 2023-07-22 13:17:17 +01:00
toaster
bf8d09980d G_DoPlayDemo: Make sure buffer is NULL so you can watch replays immediately after recording them.
This is yet another g_demo.c-specific hack, and has been marked as such.
2023-07-22 13:17:16 +01:00
toaster
5b4fc18264 P_PostLoadLevel: Move all events directly requiring finalised player lists into this function
- Grand Prix (& backup) and Match Race bot initialisation
    - Fixes rival selection
- P_InitPlayers
    - Has to be after bot init
- Beginning of demo recording
    - Grand Prix and Match Race replays appear to both function far better, and equivalently to boot.
        - A desync in "RNG seed 24" is reported. This is PR_BOTS. This is the only notable desync I can see!
- ACS_LoadLevelScripts
    - I'm not ironclad sold on this being the forever home, but it's also a not-from-netsave thing, and barring external input I could see some scripts being dependent on a finalised player list.
2023-07-22 13:17:16 +01:00
toaster
b4bd8f428d Permit lowercase enum grabs for sounds in get_number outside of Lua
A different solution to the issue reported on the SRB2 port of this branch. We don't care quite as much about exact game behaviour, so this permits lowercase sound effects (same as the source code) in maps' stringargs.
2023-07-21 16:20:25 +01:00
AJ Martinez
5d144243e5 Play wavedash sounds at full volume 2023-07-21 00:48:41 -07:00
James R
7c3d3282f0 Merge branch 'console_sanity' into 'master'
Console Sanity

Closes #517

See merge request KartKrew/Kart!1344
2023-07-19 22:17:10 +00:00
toaster
63450740ba Linedef type 460: Don't do anything in Spheres gametypes 2023-07-19 22:54:20 +01:00
toaster
c404e704c2 Linedef type 460: ACTUALLY don't push your rings below baseline 2023-07-19 22:54:05 +01:00
James R
41df845f05 Merge branch 'stumble-stumbles' into 'master'
Whumble

Closes #522

See merge request KartKrew/Kart!1342
2023-07-19 21:54:00 +00:00
toaster
ba7307b425 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into more-conversions 2023-07-19 22:46:49 +01:00
James R
6f4d014ebb Merge branch 'get-ourip-once' into 'master'
Fetch the server IP once

See merge request KartKrew/Kart!1337
2023-07-19 21:39:47 +00:00
James R
729932fed5 Merge branch 'encore-dot' into 'master'
Correctly flip minimap player icon dot in encore mode

Closes #582

See merge request KartKrew/Kart!1347
2023-07-19 21:38:48 +00:00
toaster
55cda3dd5c Correctly flip minimap player icon dot in encore mode
Resolves #582
2023-07-19 22:29:43 +01:00
toaster
f9e11be98a UDMF upscaled springs: Treat as an increased hitbox only, not as a strength multiplier 2023-07-19 21:27:58 +01:00
toaster
e3d0662c7d Remove even a mention of the slur that once sat here 2023-07-19 21:23:27 +01:00
toaster
050fa56d64 Merge branch 'player-pointer-deletion' into 'master'
Player Pointer Deletion

Closes #529 and #576

See merge request KartKrew/Kart!1341
2023-07-19 14:23:19 +00:00