thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-27 05:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
20379 commits 2 branches 14 tags 206 MiB
Commit graph

20379 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
e086b52055 Fix the MP character select being completely busted and sending infinite changenameandcolor packets 
Still has weird inappropriate conditions for changing skin, but gets the feature at least WORKING for now.
 2022-11-07 20:16:53 +00:00
toaster
2e75012645 Clean up follower setting to handle strings and values just like player->skin 
- Fixes defaulting to follower id 0 (previously chao, currently hot robo) when joining a server without going through the menu flow
- No need to store TWO names for a follower, so save a little memory
- Should make it easier to add unlockable followers later
 2022-11-07 18:11:45 +00:00
toaster
35a3a9db4a Remove follower on player departure 2022-11-07 17:09:51 +00:00
toaster
fa5aa408be WIP: Catch a few places which could be going wrong with followers on joining servers. 
Definitely better than it was, but current status: sometimes when joining a server cv_follower[n].value is 0 and I don't know why.
 2022-11-07 00:58:55 +00:00
toaster
8aeaf9738d Major changes to follower selection 
- Followers now have categories, definable in SOC
- New character select step: Follower category
    - "None" is a category, just skips straight to Follower None
    - Select a category to go to the previous regular follower selection step
- Press the C/Extra button to reset a character select step to its "default"
    - Character: Center the character in the engine class (goes from [0,1] to [1,1], etc)
    - Character alts: Centers the "primary" alt (prefers Eggman over Eggrobo)
    - Skincolor: Centers the character's prefcolour
    - Follower category: Centers on the "None" option
    - Follower: [CURRENTLY NO BEHAVIOUR]
    - Followercolor: Cycles between follower's defaultcolour, "Match", and "Opposite"
 2022-11-06 22:53:12 +00:00
toaster
368a45c674 Change default followercolor to "Match" (from "1") 2022-11-06 22:15:16 +00:00
toaster
59cd7bfc11 Use character's prefcolour before color selection for that player 2022-11-06 17:06:29 +00:00
toaster
44f869e5e6 Adjust followers (and players) drawing on character select 
- Use default colours for followers when not select(ing/ed) follower colour, to match character selection
- Adjust offsets in general, including a rework bobbing handling, so there isn't a huge variance in follower position on-screen
- Move followers to draw in front of several elements, including the "A/B/C/D PLAYER" text and the rotatey wheel so you can actually see them
- Also applies to player: Don't mirror between sides of the screen - instead, rotate the virtual player object, so asymmetrical details aren't lost!
- Player-specific: Animate when READY !! to simlate starting your engine.
 2022-11-06 16:53:57 +00:00
toaster
1cae2e1502 Fix loading follower default colour 
Also corrects an issue where the last two skincolours were not being copied to the followercolor table
 2022-11-06 15:21:22 +00:00
toaster
ca3525a81a Fixing going back in the follower list on the Character Select 2022-11-06 14:52:37 +00:00
toaster
f5eadd331e Fix follower colour handling in replays 2022-11-06 14:21:39 +00:00
Oni
ff6f7b62c8 Merge branch 'paperitem-backdrop' into 'master' 
Add backdrop for paper items

See merge request KartKrew/Kart!755
 2022-11-06 08:00:06 +00:00
toaster
3b212a1138 Merge branch 'miniladder-16' into 'master' 
Miniladder for 1.6

See merge request KartKrew/Kart!754
 2022-11-05 13:16:22 +00:00
SteelT
84a5e28302 Don't match slope pitch and roll for MT_FLOATINGITEM (per VC discussion) 2022-11-04 11:19:27 -04:00
toaster
e486926943 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into miniladder-16 
# Conflicts:
#	src/d_main.c
 2022-11-04 12:03:48 +00:00
SteelT
701b345f39 Fix sprite clipping in OpenGL 2022-11-03 23:11:51 -04:00
Sal
07f5fd5c07 Merge branch 'connection-doinglus' into 'master' 
[Doinglus] Connection screen adjustments

See merge request KartKrew/Kart!679
 2022-11-04 02:22:32 +00:00
Sal
ae0312e9a4 Merge branch 'win32-dpi-awareness' into 'master' 
win32: Add dpi aware manifest config

See merge request KartKrew/Kart!733
 2022-11-04 02:16:54 +00:00
SteelT
8dbac697ca Add backdrop for paper items 
Capsules are unaffected as it has it's own object that shares the sprite of the items.
 2022-11-03 22:07:09 -04:00
