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
24370 commits 1 branch 12 tags 205 MiB
Commit graph

24370 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lach
dc4a25d823 Add Dash Ring variables to net archive 2023-07-20 19:11:02 +10:00
Lach
bb5070afb0 Merge remote-tracking branch 'origin/master' into dashrings 2023-07-20 19:04:42 +10:00
Lach
476d53d305 WIP: Hardcode MT_BOOSTPAD 2023-07-20 19:02:13 +10: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
toaster
2241bdddb0 Merge branch 'colors-fixes' into 'master' 
Skincolor Unlock fixes (resolves #568)

Closes #568

See merge request KartKrew/Kart!1339
 2023-07-19 14:19:56 +00:00
toaster
6d1fe69c15 Merge branch 'horncode-dx' into 'master' 
Sounds on display

See merge request KartKrew/Kart!1343
 2023-07-19 14:18:23 +00:00
Lach
a21e509a94 Hardcode MT_DASHRING & MT_RAINBOWDASHRING 2023-07-19 21:47:41 +10:00
Zwip-Zwap Zapony
6b5e3f650e Use 99999999 instead of 86400, make "MIN" 0 
Nines might be more pleasing than an exact number for con_hudtime
It'd be bad to make "MIN" in an old config suddenly start displaying lines for con_hudlines

# Conflicts:
#	src/console.c
 2023-07-18 20:59:38 +01:00
Zwip-Zwap Zapony
e2ee6e45d7 Limit con_hudtime to 24 hours 
Also rename cons_msgtimeout to cons_hudtime for consistency
 2023-07-18 20:58:19 +01:00
toaster
02651d249c Set default value of bots to Off, not 0 2023-07-18 20:43:07 +01:00
SteelT
05b130b422 Add CV_TrueFalse as possible value types for console variables 
This also adds support for using true/false as value aliases for On/Off, Yes/No or 1/0

# Conflicts:
#	src/command.c
 2023-07-18 20:39:08 +01:00
toaster
ea53197084 Fix off by 1 error in con_hudlines 
Originally written by Zwip-Zwap Zapony for the SRB2 repository as part of STJR/SRB2!1931, partially flattened to avoid waiting for the merger of the entire branch.
- 0, not 1 as previously was the case, now shows zero lines.
- Now inclusively capped between 0 and 20 lines in the cvar, rather than silently in the console code.
 2023-07-18 20:26:43 +01:00
Zwip-Zwap Zapony
c36d987be7 Draw the input prompt while the console is moving 2023-07-18 20:06:36 +01:00
Zwip-Zwap Zapony
4c08b7010d Make con_height adjustable on the fly 2023-07-18 20:06:29 +01:00
Zwip-Zwap Zapony
24ab95ddde Uncap console opening/closing animation 2023-07-18 20:06:22 +01:00
toaster
9b51c9c7fe V_GetHWConsBackColor: Fix for RR's console color list 
Also, don't be such a weenie that you say slurs in your code comments
 2023-07-18 19:52:14 +01:00
toaster
0b3ebb0686 Kickstart Accel indicator sound modifications 
- Play in replays/as spectator
- Do not play for bot-controlled players (exiting, Podium, etc)
 2023-07-18 18:04:54 +01:00
toaster
bfc8036e7e Use display players for hearing/seeing horns, not local players 
Matches other local effects, and permits spectators (such as in tournaments) and replay watchers to see the honk.
 2023-07-18 17:53:54 +01:00
toaster
a812ef8809 DMG_WHUMBLE 
There are two differences between Whumble and Stumble.
- Stumble cannot be combo'd on upwards momentum, while whumble can. (Resolves #522)
- Whumble takes bumpers, while stumble does not.
    - Removes the MT_INSTAWHIP hack.
 2023-07-18 17:39:17 +01:00
toaster
ce08ac0f33 General tidy of mobj_t pointers on player_t struct 
- CL_ClearPlayer
    - Delete followmobj, stumbleIndicator, and sliptideZipIndicator
    - Wipe flickyAttacker and powerup.flickyController
- G_PlayerReborn
    - Properly destroy the Follower and its bubble overlays, etc
    - Ensure ringShooter pointer is kept
    - Delete followmobj, stumbleIndicator, and sliptideZipIndicator
    - Wipe flickyAttacker and powerup.flickyController
- P_PlayerThink
    - Ensure all invalid pointers are erased, even on hitlag frames
 2023-07-18 15:50:39 +01:00
toaster
e6619df2d4 Servant Hand: Refactor to use its own thinker 
Since it's already ticking for the sake of a fuse, make it handle its own movement/scaling as well.

Spawning is still handled by the player thinker (and can be blocked by hitlag), but this permits it to disappear when a player dies/disconnects the server.
 2023-07-18 15:45:49 +01:00
toaster
beebfd0d2f Ring Shooter: Only P_SetTarget if player is in game 2023-07-18 15:29:32 +01:00
toaster
c1810ac891 P_SetupSpawnedMapThing: Re-add missing MT_AMBIENT 2023-07-18 10:59:06 +01:00
toaster
2e395c8b0f Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into more-conversions 2023-07-18 10:52:09 +01:00
toaster
a07a9e2191 Don't use skincolor unlocks in situations where gamedata is inappropriate 
- Recieving a different client's XD_NAMEANDCOLOR
- Loading profiles on game boot
 2023-07-18 10:50:25 +01:00
toaster
c20a76586c Merge branch 'loop-netsave' into 'master' 
MT_LOOPCENTERPOINT invalid spawnpoint (resolves #563)

Closes #563

See merge request KartKrew/Kart!1338
 2023-07-18 09:45:41 +00:00
toaster
f8922c83c8 MD2_TID: Don't pass a macro directly to P_SetThingTID 
This isn't currently the cause of any issue, but found this future footgun while researching the previous commit.

Sometimes functions are turned into macros, which could potentially result in multiple save->p digestions if this was eventually turned into one.
 2023-07-17 13:53:13 +01:00
toaster
45012dbd6a Make sure MT_LOOPCENTERPOINT doesn't have an invalid stack-allocated spawnpoint pointer 
Fixes connecting to a server that's currently on a map with a loop.

Also tidies P_SpawnItemRow, P_SpawnItemCircle to reduce the likelihood of this happening again, and possible crash with Lua-shortcircuited loop spawning
 2023-07-17 13:51:48 +01:00
SteelT
3d6d2694b3 Fetch the server IP once 
Fixes ourIP being set on every map change
Also catches a possible case where joining clients can sigfail in the window between map change and stun response
 2023-07-16 19:13:20 -04:00
Oni
a59896ef88 Merge branch 'string-clenups' into 'master' 
String Clenups[sic]

See merge request KartKrew/Kart!1330
 2023-07-16 08:50:22 +00:00
AJ Martinez
12bc92b392 Merge remote-tracking branch 'origin/master' into dedi-bots 2023-07-16 01:29:00 -07:00
AJ Martinez
ab71148c4d Botcontrol is for servers 2023-07-16 01:28:50 -07:00
Oni
28748725fe Merge branch 'initializing-instawhip-reject-frames' into 'master' 
Initializing the instawhip reject frames

See merge request KartKrew/Kart!1334
 2023-07-16 08:28:04 +00:00
AJ Martinez
599c87f627 Don't rewrite the past if we might still need to send it 2023-07-16 01:18:23 -07:00
VelocitOni
a43836a9ad MT_INSTAWHIP_REJECT in info.h 
fuck FUCK fucvkfj UFCK SO MANY SPOTS
 2023-07-16 04:15:49 -04:00
VelocitOni
82c21f631f Added it in one more spot info.h, added a field for it in info.c 
Dunno where else to add it, still says it's not added to dehacked...
 2023-07-16 04:03:49 -04:00
VelocitOni
51058c3c19 Messed up sprite name 
Changed it from a duplicate hitlag sprite to instawhip-reject name
 2023-07-16 03:43:10 -04:00
VelocitOni
6f31a6d4a8 Initializing the instawhip reject frames 
Setting it up to save the future coder headache
 2023-07-16 03:31:03 -04:00
Oni
4feafc99f0 Merge branch '10th-hitlag-spark' into 'master' 
10th frame of hitsparks added

See merge request KartKrew/Kart!1332
 2023-07-16 06:49:37 +00:00
VelocitOni
7aec2b0732 10th frame of hitsparks added 
Added biggest frame of hitsparks, only 1 to go now.
 2023-07-16 02:27:25 -04:00