Commit graph

23546 commits

Author SHA1 Message Date
Sally Coolatta
1a9841272b Bigger, chunkier items test
- Random & Sphere Items are x3 bigger.
- Eggman Items grow to x3 bigger when they land.
- Eggman Item hitbox reverted from 24 to 16 again, since the x3 size increases their hitbox even more anyway.
- Random item temporarily moved to 2011 and 2000 objects ignored, as per Ivo's request.

The idea behind this branch is to start turning tons of item clusters into single file item rows with only a few items per. The original intent was to make 9P+ more bearable by making item sets no longer free, but in a way that's engaging & takes thought. This does eliminate one of the reasons I had originally standardized MK64-style clusters, but honestly no one really hides eggman items anymore :P

I'm not totally confident that this will make massive netgames enjoyable on its own, but it's one step towards that and this change has a lot of other benefits as well like less clutter and better visibility.

Due to the mapthing type shuffle, this needs to be tested on a few maps with changed item sets, and then swap it back before merging.
2023-04-29 13:47:37 -04:00
Sal
7990842da3 Merge branch 'G_LoadDemoInfo-dont-crash' into 'master'
G_LoadDemoInfo: don't read outside of the buffer if the file is too small

See merge request KartKrew/Kart!1205
2023-04-29 17:00:35 +00:00
Sally Coolatta
f4e14f5fe3 Faster ring respawn once again 2023-04-29 12:33:15 -04:00
Sal
f2a1a0e314 Merge branch 'srb2-draw' into 'master'
srb2::Draw class abstraction over 2D drawing

See merge request KartKrew/Kart!1208
2023-04-29 15:45:26 +00:00
Sal
e0744765f4 Merge branch 'fix-masked-directional-lighting' into 'master'
Software: fix directional lighting on two-sided midtextures

Closes #540

See merge request KartKrew/Kart!1210
2023-04-29 15:44:05 +00:00
James R
3edf65495b Merge branch 'minor-prototype-tweaks' into 'master'
Minor tweaks to function prototypes

See merge request KartKrew/Kart!1207
2023-04-29 08:20:30 +00:00
James R
8b81478e39 G_DoPlayDemo: search for map and gametype after addons are loaded 2023-04-29 01:16:48 -07:00
James R
ab7691508e EggTV: load addons 2023-04-29 01:15:30 -07:00
James R
5baa7c14fb EggTVData::cache_favorites: silently fail if favorites file does not exist 2023-04-29 00:12:40 -07:00
James R
f94aef4811 EggTVData::cache_folders: check that file is directory before iterating 2023-04-29 00:04:37 -07:00
James R
7b67a69754 EggTVData::Folder::Cache::Cache: move is_regular_file call within try-catch 2023-04-29 00:01:57 -07:00
James R
2a863ab985 EggTVData::Folder::Folder: use newest timestamp of file inside directory
The timestamp of the directory itself would change when
replays are deleted.
2023-04-29 00:01:53 -07:00
AJ Martinez
07eb7dea19 Revert "WIP: XD_REQSAY"
This reverts commit 00e25ee593.
2023-04-28 17:14:32 -07:00
James R
3bc7b48b7e Remove Replay Hut code 2023-04-28 12:50:43 -07:00
James R
3ccfb71f04 Add Egg TV menu 2023-04-28 12:50:43 -07:00
James R
7ed356d620 thirdparty: add nlohmann/json 2023-04-28 12:50:43 -07:00
James R
d2ca5d6506 v_draw.cpp, v_draw.hpp: add srb2::Draw, 2D drawing abstraction 2023-04-28 12:50:25 -07:00
AJ Martinez
00e25ee593 WIP: XD_REQSAY 2023-04-28 02:10:50 -07:00
James R
4e984fbcff Software: fix directional lighting on two-sided midtextures
blame c53ae816c1
2023-04-27 13:19:35 -07:00
James R
0e87a77e54 K_DrawMapThumbnail, K_DrawLikeMapThumbnail: correct argument types to fixed_t 2023-04-26 14:14:44 -07:00
James R
a10c9fea39 G_DoPlayDemo: let argument be const 2023-04-26 14:12:29 -07:00
toaster
2d169202f2 Merge branch 'versus-tidy' into 'master'
Versus Tidy

See merge request KartKrew/Kart!1186
2023-04-26 15:08:41 +00:00
toaster
9af71ebfaa Merge branch 'fix-stretchy-vertical-scale-again' into 'master'
Fix V_DrawStretchyFixedPatch vertical scaling AGAIN

See merge request KartKrew/Kart!1206
2023-04-26 15:07:50 +00:00
James R
4944b605d4 V_DrawStretchyFixedPatch: round bottom y value to nearest integer
Fixes 1px overshoot at some scales.
2023-04-26 07:35:54 -07:00
James R
520e2f796b Revert "V_DrawStretchyFixedPatch: multiply vertical scale in fixed-point"
This reverts commit 7d90e8f8f8.
2023-04-26 07:34:22 -07:00
James R
c54f1a52bd G_LoadDemoInfo: don't read outside of the buffer if the file is too small 2023-04-25 18:49:31 -07:00
James R
e55f03648f Add P_SaveBufferRemaining, returns remaining size of save buffer 2023-04-25 18:49:20 -07:00
Sal
5109e3bdf9 Merge branch 'respawnat' into 'master'
Add respawnat command, lightsnake to a specific waypoint

