Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: player physics simulate list shuffle #318

Merged
merged 14 commits into from
Nov 16, 2024
Merged

feat: player physics simulate list shuffle #318

merged 14 commits into from
Nov 16, 2024

Conversation

Kxnrl
Copy link
Collaborator

@Kxnrl Kxnrl commented Oct 27, 2024

This pr fix entity touch order,
make trigger_ pick random first entity possible.

i also import default clang-format.
i make pr for cs2fixes feeling pain everytime.
cs2fixes code using tab indent, but it's bad to displaying for github review.
feel free to change to space.

@Kxnrl Kxnrl marked this pull request as ready for review October 28, 2024 07:58
@Kxnrl Kxnrl requested review from Vauff and xen-000 October 28, 2024 07:58
.clang-format Outdated
Comment on lines 1 to 143
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterStruct: true
AfterUnion: false
AfterExternBlock: false
BeforeCatch: true
BeforeElse: true
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false

BreakBeforeBinaryOperators: NonAssignment

BreakBeforeBraces: Custom

BreakBeforeTernaryOperators: false

BreakConstructorInitializers: AfterColon

#BreakInheritanceList: AfterColon

BreakStringLiterals: false

ColumnLimit: 0

CompactNamespaces: true

ConstructorInitializerAllOnOneLineOrOnePerLine: false

ConstructorInitializerIndentWidth: 4

ContinuationIndentWidth: 4

Cpp11BracedListStyle: true

DerivePointerAlignment: false

FixNamespaceComments: true

IndentCaseLabels: false

IndentWidth: 4

IndentWrappedFunctionNames: false

KeepEmptyLinesAtTheStartOfBlocks: false

MaxEmptyLinesToKeep: 1

NamespaceIndentation: None

PointerAlignment: Left

ReflowComments: true

SortUsingDeclarations: false

SpaceAfterCStyleCast: false

SpaceAfterTemplateKeyword: true

SpaceBeforeAssignmentOperators: true

# SpaceBeforeCpp11BracedList: true

# SpaceBeforeCtorInitializerColon: true

# SpaceBeforeInheritanceColon: true

SpaceBeforeParens: ControlStatements

# SpaceBeforeRangeBasedForLoopColon: true

SpaceInEmptyParentheses: false

SpacesBeforeTrailingComments: 1

SpacesInAngles: false

SpacesInCStyleCastParentheses: false

SpacesInContainerLiterals: true

SpacesInParentheses: false

SpacesInSquareBrackets: false

Standard: Auto

TabWidth: 4

UseTab: Always

SortIncludes: true

IndentPPDirectives: AfterHash
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally I'm all for this, but reformatting the code will introduce a ton of merge conflicts to forks. I think @Vauff will be a better judge for how badly it'll affect his (GFL's) fork.

I also noticed some files were almost entirely run through clangformat which makes this hard to review, if we're doing this it should be in a separate commit/PR.

@Vauff Vauff merged commit 223a007 into main Nov 16, 2024
3 checks passed
@Vauff Vauff deleted the feat/physics-shuffle branch November 16, 2024 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants