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

1971 commits

Author SHA1 Message Date
James R
a1502046cf Merge remote-tracking branch 'origin/master' into resume 2020-04-30 09:32:40 -07:00
Latapostrophe
0897f6f21a Cam lockon, allow viewpoint change during freecam 2020-04-28 23:24:48 +02:00
Nev3r
dbf2b9c0f0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/r_segs.c
 2020-04-25 10:47:45 +02:00
James R
eb0ba37dce Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Monster Iestyn
f26e8f3df7 Merge branch 'thinker-cleanup' into 'next' 
Plane movement thinker cleanup

See merge request STJr/SRB2!880
 2020-04-24 14:30:52 -04:00
Sally Cochenour
372544d28f Merge branch 'master' into pet-robo 2020-04-22 21:54:40 -04:00
lachwright
dd126494b3 [Everyone disliked that.] (revert camera zoom) 2020-04-22 22:59:57 +08:00
Zipper
e794810d47 Update p_user.c 2020-04-22 07:59:08 -04:00
ZipperQR
d62d43a76b Dust devil support 2020-04-22 00:59:12 +03:00
lachwright
c92634c71e Make lookback instantaneous 2020-04-21 05:24:48 +08:00
lachwright
6905cfb064 Revert camtilt splitscreen hacks 2020-04-21 03:32:06 +08:00
lachwright
263c31f5df Improve camera tilt 2020-04-21 02:38:08 +08:00
Nev3r
d0340c864f Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
James R
7e981edfcc Merge branch 'continue_tweaks' into 'next' 
A tangible mechanism to disable Continues

See merge request STJr/SRB2!865
 2020-04-18 20:15:04 -04:00
MascaraSnake
93eb0ee1c8 Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
Nev3r
df87feaba7 Carry over a considerable case regarding accessing the old tag vars. 2020-04-17 18:15:25 +02:00
Nev3r
e11e19a5c0 Make a commented out debug code account for taglists. 2020-04-17 10:41:26 +02:00
Nev3r
23ed07e08e Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result. 2020-04-14 23:59:22 +02:00
James R
71f4433b98 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
James R
34318fbc98 Merge branch 'SF_NONIGHTSSUPER' into 'next' 
Skin flag for disabling super colors in NiGHTS

See merge request STJr/SRB2!782
 2020-04-09 19:47:20 -04:00
James R
2c539300d3 Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER 2020-04-09 16:47:52 -07:00
James R
483243353b Merge branch 'lua-hook-cleanup' into 'next' 
Lua hook cleanup

See merge request STJr/SRB2!851
 2020-04-09 19:40:09 -04:00
James R
9f1c616817 Fix lol xd compiler errors 2020-04-07 17:06:20 -07:00
Sally Cochenour
0ef12d3cce Properly use bot movement when exiting 2020-03-29 17:59:26 -04:00
Latapostrophe
4c8d373962 Fix followers in anti gravity 2020-03-29 16:40:21 +02:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
Sally Cochenour
15bda7da2d Use K_MomentumToFacing to give bots a bit better traction 2020-03-28 14:57:49 -04:00
Sally Cochenour
ff621d3e46 Skins, rudimentary ticcmd building for bots 2020-03-28 12:39:27 -04:00
Sally Cochenour
e5ae9d1513 Merge branch 'master' into pet-robo 2020-03-28 08:43:40 -04:00
Sally Cochenour
657a15fae2 Merge branch 'master' into new-items 2020-03-28 00:23:39 -04:00
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
toaster
0f591967ff Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally. 
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
 2020-03-26 20:16:44 +00:00
Sally Cochenour
8a3c7ad2fb Add fire trail to flame shield 2020-03-26 03:13:49 -04:00
James R
572bf314e5 Merge remote-tracking branch 'origin/master' into resume 2020-03-22 19:01:05 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -04:00
James R
cbd4693de7 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 14:34:29 -07:00
Monster Iestyn
0a288260fc Merge branch 'buggle-trouble' into 'next' 
P_HomingAttack related fixes

See merge request STJr/SRB2!836
 2020-03-22 16:57:22 -04:00
Sally Cochenour
b18df427dd Break the Capsules ends when you lose bumpers 2020-03-22 16:07:25 -04:00
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
Louis-Antoine
29294a53cc Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
James R
5e671b3483 Don't reset special music in P_RestoreMusic 
Because that resets Grow music when you stack Grow over Invincibility, and
Invincibility ends. (Also Megamix Themes.)

Thanks Snu, for calling P_RestoreMusic every tic!
 2020-03-21 22:34:27 -07:00
James R
7e0aa16e70 Reset Invincibility (and Grow) music to the start if stacked 
Toggleable via the resetspecialmusic cvar.
 2020-03-21 22:28:55 -07:00
James R
dd1715aa15 Optionally only resync Invincibility and Grow music 2020-03-21 22:28:55 -07:00
James R
d99d1994da Let invincibility and grow music fades work again 2020-03-21 22:28:55 -07:00
James R
80c7cc3c87 3 AM Moment: The death fades now only apply to local players 2020-03-21 22:28:55 -07:00
James R
15e8291903 Reset the music fade in cvar pointer too 
This fixes a bug with death fades.
 2020-03-21 22:28:55 -07:00
James R
911dd57334 Restore level music to where it left off 
Toggleable via the resume cvar.
 2020-03-21 22:28:55 -07:00
James R
8524c3749d Fade level music back in after Invincibility and Grow 
Cvars are invincibilitymusicfade and growmusicfade. Both measure milliseconds.
 2020-03-21 22:28:54 -07:00
James R
310a9cd09c Merge remote-tracking branch 'origin/master' into parties 2020-03-21 17:22:57 -07:00