Commit graph

21399 commits

Author SHA1 Message Date
toaster
d2aed2d49e V_AdjustXYWithSnap: Support top/bottom slides if not V_SPLITSCREEN, V_SNAPTORIGHT, or V_SNAPTOLEFT, but do have V_SLIDEIN 2023-02-16 18:14:31 +00:00
toaster
ae30a24a71 K_MoveExitBeam: PF_NOCONTEST and P_DoPlayerExit to match other special stage failures.
Not a currently accessible codepath, but in-advance fix.: P_DoTimeOver sets exitcountdown effectively unconditionally, which means it can only be used in situations where *every* remaining player is about to explode.
2023-02-16 17:09:13 +00:00
toaster
472d7bf25c Match old behaviour of GTR_BOSS: DMG_TIMEOVER a player that has lost all their bumpers 2023-02-16 17:04:59 +00:00
toaster
fa3b361e2f K_drawStartCountdown: Only show "DUEL" text if you're actually inDuel. 2023-02-16 16:36:32 +00:00
toaster
1b2be7b6c9 K_CheckBumpers, K_HandleBumperChanges: Make 2P behaviour in battle capsules mode function
- Only exit Capsules/Versus round if number of players with no bumpers is equal to number of players in game.
- Apply Eliminated flags in relevant context, to prevent griefing.
2023-02-16 16:35:52 +00:00
toaster
e3eb3ed9f8 Command_Map_f: Guess gametype of map in offline GP, as well as from titlescreen/menu 2023-02-16 15:31:25 +00:00
toaster
97c8d201eb Command_Map_f: Respect value of splitplayers cvar
Permits testing multiple players in GP by your lonesome without having to manipulate multiple controllers at once.
2023-02-16 15:28:31 +00:00
toaster
b2bd5ecccd Merge branch 'blackhole-fault' into 'master'
Fault rework

See merge request KartKrew/Kart!910
2023-02-13 23:23:07 +00:00
AJ Martinez
14fedef403 Revert line fault punish duration (Oni) 2023-02-13 15:54:35 -07:00
AJ Martinez
6996f06ceb Fix line faults doing pflag nonsense 2023-02-13 15:50:00 -07:00
AJ Martinez
c7374c6a91 Increase line fault penalty for similar punishment to old method 2023-02-13 15:32:27 -07:00
AJ Martinez
32ea795639 Fault rework cleanup for merge 2023-02-13 15:31:39 -07:00
toaster
0d8ada50bf Merge branch 'fix-setlinetexture' into 'master'
Fix off-by-one in CallFunc_SetLineTexture

