Snu
afcadb3232
Remove all instances of PF_CANBUSTFLOORS
2020-09-29 20:16:06 +01:00
Snu
cd4f755e53
Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively.
2020-09-29 13:52:35 +01:00
Snu
75042d781f
Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls.
2020-09-29 13:47:48 +01:00
Snu
90fbb752fa
Add functionality to PF_CANBREAKFLOORS
2020-09-29 12:58:36 +01:00
Snu
d07422bda1
Change breaking walls requirement from CA_GLIDEANDCLIMB to SF_CANBREAKWALLS.
2020-09-29 10:32:45 +01:00
LJ Sonic
9c1bee694b
Merge branch 'knuxtweaks' into 'next'
...
Knuckles tweaks
See merge request STJr/SRB2!1030
2020-07-04 16:37:35 -04:00
LJ Sonic
6c61baa818
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
17daf2faa2
Reduce speed cut when gliding underwater
2020-07-04 19:17:38 +08:00
lachwright
527e682931
Add sightcheck boolean to P_RadiusAttack
...
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
Lachlan
e2bdb56f97
Merge remote-tracking branch 'origin/next' into more-platform-fixes
2020-07-04 05:25:38 +08:00
Lachlan
e44d93f76b
Fix skiddust positional scaling
2020-07-04 04:30:57 +08:00
Lachlan
84000a0add
P_Earthquake: Use P_RadiusAttack in favor of thinker iteration
2020-07-04 04:00:28 +08:00
Lachlan
7e72009a87
Fix buildbot warning
2020-07-04 03:21:48 +08:00
lachwright
8652bbc1a5
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
3ebc17ac3a
Merge branch 'next' into knuxtweaks
2020-07-02 13:08:04 +08:00
James R
067d9b9a63
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
kaysrishaq
682791a024
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04:00
lachwright
e403de7459
Merge branch 'next' into more-platform-fixes
2020-06-17 01:53:19 +08:00
lachwright
29738fcdd0
Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain
2020-06-17 01:46:36 +08:00
lachwright
38e2c999c5
Platform fixes
2020-06-14 12:17:30 +08:00
Steel Titanium
62d73968e2
Merge branch 'next' into sal-oglshaderport
2020-06-08 19:36:23 -04:00
Lachlan Wright
191e2e094d
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
614a98bd9d
Merge branch 'dashmode-fixes' into 'next'
...
Dashmode fixes
See merge request STJr/SRB2!909
2020-06-08 05:25:30 -04:00
Hannu Hanhi
da98ea242e
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
Louis-Antoine
9be188ff02
Minor edit
2020-06-02 10:31:56 +02:00
LJ Sonic
e2b860dc28
Merge branch 'next' into 'fix-spawn-desynch'
...
# Conflicts:
# src/p_map.c
2020-06-01 08:15:02 -04:00
MascaraSnake
8d7f4e3265
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
lachwright
b874da5229
Ensure followmobj ghost exists before applying fuse
2020-05-30 18:26:11 +08:00
lachwright
51b640ad5a
Feedback so far indicates the old booster effect is preferred
2020-05-30 18:21:39 +08:00
lachwright
ae5d5b9546
Merge branch 'next' into dashmode-fixes
2020-05-30 18:13:21 +08:00
Louis-Antoine
67eef5a37f
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
SwitchKaze
b37c73b008
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
46191cade7
Update to 2.2.4
2020-05-22 16:47:51 -05:00
MascaraSnake
ff37975892
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02:00
MascaraSnake
33a22331f8
Merge branch 'waypoints' into 'next'
...
Store waypoints at map load instead of iterating through the thinker list to find them
See merge request STJr/SRB2!938
2020-05-18 16:00:46 -04:00
Louis-Antoine
d0abd6e86c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
Louis-Antoine
a06c4a8c98
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
MascaraSnake
9cd9d2e0d7
Merge branch 'carry-dust-devil' into 'next'
...
Add carry types to Dust devils
See merge request STJr/SRB2!886
2020-05-15 02:50:29 -04:00
ZipperQR
6a9543b1c2
no message
2020-05-14 03:35:46 +03:00
MascaraSnake
36843cbfd6
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
MascaraSnake
d708789c3a
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Louis-Antoine
0c4f983eb5
Fix crash with rollout rock
2020-05-11 23:48:35 +02:00
James R
7257fc730a
Remove instances of HAVE_BLUA that actually disable Lua now
2020-05-10 19:59:56 -07:00
lachwright
215ff828f8
Merge branch 'master' into next
2020-05-11 01:29:10 +08:00
Jaime Passos
39c5ab4e17
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Lachlan
426925c5fc
Play the 1-up sound when 1upsound is set to sound
2020-05-08 04:07:00 +08:00
Zipper
87f7100d2e
Update p_user.c
2020-05-06 09:30:15 -04:00
MascaraSnake
d0d25025e1
Refactor P_CheckBouncySectors
2020-05-03 10:01:58 +02:00
Steel Titanium
887c25e047
Remove inline keyword from P_DoTwinSpin function
...
The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error
2020-05-02 17:39:55 -04:00
MascaraSnake
d9ed914e14
Merge branch 'amyswings' into 'next'
...
Restore jump-related pflags properly during twinspin
See merge request STJr/SRB2!908
2020-05-02 10:03:49 -04:00