See merge request KartKrew/Kart!1200
2023-04-25 14:57:52 +00:00
toaster
a03c31f59a SendNameAndColor: Some cleanup
- Default to "Default", not "Match", when sendFollowerColor is unusable
- Do not use invalid index into `followers[]` when adjusting sendFollowerColor
2023-04-25 14:53:25 +01:00
toaster
0964ba5c7b COM_Help_f: Adjust Color_cons_t (and catch Followercolor_cons_t) per review 2023-04-25 14:19:53 +01:00
toaster
317c30f7c1 Profiles: Fix deficiencies with pre-existing color handling that was exacerbated by this branch
- Do not turn SKINCOLOR_NONE into prefcolor automatically anymore (removed PR_GetProfileColor)
- M_DrawProfileCard:
    - Handle SKINCOLOR_NONE into prefcolor directly
    - Profile Card should not turn NONE-green if skin uses different startcolor for remap
    - Do not attempt to draw Follower if simply not selected for this profile
2023-04-25 14:19:53 +01:00
toaster
b30352022b M_HandleCharRotate: If the listLen is 1, there's only one valid colour - pick that!
Also uses the same technology to skip over setting followers if there are no followers unlocked.
2023-04-25 14:19:52 +01:00
toaster
6626b27a7a M_HandleFollowerRotate: Actually insert Follower-specific Match and Opposite into color wheel 2023-04-25 14:19:52 +01:00
toaster
aea68c454f K_GetEffectiveFollowerColor: A follower's default color can be Match/Opposite (such as our good friend the s3k balloon), so process it before returning 2023-04-25 14:19:52 +01:00
toaster
0d203f5dbb K_GetEffectiveFollowerColor: Handle playercolor being default/NONE in a cleaner, more direct fashion
Fixes the FOLLOWERCOLOR_OPPOSITE handling being wrong in this circumstance
2023-04-25 14:19:52 +01:00
toaster
0fe6fb2fa5 M_ChallengesTick: Catch one more SKINCOLOR_NONE opportunity for bombcolor
Also clarifies the SECRET_FOLLOWER case a little
2023-04-25 14:19:52 +01:00
Sally Coolatta
c486ec19af SECRET_COLOR 2023-04-25 14:19:52 +01:00
AJ Martinez
b752ccdfe7 Clarify some guest stuff 2023-04-24 20:16:03 -07:00
Sal
7554943f02 Merge branch 'wadname-tidy' into 'master'
WADNAME Zone Builder temporary file detection made stricter

See merge request KartKrew/Kart!1199
2023-04-25 01:51:14 +00:00
Sal
62ae3409ec Merge branch 'small-video-errors' into 'master'
Fix small errors with scaled patch and aligned string drawing

See merge request KartKrew/Kart!1195
2023-04-25 01:51:03 +00:00
Sal
0fb691022b Merge branch 'fix-reset-interpolation' into 'master'
P_Ticker: update view interpolation at the start of a tic

See merge request KartKrew/Kart!1192
2023-04-25 01:50:51 +00:00
Sal
76c275424e Merge branch 'fix-respawn-turning' into 'master'
Don't apply handling boost if you're not alive

See merge request KartKrew/Kart!1187
2023-04-25 01:50:38 +00:00
Sal
559a36fdd7 Merge branch 'cmake-asan' into 'master'
cmake: add SRB2_CONFIG_ASAN, enable AddressSanitizer

See merge request KartKrew/Kart!1191
2023-04-25 01:50:30 +00:00
Sal
d3ecb719c9 Merge branch 'fix-reverse-gravity-respawn' into 'master'
Fix flipped waypoint respawning w/r/t sector gravity

Closes #535

See merge request KartKrew/Kart!1202
2023-04-25 01:49:31 +00:00
Sal
26adf6df82 Merge branch 'filesearch-furore' into 'master'
filesearch.c: Always use system-specific path seperator

See merge request KartKrew/Kart!1198
2023-04-25 01:46:51 +00:00
James R
efcdfbe665 Fix some instances of boolean not being set to true exactly 2023-04-24 18:14:37 -07:00
James R
56dcfaedf8 Respawning: set MF2_OBJECTFLIP directly in P_GetMobjGravity
K_RespawnOffset is called before the player is actually at
the waypoint's position, so even if P_GetMobjGravity is
called there to check, it reflects the player's current
sector, which may not necessarily be the waypoint's
sector.
2023-04-24 18:13:37 -07:00
toaster
b0cb804fe4 Merge branch 'faster-cam-z' into 'master'
Improve camera Z following

See merge request KartKrew/Kart!1197
2023-04-24 22:35:09 +00:00
James R
3272b3a284 Do not include MT_SPARK in netsave 2023-04-24 15:35:02 -07:00
James R
4fd17489a5 debugwaypoints: cull debug mobjs outside of drawdist 2023-04-24 15:14:17 -07:00