Oni
4a3369d51a Merge branch 'hyu-is-not-damage' into 'master' 
Use non-damaging hitlag for Hyudoro collide (Fixes #322)

Closes #322

See merge request KartKrew/Kart!751
 2022-11-04 00:43:54 +00:00
toaster
77be11d952 Title screen adjustments 
- Don't show menu message on first tic of title startup
 2022-11-04 00:41:53 +00:00
Oni
32dba0fd5b Merge branch 'explosion-combo' into 'master' 
Always allow combos into DMG_EXPLODE (fixes #321)

Closes #321

See merge request KartKrew/Kart!752
 2022-11-04 00:40:50 +00:00
toaster
a9e5904d2f Show (and clear) menu messages on the titlescreen 2022-11-04 00:30:03 +00:00
toaster
b4227bde05 Fix M_ConfirmConnect properly ending the menu popup 
Turns out M_ClearMenus returns early, we should do M_StopMessage directly
 2022-11-03 23:48:58 +00:00
toaster
310ecb3cb0 Missing variable 2022-11-03 22:44:55 +00:00
toaster
13003cb66a NONET was killed prior, get rid of its body 2022-11-03 22:42:06 +00:00
toaster
21be387d0f Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into connection-doinglus 
# Conflicts:
#	src/d_clisrv.c
#	src/d_main.c
#	src/k_menudraw.c
#	src/m_misc.c
 2022-11-03 22:36:34 +00:00
toaster
ed10cd102f Missing header reference 2022-11-03 14:57:27 +00:00
toaster
ea0bf216c5 Newview hack crash fixes 
- Renderer should exist
- Player mo should exist
 2022-11-03 14:50:46 +00:00
toaster
0230b57aa8 Remove advancedemo 
Just a weird, meaningless footgun waiting in the wings for someone to catch themselves on
 2022-11-03 14:45:36 +00:00
toaster
e7c700a64f Compilation errors from corrupted cherry-pick/porting 2022-11-03 14:32:40 +00:00
toaster
c5a3d362a1 Shadowed declaration fix for d_clisrv anti-bodysnatch fix 2022-11-03 14:28:19 +00:00
toaster
e027cc2a06 Error checking for running out of freeslots 2022-11-03 14:23:30 +00:00
X.organic
b0af04eeeb Bring the maximum WAD file count up to 255 
Per @TehRealSalt's recommendation.

# Conflicts:
#	src/w_wad.h
 2022-11-03 14:02:17 +00:00
toaster
7216b56e2e More consistent netreplay wadfile list writing 
Fixes crashes for newly-written demos that have files with absurdly long names attached
 2022-11-03 13:58:57 +00:00
toaster
e5d1b39e30 Add R_RelativeTeleportViewInterpolation 
Adjusts pview_old for relative teleport to attempt a contigious motion
 2022-11-03 13:52:17 +00:00
toaster
1b55c73a3c Fix undesired interpolation for regular teleport 2022-11-03 13:52:05 +00:00
toaster
92db1aa634 Make all the join/leave sound effects have a singularity of true so that they don't stack super loud during major net interruption or multiple splitscreen player joins. 2022-11-03 13:49:27 +00:00
toaster
d7e2c60d73 1.6 replay hut graphical fixes -- obviously redoing the whole thing later but important to get reasonable foundation to build off 2022-11-03 13:35:51 +00:00
Ashnal
1e9b844e88 Unlink non-mobj and non-precip thinkers when loading and freeing 
Move globalweather to before P_SpawnSpecials so that specials can properly change weather and have it communicated in savegames

# Conflicts:
#	src/p_saveg.c
#	src/p_setup.c
 2022-11-03 13:23:13 +00:00
James R
4e4612949b Merge branch 'bot-online-desync' into 'master' 
Fix bots desyncing in netgames

See merge request KartKrew/Kart!748
 2022-11-03 13:20:44 +00:00
Ashnal
fb4cf4c3ba Remove usage of currentthinker from direct removal 
It's designed to be referenced from P_RunTHinkers, whjich we aren't doing
 2022-11-03 13:13:07 +00:00
Ashnal
16300bee84 Attempt to fix use after free bug 
with precipitation mobjs on netgame load

# Conflicts:
#	src/p_saveg.c
 2022-11-03 13:11:03 +00:00
Sal
ce11459afb Merge branch 'splat-interp' into 'master' 
Fix splat interp and sprite angle

See merge request KartKrew/Kart!749
 2022-11-03 12:50:38 +00:00
Ashnal
ce7fe894b8 Should fix the dedicated server player node takeover 
that completely destroys servers

# Conflicts:
#	src/d_clisrv.c
 2022-11-03 12:42:39 +00:00
AJ Martinez
4996692b4b Remove redundant MT_SPBEXPLOSION combo condition 2022-11-03 05:09:18 -07:00
AJ Martinez
d44340e9b8 Always allow combos into DMG_EXPLODE 2022-11-03 04:56:21 -07:00
AJ Martinez
7e46ee1d13 Use non-damaging hitlag for Hyudoro collide 2022-11-03 04:28:02 -07:00
toaster
d57adac84b Explicit pointer cast for R_InterpolatePrecipMobjState 2022-11-02 23:52:15 -07:00
Eidolon
000593c135 Use precip interp if gl sprite is for precip 2022-11-02 23:51:05 -07:00