Commit graph

15899 commits

Author SHA1 Message Date
Sally Coolatta
5788c98f3c Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-03 10:13:52 -04:00
lachwright
b132a6d3ec Hide Metal Sonic's jet fume in first person 2020-08-03 20:09:35 +08:00
SteelT
23f6dc63d6 Merge screen.c 2020-08-02 18:58:11 -04:00
SteelT
7d5b0adc87 Merge p_saveg.c 2020-08-02 18:37:58 -04:00
SteelT
fa4fc40dd6 Merge filesrch.c 2020-08-02 18:03:59 -04:00
Sally Coolatta
4208d22129 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-02 17:30:19 -04:00
Sally Coolatta
94e85a7bb6 Merge f_wipe.c 2020-08-02 17:24:44 -04:00
SteelT
7417e95dcb Merge m_cheat.c 2020-08-02 17:06:27 -04:00
Sally Coolatta
cfb9c92ec9 Merge dehacked.c/h 2020-08-02 16:59:24 -04:00
Sally Coolatta
70692f4c3f Merge d_netfil.c 2020-08-02 16:40:22 -04:00
Sally Coolatta
b156899390 More d_netcmd.h 2020-08-02 16:36:40 -04:00
Sally Coolatta
178087289e Merge d_netcmd.c/h 2020-08-02 15:38:53 -04:00
Sally Coolatta
c1b1641f35 Merge d_main.c 2020-08-02 14:45:23 -04:00
Sally Coolatta
6ddae4728f Merge d_net.c 2020-08-02 14:15:29 -04:00
Sally Coolatta
a6396d5734 Utilize SendKick more 2020-08-02 14:07:02 -04:00
Sally Coolatta
6b1e9e4937 Merge d_clisrv.c/h 2020-08-02 13:56:43 -04:00
James R
ed2d40b98e Unused parameter :) 2020-07-31 22:17:22 -07:00
Sal
21dfe49bf8 Merge branch 'antigrav-respawn' into 'master'
Antigravity fixes, round 2

See merge request KartKrew/Kart!305
2020-07-31 21:55:38 -04:00
Latapostrophe
de7147008e Let's not try to outsmart the way mf2_objectflip works and just disable it entierely alongside mfe_verticalflip if the waypoint isn't flipped. 2020-07-31 18:13:28 +02:00
Sal
02e98c4d31 Merge branch 'hud-slidein' into 'master'
HUD slide in, and better splitscreen HUD support

See merge request KartKrew/Kart!306
2020-07-31 11:23:01 -04:00
Sally Coolatta
4847f71707 Make slower 2020-07-31 11:21:18 -04:00
Sal
7e1683fa5e Merge branch 'sliptide-fix' into 'master'
Make sliptiding more effective again

See merge request KartKrew/Kart!307
2020-07-31 01:45:19 -04:00
Sally Coolatta
83b8556851 Old Flame Shield handling 2020-07-31 01:41:04 -04:00
Sally Coolatta
092db17f84 OK turns out my hunches were just totally wrong. THIS makes sliptiding really accurate to v1, and we ended up not liking handling stacking 2020-07-31 01:18:45 -04:00
Sal
35afda0173 Merge branch 'shadows-minor-things' into 'master'
Shadows minor things

See merge request KartKrew/Kart!308
2020-07-30 08:15:55 -04:00
lachwright
12c622902f Make old analog functional again 2020-07-30 18:22:15 +08:00
Nev3r
0bd31d8862 Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now. 2020-07-30 09:45:58 +02:00
Sally Coolatta
1008dcce36 Vertical flip for shadows 2020-07-29 23:55:36 -04:00
Sally Coolatta
72bfbefad3 SHORT fixes from vanilla for shadows 2020-07-29 21:28:09 -04:00
James R
e8a06868b9 Merge branch 'clarify-md5-mismatch' into 'next'
Include "is old" in the list of possible causes for a MD5 mismatch.

See merge request STJr/SRB2!1095
2020-07-29 21:19:23 -04:00
Sally Coolatta
903f118aac Only spawn sliptides above your top speed
Looks a bit funky being able to do it at low speed using invincibility, plus it's not helping you to do this if you're going too slow :p
2020-07-29 12:47:55 -04:00
Sally Coolatta
ec9dc03725 Allow sliptides to spawn for any item that gives you a handling boost, since that's what lets it happen 2020-07-29 12:16:08 -04:00
Sally Coolatta
0ce492e103 Fix sliptiding being weakened after all of the boost stacking changes, by making handling bonuses stack using the same rules 2020-07-29 12:15:11 -04:00
Sally Coolatta
a0befdce2d Fix drawing on others screens 2020-07-29 05:43:40 -04:00
Sally Coolatta
57822f6756 Merge master 2020-07-29 05:19:51 -04:00
Sal
0060a30bc4 Merge branch 'spindash' into 'master'
Spindash

See merge request KartKrew/Kart!303
2020-07-29 05:05:00 -04:00
Sally Coolatta
4044a153ca Splitscreen support for the prestart counter 2020-07-29 05:00:12 -04:00
Sally Coolatta
1bbe4ede70 Duel graphic for 1v1s
Yu-Gi-Oh! Prison
2020-07-29 04:13:35 -04:00
Sally Coolatta
b39c8562a6 Fault HUD scrolls, faulting respawns you & holds you until the countdown's over 2020-07-29 01:47:00 -04:00
Sally Coolatta
c45a67c3f9 Pre start bulbs 2020-07-29 01:19:53 -04:00
Nev3r
69cdd00be6 Fix gl_linedef renaming which went off radars on the udmf branch 2020-07-28 20:39:11 +02:00
Nev3r
3d90a6aebe Merge branch 'udmf-next' into 'next'
Merge udmf-next into next

See merge request STJr/SRB2!1075
2020-07-28 14:03:59 -04:00
GoldenTails
b14633f745 Include "is old" in the list of possible causes for a MD5 mismatch. 2020-07-28 03:53:25 -05:00
Sally Coolatta
e53fe8c316 Fix player 2's position num in 2P 2020-07-28 04:49:34 -04:00
Sally Coolatta
3b6b0013c8 Add local ABCD tags for splitscreen 2020-07-28 04:49:15 -04:00
Sally Coolatta
69b6ba2f18 I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
2020-07-28 03:34:39 -04:00
Sally Coolatta
b08459cbee Buffer time before countdown depends on player count, no intro spin in 1v1 2020-07-27 23:31:46 -04:00
James R
0507119d50 Merge branch 'extras-credits-unskippable' into 'next'
Fix Credits sequence from Extras being unskippable

See merge request STJr/SRB2!1091
2020-07-27 19:35:14 -04:00
Sally Coolatta
dfe4d4a219 No tethering off of the person who got the start boost 2020-07-27 02:29:43 -04:00
Sally Coolatta
c685f45563 Make it even stronger 2020-07-27 02:11:18 -04:00