-
Notifications
You must be signed in to change notification settings - Fork 167
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
Ifdef several collision changes from vanilla + improved debug free move #794
Open
Arceveti
wants to merge
26
commits into
HackerN64:develop/2.4.0
Choose a base branch
from
Arceveti:develop/2.2.0-ifdef-collision-improvements
base: develop/2.4.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+332
−190
Open
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
26e0daf
Add COLLISION_IMPROVEMENTS define, implement ROUNDED_WALL_CORNERS and…
Arceveti 02f524b
Add SLOPE_FIX define and remove add_ceil_margin
Arceveti 21d3c14
Avoid calculating FIND_FLOOR_BUFFER twice
Arceveti 96f19dc
Make find_ceil consistent with find_floor
Arceveti b001875
Improved debug free move
Arceveti d9ac2bf
Implement EXPOSED_CEILINGS_FIX and DISABLE_CEILING_BONKS defines
Arceveti b247c4d
Improve SLOPE_FIX ifdefs + small optimization
Arceveti abfe05b
Improve define descriptions
Arceveti 93dceb1
Fix Mario getting stuck squished if entering debug free move
Arceveti 182c4fd
Improve collision define comments
Arceveti 3d677ec
Revert removal of 78 unit buffer for ceiling checks
Arceveti 068f9a5
Rename 'EXPOSED_CEILINGS_FIX' to 'FIX_EXPOSED_CEILINGS'
Arceveti d670157
Revert reverting ceiling buffer
Arceveti 6a3e2f6
Move 'DISABLE_CEILING_BONKS' to config_movement.h
Arceveti ac663c4
Implement SIMULTANEOUS_WALL_COLLISIONS (maybe)
Arceveti 032316a
Fix SIMULTANEOUS_WALL_COLLISIONS ifdef
Arceveti eb3a4bf
Remove SIMULTANEOUS_WALL_COLLISIONS
Arceveti 751854d
bounds check comments
Arceveti d1ad8b3
Add FIX_FALSE_LEDGE_GRABS define (not implemented yet)
Arceveti 2565dc7
Improve check ordering
Arceveti 2239f1c
Rename 'SLOPE_FIX' to 'FIX_SURFACE_CUCKING'
Arceveti 0dbd237
Remove FIX_SURFACE_CUCKING define + variable renames
Arceveti 9717468
Move defines into config_movement.h
Arceveti ed921b2
Merge branch 'develop/2.3.0' of https://github.com/HackerN64/HackerSM…
Arceveti da74568
Cleaner 'FIX_EXPOSED_CEILINGS' ifdef
Arceveti 57a648e
Formatting changes :)
Arceveti File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why skip a number?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's how it was in vanilla, this just restores it. Should it be changed to
(1 << 2)
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah it just makes more sense