Commit graph

1789 commits

Author SHA1 Message Date
Sally Coolatta
0d1e98c7b9 Merge branch 'master' into bot-updates 2021-02-07 15:49:28 -05:00
Sally Coolatta
4535a642d6 Merge branch 'master' into spindash-rebalance 2021-02-07 02:35:55 -05:00
Sally Coolatta
fb1d495b5c Bots can recover from dying
Rogue code that came back from vanilla
2021-02-06 01:40:39 -05:00
Sally Coolatta
7584274636 Spring/spindash grease & invincibility gives you slope resistence 2021-02-05 23:28:22 -05:00
Sally Coolatta
cc2704bc87 Death animation
Art is missing, but functionality is complete.

The kart corpse is also placeable as type 4095. No way to set its color currently, it simply defaults to SKINCOLOR_RED.
2021-02-02 22:36:56 -05:00
Sal
df2a2b3b46 Merge branch 'lap-executor-edit' into 'master'
Lap executor edit

See merge request KartKrew/Kart!356
2021-02-02 01:30:07 -05:00
Sally Coolatta
092a24540b Camera no longer updates while you're in hitlag
The camera zooming out made it hard to focus on the hit, which is the opposite of what hitlag is intended to do :V
2021-02-01 22:28:02 -05:00
Sally Coolatta
d627da7510 Fix lap executors not happening, and also edit it so they act like Each Time rather than Once
Allows for simplified executor logic on Desert Palace and Chrome Gadget, possibly Egg Zeppelin too
2021-02-01 14:34:48 -05:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
Sal
57e69603a4 Merge branch 'natural-camera-outrun' into 'master'
Add distance easing to the camera, so it doesn't jitter around too much when you're stuck.

See merge request KartKrew/Kart!310
2021-01-06 22:27:09 -05:00
Sally Coolatta
c75b9cd89f Merge branch 'master' into natural-camera-outrun 2021-01-06 17:57:04 -05:00
Latapostrophe
74a39837bb Merge conflicts 2021-01-06 18:33:42 +01:00
James R
9c912f0cd4 Merge branch 'bot-fixes' into 'master'
Fix bots having weird rubberbanding in 2.2

See merge request KartKrew/Kart!337
2020-11-29 19:13:54 -05:00
James R
71553a8ad0 Merge branch 'battle-rethink' into 'master'
Battle rethink

See merge request KartKrew/Kart!335
2020-11-29 19:13:38 -05:00
toaster
f72108c4fa A whole bunch of cleanup to get most record attack/replay stuff reasonably functional.
* Fix the screen being stuck black at the very start of start record attack.
* Bump up the demoversion to 7, because I want all previous v2 demos to be guaranteed kaput (it was previously 4, but 7 is a nice number).
* Fix a ton MORE shitcausing misalignments in the replay system, this time specifically focused on getting ghosts functional.
* Plug a few holes in the "best lap" record implementation that allowed for stupidly easy records due to the way v2's finish lines work.
* Make a few follower-related things sane, to prevent spurious console prints that were getting in the way of my test prints.
2020-11-27 20:30:28 +00:00
Sally Coolatta
d0ca3b78c1 Merge branch 'master' into battle-rethink 2020-11-18 17:49:06 -05:00
Sal
b2eb64ac09 Merge branch 'roll-and-tilt' into 'master'
Roll & pitch replace modeltilt

See merge request KartKrew/Kart!326
2020-11-17 20:03:48 -05:00
Sally Coolatta
e16c7d722f Cherry-pick e1b265df2 2020-11-16 19:55:28 -05:00
Sally Coolatta
14b379fd27 Cherry-pick 4eb69a664 2020-11-16 19:52:26 -05:00
Sally Coolatta
6a4eb721bd The real problem 2020-11-16 18:35:07 -05:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Sally Coolatta
2b3a86d4b4 Merge branch 'master' into hitlag-retry 2020-11-10 21:37:09 -05:00
Sally Coolatta
fc934b38e1 Merge public next 2020-11-10 15:32:48 -05:00
Sally Coolatta
827f4e1068 Merge branch 'master' into natural-camera-outrun 2020-11-09 20:38:27 -05:00
Sally Coolatta
0e28470228 Merge master 2020-11-08 02:34:24 -05:00
Sally Coolatta
470e399abe Merge master, add support for hitlag jitter in OpenGL 2020-11-08 01:56:27 -05:00
James R
e2df4cf027 :V 2020-11-05 22:18:41 -08:00
Zachary McAlpin
2764c283d2 Execute LUAh_PlayerThink(player) at the end if the player has a valid mobj_t object 2020-11-05 21:26:24 -08:00
Zachary McAlpin
7efb33a38e Added PlayerThink hook 2020-11-05 21:23:22 -08:00
James R
81b8abed53 Merge remote-tracking branch 'origin/master' into paper-items-i-hate-my-life 2020-10-28 21:51:28 -07:00
Sally Coolatta
9dd43d4e4e Remove modeltilt, use roll & pitch instead
Broken currently, about half of the slopes you can go into have the wrong tilt
2020-10-28 18:36:26 -04:00
James R
de936f4c7f Don't reset drift off springs
Hopefully nothing requires drift reset from here.
2020-10-26 20:49:39 -07:00
Sally Coolatta
b83f9afecb Merge branch 'master' into battle-rethink 2020-10-26 22:22:40 -04:00
James R
364b69c621 Let turn while light snaking 2020-10-26 03:46:49 -07:00
James R
88a8a09516 Make sneaker panels push you in spinout AGAIN LOL
The old condition for player movement was...

1. player hasn't finished
2. player not in pain, or player in pain but on the ground

The else condition to this is therefore player has finished or player in pain
and in the air.

I believe K_MomentumToFacing (prior to bots) was only for letting the player
turn around after crossing the finish line, to face the camera.

(K_MomentumToFacing also does nothing in the air.)
2020-10-26 02:05:14 -07:00
James R
a50d281658 Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-25 13:44:43 -07:00
James R
2c35034960 Fix invincibility music not ending 2020-10-25 13:43:44 -07:00
Sally Coolatta
48d8bb242a Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-25 09:58:25 -04:00
Sally Coolatta
f121ed210a Fix flashing tics 2020-10-25 09:57:51 -04:00
Sally Coolatta
2509d5a29c Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-24 21:39:32 -04:00
Sally Coolatta
afbbfc9b1f Fix cvars
My wrist burns...
2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
ddf466d61f Fix compile errors 2020-10-24 19:52:09 -04:00
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -04:00
Sally Coolatta
0969ca1af9 Karma bombs rework
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
2020-10-24 11:27:42 -04:00
Sally Coolatta
f5788b34e6 Fix players not being able to turn in certain scenarios 2020-10-22 21:25:40 -04:00
James R
e10e4d79c3 Merge branch 'bustflags' into 'next'
Bustable Wall and Floor flags.

See merge request STJr/SRB2!1163
2020-10-18 16:42:15 -04:00
James R
1a49edbf24 Make it easier to go up a slope if using a sneaker 2020-10-17 21:50:26 -07:00
lachwright
72a7bb90c7 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
James R
6363162826 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00