Lachlan
cd152365fa
Fix skiddust positional scaling
2020-07-04 04:30:57 +08:00
Lachlan
ee7bc779ea
P_Earthquake: Use P_RadiusAttack in favor of thinker iteration
2020-07-04 04:00:28 +08:00
Lachlan
2ceff03a15
Fix buildbot warning
2020-07-04 03:21:48 +08:00
lachwright
0a3b728e81
Knuckles changes:
...
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
lachwright
5ec234e726
Merge branch 'next' into knuxtweaks
2020-07-02 13:08:04 +08:00
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
kaysrishaq
248cd81ee9
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04:00
lachwright
2215505c2b
Merge branch 'next' into more-platform-fixes
2020-06-17 01:53:19 +08:00
lachwright
92a43f2f2e
Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain
2020-06-17 01:46:36 +08:00
Sally Coolatta
59add5abd4
Merge branch 'master' into trick-panels
2020-06-14 20:46:01 -04:00
lachwright
b2b0fc435b
Platform fixes
2020-06-14 12:17:30 +08:00
Latapostrophe
4eac7f8366
Merge branch 'v2-master' into followme-internal
2020-06-10 23:38:19 +02:00
Latapostrophe
478e9cee7c
Use P_SetTarget
2020-06-09 19:59:46 +02:00
Steel Titanium
b8bbf5d9f4
Merge branch 'next' into sal-oglshaderport
2020-06-08 19:36:23 -04:00
lachwright
8087352f9e
Spindash: new braking
2020-06-09 05:27:05 +08:00
lachwright
b4057d10e7
Merge branch 'master' into spindash
2020-06-09 03:55:55 +08:00
Sal
7555177cb1
Merge branch 'viewpoint-reset' into 'master'
...
Reset some viewpoints properly (closes #69 )
Closes #69
See merge request KartKrew/Kart!282
2020-06-08 15:01:25 -04:00
Lachlan Wright
5263b8cf63
Merge branch 'fix-spawn-desynch' into 'next'
...
Fix desynch when a player spawns
See merge request STJr/SRB2!977
2020-06-08 05:25:41 -04:00
Lachlan Wright
f9c3a93cf3
Merge branch 'dashmode-fixes' into 'next'
...
Dashmode fixes
See merge request STJr/SRB2!909
2020-06-08 05:25:30 -04:00
Latapostrophe
cab9c2a139
Merge branch 'v2-master' into followme-internal
2020-06-07 23:56:32 +02:00
Hannu Hanhi
6961bba693
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
James R
7af0f92cc9
And somehow I replaced an instance of displayplayers on only one side of this conditional...
2020-06-06 22:28:40 -07: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
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
9ae8628424
mess with total ring calculations
2020-06-05 18:54:23 -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
889cf581d1
Fix bot air speed cap adjustments being reversed
2020-06-04 15:17:59 -04:00
Sally Coolatta
f4c0011a76
Merge branch 'master' into grand-pricks
2020-06-04 14:41:56 -04:00
Sally Coolatta
2a37bca626
Merge branch 'master' into respawn-updates
2020-06-04 00:16:37 -04:00
Sryder
d13d923a92
New water trail for skimming
...
Out with the old splish splish. Bring on the SKKKKSSSSSSS
2020-06-04 01:47:56 +01:00
Sally Coolatta
fac8f7f538
You get 1ups for carrying rings to the goal
2020-06-03 16:34:23 -04:00
Latapostrophe
aba1ff72bc
k_color.h is a thing now
2020-06-03 01:02:06 +02:00
Latapostrophe
6ac63cca7a
Merge branch 'v2-master' into followme-internal
2020-06-02 22:21:16 +02:00
Louis-Antoine
764f966ffe
Minor edit
2020-06-02 10:31:56 +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
MascaraSnake
69a7ac6b4e
Merge branch 'movement-refactor' into 'next'
...
Clean up some movement code
See merge request STJr/SRB2!912
2020-06-01 07:21:41 -04:00
Sally Coolatta
ede66a6632
Trick panels
2020-05-31 21:23:22 -04:00
Sally Coolatta
91b0246d99
Merge branch 'master' into grand-pricks
2020-05-31 15:53:31 -04:00
lachwright
984b996c7a
Ensure followmobj ghost exists before applying fuse
2020-05-30 18:26:11 +08:00
lachwright
70edaa9afa
Feedback so far indicates the old booster effect is preferred
2020-05-30 18:21:39 +08:00
lachwright
48f167d75c
Merge branch 'next' into dashmode-fixes
2020-05-30 18:13:21 +08: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
Sally Coolatta
fdb13b76d1
Make K_BotTopSpeedRubberband a function
2020-05-28 16:46:21 -04:00
Louis-Antoine
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
