Commit graph

680 commits

Author SHA1 Message Date
kaysrishaq
248cd81ee9 brak missile fix, pw_ignorelatch, small Recycler fix 2020-06-18 17:09:29 -04:00
lachwright
ab7b4a29e5 Add SF_NOSUPERSPRITES 2020-06-17 04:53:42 +08:00
Sally Coolatta
59add5abd4 Merge branch 'master' into trick-panels 2020-06-14 20:46:01 -04:00
lachwright
8087352f9e Spindash: new braking 2020-06-09 05:27:05 +08:00
Latapostrophe
cab9c2a139 Merge branch 'v2-master' into followme-internal 2020-06-07 23:56:32 +02:00
Sal
58dbdc2378 Merge branch 'grand-pricks' into 'master'
Grand pricks

See merge request KartKrew/Kart!258
2020-06-07 01:28:35 -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
Latapostrophe
f33e4d62a0 Sort conflicts, fix misordered follower bubble states in dehacked 2020-06-05 02:33:39 +02:00
Sally Coolatta
f4c0011a76 Merge branch 'master' into grand-pricks 2020-06-04 14:41:56 -04:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
Sally Coolatta
086ea73c2f Merge branch 'master' into respawn-updates 2020-06-01 15:49:30 -04:00
LJ Sonic
aeeb6e1b02 Merge branch 'next' into 'fix-spawn-desynch'
# Conflicts:
#   src/p_map.c
2020-06-01 08:15:02 -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
285de3357d Add back to resynch & savegame, shorten names of a few variables 2020-05-29 13:12:07 -04:00
Sally Coolatta
0879459142 Add distance based on air time
Using the respawn command gives you barely any distance, while flying off huge  MGZ pits gives you a bunch.
2020-05-29 10:37:34 -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
edfc14c506 Better steering
- If they're already turning in one direction, they are more likely to steer in that direction for objects
- Bots have to want to turn in 1 direction for a few frames in a row before it'll let them

Prevents twitching & makes them less indecisive in general
2020-05-24 11:12:38 -04:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05: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
Sally Coolatta
47c2c875d5 Increase bot difficulty every match based on placement, implement rival tag
Rival tag does not have an in-game indicator, but it is there & it gives the bot better odds
2020-05-14 02:18:32 -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
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
Latapostrophe
766f7f035f Let followers change colour separatly from players 2020-05-04 18:08:41 +02:00
Latapostrophe
59452ae026 Merge branch 'v2-master' into followme-internal 2020-05-04 12:52:47 +02:00
Sally Coolatta
cb12d1ebf8 Merge branch 'master' into pet-robo 2020-05-03 21:30:40 -04:00
ZipperQR
d62d43a76b Dust devil support 2020-04-22 00:59:12 +03:00
Sally Cochenour
21bab775b1 Add difficulty settings 2020-04-19 09:07:29 -04:00
James R
71f4433b98 Merge branch 'dye' into 'next'
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
James R
2c539300d3 Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER 2020-04-09 16:47:52 -07:00
Sally Cochenour
b983031587 Yet more misc polish since I can't focus on orbis
- Massive improvements to object steering -- they do it more often and more strongly
- Steering towards hurtable players is now weighted on acceleration, and steering away from painful players is weighted on handling
- Bots now can get & use Thunder Shield
- Bots now know how to detontate Eggman Item explosions early
- Top speed gets a buff to make up for them losing lots of speed without drifting, weighted more heavily towards low acceleration characters
2020-04-04 01:42:56 -04:00
James R
6975de85b4 Call the substitution macro FOREACH 2020-03-31 16:45:36 -07:00
James R
1243d0940a Merge remote-tracking branch 'origin/master' into more-debug 2020-03-31 16:44:04 -07:00
Sally Cochenour
fb550f2868 Slightly smarter sneaker usage
- Use sneaker if held for too long without a proper use
- Use sneaker if losing too much speed
- Use sneaker if you have another boost (tether, boosters)
- Add triple sneaker & rocket sneaker support
- Don't go towards shortcut waypoints without a shortcut item
- Bots get naturally better handling
2020-03-30 17:17:20 -04:00
Sally Cochenour
774c85d660 Rudimentary item usage code 2020-03-29 19:56:05 -04:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
Sally Cochenour
9de1e535f2 More complete flame shield rework 2020-03-19 01:35:31 -04:00
Sally Cochenour
10c625b42e Start on flame shield rework 2020-03-18 02:38:02 -04:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
7f190f35f2 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
2020-02-19 17:46:18 -03:00
Tatsuru
1463d8ba20 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
James R
3070a09dde Merge branch 'pw-justlaunched' into 'next'
Add pw_justlaunched to tell modders when a player launches from a slope

See merge request STJr/SRB2!792
2020-02-18 21:53:05 -05:00
James R
c078af0022 Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER 2020-02-18 18:23:20 -08:00
fickleheart
598f66a997 Let scripters see if player just launched from slope 2020-02-16 21:34:07 -06:00