Commit graph

324 commits

Author SHA1 Message Date
Sally Coolatta
25c3774dc1 Let Sneakers stack with each other endlessly.
PROBABLY REALLY CONTROVERSIAL, so it's in this other branch... but it's tamer than it sounds, and it's *really* fun.

https://cdn.discordapp.com/attachments/275750804227489794/718541704822784061/kart0158.gif

https://cdn.discordapp.com/attachments/275750804227489794/718545963408687155/kart0161.gif

https://cdn.discordapp.com/attachments/275750804227489794/718543467847876689/kart0160.gif
2020-06-05 15:29:08 -04:00
Sally Coolatta
086ea73c2f Merge branch 'master' into respawn-updates 2020-06-01 15:49:30 -04:00
Sally Coolatta
d062a35a3a Huge respawn overhaul
- Moved respawn code to its own file
- Reorganized a lot of the code related to respawning
- As a result of the massive reorganization, I squashed several bugs. Most notably: mid-game joiners having weird spawns, being able to skip laps by respawning.
- Respawn lightsnake no longer takes you straight to your nextwaypoint -- it now has a minimum distance forward that it tries to put you at when you respawn.
2020-05-29 01:04:51 -04:00
Sally Coolatta
9933687c6e Merge branch 'master' into pet-robo 2020-05-24 17:18:02 -04:00
Sal
f0ed1a58ce Merge branch 'demoman-tf2' into 'master'
Additional local explosion effects.

See merge request KartKrew/Kart!263
2020-05-23 21:29:38 -04:00
Sally Coolatta
0282615c38 Merge branch 'master' into pet-robo 2020-05-18 15:18:37 -04:00
Latapostrophe
fc789790bb Create a quick P_StartQuake without epicenter/radius support and clean up the grand total of 4 earthquake uses in the code 2020-05-14 17:28:33 +02:00
Sally Coolatta
0038241325 Merge branch 'master' into new-cars-movie 2020-05-12 22:41:37 -04:00
Sally Coolatta
1788d29263 Merge branch 'master' into pet-robo 2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
9ea37836e2 New kart animations!
- Add unique frames for inward and outward drifting.
- Increase the speed threshold required to reach your "fast driving" frames.
- Use slow driving frames when you're slowing down, even if you're techincally above the fast speed threshold.
- Use frameangle to smooth out the transition into drifting, instead of having "pre-turned" drift frames.
2020-05-08 17:26:27 -04:00
Sally Cochenour
96d69785bf Merge branch 'master' into pet-robo 2020-04-18 01:18:22 -04:00
Sally Cochenour
9b4e10d5d7 Item dropping code cleanup 2020-04-09 22:56:31 -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
2ca00cf2e9 Try to prevent bubble from going out of bounds 2020-03-28 00:21:41 -04:00
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
Sally Cochenour
b6c282ec12 Move Eggman item code to k_collide 2020-03-26 00:47:30 -04:00
Sally Cochenour
88709aafaa Fix eggman items having no collision 2020-03-24 12:55:48 -04: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
Sally Cochenour
8d91ff1e1c No time limit in capsules 2020-03-22 16:13:41 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
Sally Cochenour
1886115e54 Allow Eggman items to be picked up by players using invulerability items 2020-03-17 20:30:30 -04:00
Sally Cochenour
040865b589 Merge branch 'master' into new-items 2020-03-17 19:31:47 -04:00
Sryder
c268313f0a Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/Makefile
#	src/k_kart.c
#	src/p_map.c
#	src/p_setup.c
#	src/p_spec.c
2020-03-16 00:13:42 +00:00
Latapostrophe
f98a74638f More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
James R
253ab49c07 Merge remote-tracking branch 'origin/master' into 22shadows 2020-03-05 21:36:58 -08:00
Sally Cochenour
18637b9eb2 2.2 shadow port 2020-03-01 22:12:50 -05:00
Sally Cochenour
3633dc341a Merge branch 'master' into targets 2020-03-01 15:42:49 -05:00
Sally Cochenour
76e75d9756 Fix offroad collision
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
2020-03-01 14:36:13 -05:00
James R
4f40edaf01 Maybe localdisplayplayers is a bad idea 2020-02-23 23:21:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
TehRealSalt
674c0aec17 Merge branch 'master' into new-items 2019-10-24 10:08:37 -04:00
James
f9ea683312 P_PlayerTouchingSectorSpecial turned into P_MobjTouchingSectorSpecial 2019-10-22 08:45:38 -04:00
TehRealSalt
c6566ec31a Merge branch 'master' into versus-record 2019-10-03 01:32:59 -04:00
Sal
8338d3e71c Merge branch 'fortnite' into 'master'
Battle sudden death

See merge request KartKrew/Kart!166
2019-10-03 01:27:09 -04:00
TehRealSalt
9a9a1c1374 This shouldn't be merged 2019-09-27 15:31:57 -04:00
James R
1d59d8305d Remove trailing whitespace 2019-09-26 14:39:23 -07:00
TehRealSalt
7cfcb2f61a Don't select items in the air or with the Ambush flag for overtime 2019-09-24 02:00:27 -04:00
TehRealSalt
38bb44e732 Separate into k_pwrlv.c, add defines to reduce amount of magic numbers 2019-09-23 08:26:42 -04:00
TehRealSalt
77aeb4663b Merge branch 'master' into versus-record 2019-09-23 07:03:56 -04:00
TehRealSalt
b8a752e40a Merge master 2019-09-18 21:47:11 -04:00
TehRealSalt
1ef09699d1 Functional gameplay
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score

Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
2019-09-15 20:19:48 -04:00
TehRealSalt
2648e5d3de Fix the inner capsule sides not moving outward 2019-09-15 17:33:49 -04:00
TehRealSalt
cd65381abc Add another file to handle Kart item collision functions, now items can damage anything with MF_SHOOTABLE
Now this code won't make me pull out my hair. Could possibly be enhanced by using a function or define to handle the big copy-pasted tmthing/thing switch blocks in p_map, but for now I'm way happier.

As a result, Battle capsules are now destructible.
2019-09-15 17:25:33 -04:00