See merge request KartKrew/Kart!919
2023-02-13 18:05:13 +00:00
Sal
95434e91b2 Merge branch '404-not-found' into 'master'
Repair Linedef types 403 and 404 (Resolves #429)

Closes #429

See merge request KartKrew/Kart!920
2023-02-13 17:41:50 +00:00
toaster
24ae5ff65a Repair Linedef types 403 and 404
- P_ProcessSpecial: Correct likely copypaste error in desired plane height and texture
    - Was using sector floor's height and texture instead of ceiling's.
- P_ConvertBinaryLinedefTypes:  assign affected plane in a saner way
- Resolves issue #429
2023-02-13 15:12:53 +00:00
Sally Coolatta
8932ab4e91 Fix off-by-one in CallFunc_SetLineTexture 2023-02-12 17:04:51 -05:00
James R
437944927e Merge branch 'fix-png-get-trns' into 'master'
Fix potential crash in PNG_Read

See merge request KartKrew/Kart!917
2023-02-12 14:22:24 +00:00
Oni
c050e1c340 Merge branch 'unhelpful-super-ring' into 'master'
Use Super Ring 'assistance' only in 1st (fixes #433)

Closes #433

See merge request KartKrew/Kart!918
2023-02-12 03:13:21 +00:00
AJ Martinez
065111af86 Use Super Ring 'assistance' only in 1st 2023-02-11 19:47:41 -07:00
AJ Martinez
de268b744b Beam fault cleanup, make non-circuit death faults respawn at wp behind finish 2023-02-11 19:09:52 -07:00
Oni
3d625b533a Merge branch 'alt-music' into 'master'
Alt Music

See merge request KartKrew/Kart!915
2023-02-11 21:50:15 +00:00
wolfy852
b76557045f Change mapmusrng to UINT8 2023-02-11 08:23:57 -06:00
wolfy852
2c162b50a3 mapmusrng variable, proper sync, cleanup 2023-02-11 08:16:37 -06:00
wolfy852
116d8d8f99 Sanity checking and cleanup 2023-02-11 03:08:46 -06:00
James R
a9469c8ffb Check return value of png_get_tRNS before using trans
png_get_tRNS may not set pointers if it fails.
2023-02-10 18:37:49 -08:00
wolfy852
4dbb7707e7 Have musname actually use MAXMUSNAMES
dunno how I forgot this
2023-02-10 13:26:54 -06:00
wolfy852
b089696021 Add MAXMUSNAMES constant 2023-02-10 13:22:39 -06:00
wolfy852
504788195e Remove crusty unused metatable code
Forgot to nix this in my last commit
2023-02-10 05:07:55 -06:00
wolfy852
3ad0b6fd96 Push musname_size and musname to Lua (correctly, this time) 2023-02-10 01:03:57 -06:00
wolfy852
79a921f59b Merge remote-tracking branch 'remotes/origin/master' into alt-music 2023-02-10 00:16:01 -06:00
wolfy852
a46ba7ab92 UNIT lmfao 2023-02-08 23:16:34 -06:00
wolfy852
53d301112e musname_size variable
Should prevent errors when only 2 music entries are defined
2023-02-08 23:12:41 -06:00
wolfy852
4af4a4e59f Correct a blatant lie in m_random.c, fix RNG range 2023-02-08 22:38:51 -06:00
Oni
1aa9e01419 Merge branch 'cmake-presets' into 'master'
Add CMakePresets.json and Git CLI aliases for CMake

See merge request KartKrew/Kart!871
2023-02-09 04:27:04 +00:00
wolfy852
e1927b693f Correct shadowed declaration and missing include 2023-02-08 22:23:54 -06:00
wolfy852
276cba4641 Basic alt music
mapheaderinfo's musname field is now a 2 dimensional array, it can take up to 3 tracks and will randomly select between them on level load.
2023-02-08 22:11:37 -06:00
Eidolon
c9ab4105da Merge branch 'v_video_cpp' into 'master'
Convert v_video.c to v_video.cpp

See merge request KartKrew/Kart!892
2023-02-08 15:26:00 +00:00
Eidolon
d6aecd2a91 Convert v_video.c to v_video.cpp 2023-02-08 08:06:46 -06:00
Eidolon
cb421eeb06 Merge branch 'r_patch_cpp' into 'master'
Convert r_patch.c to cpp

See merge request KartKrew/Kart!894
2023-02-08 00:43:45 +00:00
Oni
7884bbfed8 Merge branch 'staffghost-repair' into 'master'
Staffghost Repair

See merge request KartKrew/Kart!912
2023-02-07 08:09:22 +00:00
toaster
dc5f6eb991 G_UpdateRecords: Remove console print on RA Medal get as per textual request (UI now communicates this) 2023-02-06 22:38:32 +00:00
toaster
4ebc42d438 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into staffghost-repair 2023-02-06 22:29:24 +00:00
toaster
5a97dab6d4 Merge branch 'minor-cherrypicks-270123' into 'master'
Minor cherrypicks 270123

Closes STJr/SRB2#900

See merge request KartKrew/Kart!905
2023-02-06 22:19:32 +00:00
toaster
45e02b67be Merge branch 'stumble-repair' into 'master'
Stumble damage type repair

Closes #425 and #424

See merge request KartKrew/Kart!909
2023-02-06 22:18:07 +00:00
toaster
3dcc0c038f Merge branch 'bottrack-crash' into 'master'
K_BuildBotTiccmd: Catch NULL track predictions

See merge request KartKrew/Kart!904
2023-02-06 22:16:52 +00:00
toaster
c192acf9a2 Merge branch 'third-page-problems' into 'master'
Third Page Problems

See merge request KartKrew/Kart!911
2023-02-06 22:15:51 +00:00
toaster
daf11a1407 M_LevelListFromGametype: Z_Malloc instead of Z_Calloc for initialisation of cupgrid.builtgrid
A memset is already guaranteed to follow this initialisation.
2023-02-06 20:47:48 +00:00
toaster
8b7faa10c1 M_LevelListFromGametype: Remove memory-corrupting memset
- firstlen was in units of raw UINT8 address (pre-multiplied by sizeof(cupheader_t*)) to permit being used in Z_Realloc. However, it was being added onto the cupgrid.builtgrid pointer BEFORE it was cast into UINT8* for memset, leading to an offset, when considered in terms of UINT8 address.
- Z_Realloc2 is always guaranteed to memset any appended memory so this wasn't even required
2023-02-06 20:46:47 +00:00
James R
f0ea20d54d Merge branch 'move-acsvm-cmake' into 'master'
cmake: move ACSVM fetch to cpm-acsvm.cmake

See merge request KartKrew/Kart!902
2023-02-06 00:35:21 +00:00
toaster
75ee5d1c0b G_UpdateTimeStickerMedals: Fixes for issues with invalid ghost-Medal combinations.
- Only set timetoreach from Medal's var in valid cases
- Shorter invalid phrases to fit in 9-long buffer
2023-02-06 00:28:14 +00:00