thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
22759 commits 1 branch 12 tags 205 MiB
Commit graph

22759 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
toaster
3d0abdd74a Merge branch 'follower-audience' into 'master' 
Follower Audience

Closes #498 and #325

See merge request KartKrew/Kart!1185
 2023-04-24 21:49:34 +00:00
toaster
f5f8456979 WADNAME Zone Builder temporary file detection made stricter 
- Only apply if the format is \Temp\8\8.3
- Only apply if there's a previous loaded file with WADNAME
- Use that filename
- Add a DBG_SETUP print
Fixes \Temp\SLADE\(actual filename) files popped out from maps.pk3
 2023-04-24 22:38:05 +01:00
toaster
0f16c61d04 filesearch.c: Always use system-specific path seperator 
The directory functions this was built on are capable of converting Unix paths to Windows internally, but the paths generated by the search can sometimes be processed by the game afterwards, which relies on system-specific character comparison.

Notably fixes WADNAME failing via the console on Windows.
 2023-04-24 20:53:58 +01:00
Sally Coolatta
85eaf2eeea Make camera follow platform momentum 2023-04-23 14:51:29 -04:00
Sally Coolatta
57022fafe5 Move camera Z slightly faster 
RR has more & taller slopes than SRB2K, so the old values were a bit jarring (you go off-screen a LOT more often)
 2023-04-23 14:47:47 -04:00
James R
d7448bd597 V_StringScaledWidth: always return full width of bunched fonts 2023-04-23 08:25:50 -07:00
James R
7d90e8f8f8 V_DrawStretchyFixedPatch: multiply vertical scale in fixed-point 
Fixes 1px overshoot at some scales.
 2023-04-23 08:19:47 -07:00
Sal
1e22a8f4c0 Merge branch 'fix-teleport-interpolation' into 'fix-reset-interpolation' 
412 teleport: correctly update interpolation state

See merge request KartKrew/Kart!1193
 2023-04-23 13:56:52 +00:00
Sal
35728a00e3 Merge branch 'z-voting' into 'master' 
Z Voting

Closes #265

See merge request KartKrew/Kart!1184
 2023-04-23 05:12:47 +00:00
Sally Coolatta
a631376f1f Z Voting: Undo victim thing 2023-04-23 01:12:19 -04:00
Sally Coolatta
f86030fcda Z Voting: More voting conditions 
- Attempt to make Z votes draw if spectator
- Don't show kick votes to the victim
- Fix required vote count when in 1P
 2023-04-23 01:04:57 -04:00
Sally Coolatta
e112e1f0dc Reduce length & delay 2023-04-23 00:40:31 -04:00
James R
11242527ed 412 teleport: correctly update interpolation state 
- Fixes relative teleport not updating floorz/ceilingz,
  causing camera to potentially get clipped by old
  position

- Fixes absolute teleport not resetting viewpoint
  interpolation
 2023-04-22 20:49:19 -07:00
James R
e8a8064da9 P_Ticker: update view interpolation at the start of a tic 
This lets R_ResetViewInterpolation only need to be called
once from game logic.
 2023-04-22 20:40:35 -07:00
James R
9e59bd6d67 cmake: add SRB2_CONFIG_ASAN, enable AddressSanitizer 2023-04-22 18:35:22 -07:00
Sal
81b1cc8492 Merge branch 'fix-combiring-bounds-error' into 'master' 
K_DrawDraftCombiring: do not read outside of colors array

See merge request KartKrew/Kart!1189
 2023-04-23 00:26:56 +00:00
Sal
344f51d384 Merge branch 'warn-invalid-texture-data' into 'master' 
Single-patch textures: print an error if patch header is missing, cease memory errors

See merge request KartKrew/Kart!1190
 2023-04-23 00:24:43 +00:00
James R
0da18745d9 K_DrawDraftCombiring: do not read outside of colors array 2023-04-22 15:22:38 -07:00
James R
47411735d0 Single-patch textures: print an error if patch header is missing, cease memory errors 2023-04-22 15:21:23 -07:00
AJ Martinez
4b9b10c096 Don't apply handling boost if you're not alive 2023-04-21 17:27:31 -07:00
toaster
3dd44961a0 Obj_AudienceInit: Improve follower name processing 
- Convert underscores to spaces for string comparison
- Report typoes to the user
 2023-04-21 21:07:14 +01:00
toaster
c7cc730c35 Obj_AudienceInit: Improve color handling 
- Catch all invalid colors with default randomisation
- Catch invalid colors more thoroughly
- Report typos to the user
 2023-04-21 21:06:21 +01:00
toaster
2f8b8cf532 Follower lists: Fix typing 
Should consistently be signed INT16, not unsigned UINT16
 2023-04-21 20:52:13 +01:00
toaster
98288fd289 Obj_AudienceInit: Incorporate follower scale into multipliciation 2023-04-21 20:20:51 +01:00
toaster
a4a5752df0 Obj_AudienceThink: Ease the angle change 2023-04-21 18:24:51 +01:00
toaster
91f4169212 Follower-mimicing emblems: Permit them to just sit there if their defined bobamp is 0 
This is unlike audience members, which have a minimum jump height
 2023-04-21 17:42:44 +01:00
toaster
af288571bd P_SetupEmblem: Correct flags *before* Obj_AudienceInit 2023-04-21 17:37:26 +01:00
toaster
945a00df6e Permit emblem pickups that take on the visage of a Follower 
- If Global-type map emblem has GE_FOLLOWER, attempt to take on the appearance of the follower specified by var2.
    - Unlike MT_RANDOMAUDIENCE, this picks whether the object should be floating or hopping based on the specified mode of the source Follower.
    - Always chooses to face the nearest player.
- Rearrange some properties affected by Obj_Audience/audience.c to not conflict with MT_EMBLEM
 2023-04-21 15:17:43 +01:00
toaster
8878bf8465 P_SetupEmblem: Only call Tag_FGet once, and store the result for loop iteration/error messages 2023-04-21 15:12:06 +01:00
toaster
66d8d8757e emblem_t: Add var2/stringVar2 2023-04-21 15:09:49 +01:00
toaster
1e5fadc901 Audience-related functions: Rename + adjust 
- Since they're not necessarily going to be randomised, make the prefix Obj_Audience instead of Obj_RandomAudience.
- Externalise some properties that we may not want affecting all hypothetical uses.
    - Flag auto-application should be done externally, since this won't be general.
    - Focusing on player should be controlled by the function call, not an ambiguous flag.
 2023-04-21 15:09:07 +01:00
James R
d9b406f4d0 Add TIMER_FONT, rename V_DrawKartString to V_DrawTimerString 
Separates timer and FREE PLAY fonts.
 2023-04-21 00:34:06 -07:00