Sally Coolatta
136bb1d252
Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player
2020-06-06 19:45:13 -04:00
Sally Coolatta
b7a8c1f128
Merge branch 'master' into trick-panels
2020-06-05 18:41:21 -04:00
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
f4c0011a76
Merge branch 'master' into grand-pricks
2020-06-04 14:41:56 -04:00
Sally Coolatta
086ea73c2f
Merge branch 'master' into respawn-updates
2020-06-01 15:49:30 -04:00
Sally Coolatta
ede66a6632
Trick panels
2020-05-31 21:23:22 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -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
Louis-Antoine
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
Sally Coolatta
20b2dabae9
Merge branch 'pet-robo' into grand-pricks
2020-05-25 12:44:59 -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
Sally Coolatta
e425eabf04
Merge branch 'master' into grand-pricks
2020-05-17 11:39:39 -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
62cc86c788
Eliminate the last place bot properly
2020-05-13 21:29:46 -04:00
Sally Coolatta
e51bceb567
Items respawn in GP
2020-05-13 03:04:33 -04:00
Sally Coolatta
fa5fccffc5
Implement lives system
...
Lose a life & restart the current race if you place below the top half. Lose all of your lives, and you get kicked to the title screen.
2020-05-13 02:14:39 -04: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
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03: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
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
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
James R
17082fafbd
Merge branch 'gtr-replace' into 'next'
...
Separate PvP damage from ringslinger
See merge request STJr/SRB2!831
2020-04-09 19:51:52 -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
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
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
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01: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
Zipper
5c9e689d04
Update p_inter.c
2020-03-05 18:48:20 -05:00
Zipper
cc26d9d2bf
Update p_inter.c
2020-03-05 18:30:27 -05:00
