Commit graph

1789 commits

Author SHA1 Message Date
Sally Coolatta
69b6ba2f18 I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
2020-07-28 03:34:39 -04:00
Sally Coolatta
fc89f2cc47 Remove start boosts, let you roam, kill you for crossing the line before the start 2020-07-24 02:59:47 -04:00
Sally Coolatta
25e9c72bab Merge branch 'master' into spindash 2020-07-23 19:12:00 -04:00
James R
1f2697050b Merge branch 'fix-nights-fullbright' into 'next'
NiGHTS fullbright fixes

See merge request STJr/SRB2!1080
2020-07-22 22:15:07 -04:00
lachwright
c6f752a394 Fix Super Sonic exploiting CA_FLOAT abilities 2020-07-21 03:50:26 +08:00
Sally Coolatta
643a63e1e6 Finish merge 2020-07-20 13:39:05 -04:00
Sally Coolatta
ef2579f2b3 Merge branch 'master' into draw-flags 2020-07-20 13:38:48 -04:00
lachwright
c9d8fcc1cb Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
James R
2182018930 Merge branch 'p-xymovement-lua-exposure' into 'next'
Expose several movement-related functions to Lua.

See merge request STJr/SRB2!884
2020-07-12 19:11:47 -04:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
GoldenTails
80b42ba46e Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails
b3198ed063 Replace PF_USEDOWN with PF_SPINDOWN 2020-07-11 21:59:54 -05:00
GoldenTails
36e1c30e19 Replace all occurances of BT_USE with BT_SPIN (2.3?)
I'd use `next-major` but it doesn't exist lol
2020-07-11 21:59:54 -05:00
Snu
b03a0ee735 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul
Updated to 2.2.5
2020-07-10 17:08:53 +01:00
Snu
5f7175204f Changed Bubble Shield functionality 2020-07-10 05:59:10 +01:00
James R
f1648fbf5c Followers compiler warnings 2020-07-09 16:39:47 -07:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -03:00
lachwright
8ab98011f6 Spindash charge (WIP) 2020-07-06 08:10:03 +08:00
LJ Sonic
83f53943a6 Merge branch 'knuxtweaks' into 'next'
Knuckles tweaks

See merge request STJr/SRB2!1030
2020-07-04 16:37:35 -04:00
LJ Sonic
b558c523a2 Merge branch 'fix-oldbrak-missiles2' into 'next'
Take 2: Fix Old Brak missiles + add pw_ignorelatch

See merge request STJr/SRB2!1006
2020-07-04 16:28:48 -04:00
lachwright
d989d57bd0 Reduce speed cut when gliding underwater 2020-07-04 19:17:38 +08:00
lachwright
10b09f49c3 Add sightcheck boolean to P_RadiusAttack
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
Lachlan
44dfcc7b3d Merge remote-tracking branch 'origin/next' into more-platform-fixes 2020-07-04 05:25:38 +08:00
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