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
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
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
MascaraSnake
31bdf38f89
Merge branch 'nospinmovecut' into 'next'
...
Don't cut momentum if landing in a roll
See merge request STJr/SRB2!972
2020-06-07 13:24:19 -04:00
Monster Iestyn
3a7417c8fe
Merge branch 'master' into next
2020-06-06 20:35:48 +01:00
lachwright
207c6d71a9
Merge branch 'next' into nospinmovecut
2020-06-07 02:45:26 +08:00
Monster Iestyn
d0d6f76f8e
P_XYMovement: initialise slopemom to all zeros
2020-06-03 20:47:49 +01: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
lachwright
534aea9f62
Don't cut momentum if landing in a roll
2020-05-30 19:07:16 +08:00
lachwright
48f167d75c
Merge branch 'next' into dashmode-fixes
2020-05-30 18:13:21 +08:00
Louis-Antoine
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
MascaraSnake
ccd2371d42
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02:00
MascaraSnake
f1744efbd5
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
74fa35221d
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
6af2871fa5
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
MascaraSnake
7004d8ca75
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
MascaraSnake
4c526f6e50
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
James R
5ad69621f2
Use camera angle, not mobj angle, when comparing Angle Anchor
2020-05-10 19:40:28 -07:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
lachwright
645c324d51
Update new GFZ3 laser
2020-05-06 09:03:03 +08:00
MascaraSnake
4e6a0c0ae9
Revert some very incorrect refactoring
2020-05-02 15:33:15 +02:00
MascaraSnake
5a6d3753c0
Refactor P_PushableCheckBustables
2020-05-02 15:30:56 +02:00
MascaraSnake
cd9f6a2b7e
P_PlayerZMovement: Move PolyObject handling code into its own function
2020-05-02 13:49:16 +02:00
MascaraSnake
1cee43f945
Merge branch 'remove-polyobjects' into movement-refactor
2020-05-02 13:37:13 +02:00
MascaraSnake
147a1a8a0a
P_PlayerZMovement: Move checks for Mario blocks into their own function
2020-05-02 13:34:24 +02:00
MascaraSnake
1929b62133
P_PlayerMobjThinker: Move check for floatbob platforms into its own function
2020-05-02 13:08:13 +02:00
MascaraSnake
d037a12e54
P_PlayerMobjThinker: Move crumbling platforms check into its own function
2020-05-02 12:50:09 +02:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
lachwright
1568114d13
Dashmode fixes:
...
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
Monster Iestyn
f26e8f3df7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
sphere
7955c96fa1
Restore carelessly removed const keywords.
2020-04-22 23:38:10 +02:00
sphere
0868930d3b
Make emerald hunt shards spawn at correct heights, and add Float option.
2020-04-22 18:58:40 +02:00
MascaraSnake
93eb0ee1c8
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
Monster Iestyn
0a288260fc
Merge branch 'buggle-trouble' into 'next'
...
P_HomingAttack related fixes
See merge request STJr/SRB2!836
2020-03-22 16:57:22 -04:00
Louis-Antoine
29294a53cc
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Tatsuru
06a2882dc9
Never forget who your enemy is
2020-03-03 11:40:35 -03:00
SwitchKaze
9508b23d85
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-29 23:41:16 -05:00
Jaime Passos
9d0e3465f9
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
b8e8b5517d
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
2020-02-24 20:03:08 -03:00
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
lachwright
6e471ef8b2
Start CA_GLIDEANDCLIMB swimming functionality
2020-02-23 15:38:11 +08:00