Skip to content

Revert "team based blocking and options"#709

Merged
nullsystem merged 1 commit into
NeotokyoRebuild:masterfrom
nullsystem:RevertCollisionChange
Oct 13, 2024
Merged

Revert "team based blocking and options"#709
nullsystem merged 1 commit into
NeotokyoRebuild:masterfrom
nullsystem:RevertCollisionChange

Conversation

@nullsystem

@nullsystem nullsystem commented Oct 12, 2024 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Description

  • Revert bb49e49.
  • Revert 82df07f.
  • It doesn't work properly with actual players (only bots/LAN dedicated), and instead caused a "soft" blocking?
  • Not gonna bother anymore, it's mixed up with the tracing stuff. If team-based blocking couldn't be done properly like this then might as well go back to the previous no-blocking code which worked fine for quite a long time anyway

Toolchain

  • Linux GCC Distro Native Arch/GCC 14

Issues

@nullsystem
Revert "team based blocking and options"
0e8eeb6 
* Revert bb49e49.
* Revert 82df07f.
* It doesn't work properly with actual players (only bots/LAN
  dedicated), and instead caused a "soft" blocking?
* Not gonna bother anymore, it's mixed up with the tracing stuff.
@nullsystem
nullsystem marked this pull request as ready for review October 12, 2024 22:36
@nullsystem
nullsystem requested a review from a team October 12, 2024 22:36
@nullsystem nullsystem added this to the v9.1-prealpha milestone Oct 12, 2024
@nullsystem
nullsystem requested a review from a team October 12, 2024 22:39
@nullsystem
nullsystem merged commit c697ca9 into NeotokyoRebuild:master Oct 13, 2024
@nullsystem
nullsystem deleted the RevertCollisionChange branch May 7, 2025 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Rainyan Rainyan Rainyan approved these changes
+1 more reviewer
@brysondev brysondev brysondev approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

URGENT

Projects

None yet

Milestone

v10.0-prealpha

Development

Successfully merging this pull request may close these issues.

neo_sv_collision 0 still has collisions, players colliding with own grenades regardless of collision mode

3 participants

@nullsystem @Rainyan @brysondev