Commit graph

1577 commits

Author SHA1 Message Date
James R
05a31da7c3 k_enginesnd -> khud_enginesnd 2020-09-20 14:54:45 -07:00
James R
d9f7f155a2 Merge remote-tracking branch 'pub/next' 2020-09-20 14:43:35 -07:00
James R
7533109dfc Fix few poor conflict resolution 2020-09-20 14:24:50 -07:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
Sally Coolatta
d03cbdbba0 Make it a bit louder 2020-09-18 01:10:59 -04:00
SteelT
d8bcc13fec Merge branch 'master' into trick-panels
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/k_kart.c
#	src/p_user.c
2020-09-18 00:54:45 -04:00
Sally Coolatta
3b7681718c Fix engine sounds' dampening to a sane value, now that the bug preventing it from working properly was fixed.
You can hear engines in 16P again, but it's not as obnoxiously loud as it was before. Additionally, I commented this function better.
2020-09-17 18:58:44 -04:00
Sally Coolatta
87037dc7ae 6 -> 2, void the now unused parameter 2020-09-11 12:14:08 -04:00
Sally Coolatta
f76ae44daa Redo Battle item balance
- Far more inclined to give you Orbinaut, Jawz, Invincibility, and Grow. Far less inclined to give you Bananas or Sneakers.
- Item odds no longer scale with bumper count differences.
2020-09-02 02:53:06 -04:00
Sal
a85bc82ece Merge branch 'lineriding-b-gone' into 'next'
Kill offroad line riding

See merge request KartKrew/Kart-Public!199
2020-08-23 05:09:55 -04:00
Sally Coolatta
8e62efb79c Merge branch 'master' into next 2020-08-23 04:44:27 -04:00
FlykeSpice
2424418390 Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
James R
325ae01e4b K_DropRocketSneaker: MF2_DONTDRAW -> MFD_DONTDRAW 2020-08-19 16:46:24 -07:00
Sally Coolatta
3e446a167c Restructure how damage works in kart COMPLETELY
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
Sally Coolatta
1029c01b05 Fix crash in K_BananaSlopeZ 2020-08-18 05:26:27 -04:00
Latapostrophe
1598bfa143 Kill line riding for offroad 2020-08-17 12:01:16 +02:00
Sally Coolatta
8fd64ca607 Fix ring usage & gravity 2020-08-16 02:12:17 -04:00
Sally Coolatta
51aef1ce75 Fix some of the dehacked tables, change doomednums of haunted heights stuff to not conflict with items/waypoints, use "rings" variable instead of "kartstuff[k_rings]" 2020-08-16 01:46:54 -04:00
Sally Coolatta
a251c3909b Lots of little fixes
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
2020-08-16 00:29:04 -04:00
Sally Coolatta
631f698432 Cleanup
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.

I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
2020-08-15 08:32:56 -04:00
Sally Coolatta
9efdc98de6 Makes it through all kart files
All that's left is SDL, OGL, maybe also Lua
2020-08-15 04:42:56 -04:00
Sally Coolatta
dfd733eb80 Up to screen.o
Lots of renderer files I didn't need to touch at all here :)
2020-08-15 00:55:30 -04:00
Sally Coolatta
5a98c00405 NOW we make it past p_mobj 2020-08-14 22:28:49 -04:00
Sally Coolatta
9c51086348 Update K_KartMoveAnimation to use new spr2 states 2020-08-14 21:42:06 -04:00
Sally Coolatta
5a6263c36b Make it past p_mobj 2020-08-14 20:48:06 -04:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
f8d1e75025 Merge remote-tracking branch 'public/next' 2020-08-12 18:50:41 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
James R
11a4ca28d7 Remove PF_SKIDDOWN, just use PF_FAULT 2020-08-06 17:59:09 -07:00
James R
66c7cd4844 k_spinouttype magic numbers begone
Fixes wipeout running out in the air. It was really
only intended for explosions.
2020-08-05 16:28:47 -07:00
James R
b0c6b626cf Don't slow down on sneaker panels during spinout 2020-08-04 02:11:52 -07:00
Sally Coolatta
31b99de407 Use K_MomentumAngle for all instances of needing momentum angle for an object
This means we will never ever have any "standing still defaults to angle 0" issues again :)
2020-08-02 11:40:21 -04:00
Sally Coolatta
3dc2f4804f Angle & scale now impact how long you're in hitlag 2020-08-02 10:26:29 -04:00
Sally Coolatta
88be417717 Merge branch 'master' into hitlag-retry 2020-08-01 01:14:33 -04:00
Sally Coolatta
a8908d22cf K_SetHitlagForObjects, sets hitlag based on speed 2020-08-01 01:14:18 -04: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
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
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
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
57822f6756 Merge master 2020-07-29 05:19:51 -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
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
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