-
Notifications
You must be signed in to change notification settings - Fork 12
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
Grenades falling through floor, dropped weapon mechanics #545
Open
AdamTadeusz
wants to merge
10
commits into
NeotokyoRebuild:master
Choose a base branch
from
AdamTadeusz:021_grenadesFallingThroughFloor
base: master
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.
Open
Grenades falling through floor, dropped weapon mechanics #545
AdamTadeusz
wants to merge
10
commits into
NeotokyoRebuild:master
from
AdamTadeusz:021_grenadesFallingThroughFloor
+92
−24
Conversation
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
Merged
nullsystem
requested changes
Sep 12, 2024
…ade primaryammo count when dropped
…ielding the primed grenade
@AdamTadeusz Odd, it seems like the grenades had to be shot at first before they can be picked up? Can't just simply walk over it. |
Rainyan
reviewed
Sep 14, 2024
Comment on lines
+1780
to
+1781
// If attack button was held down when player died, drop a live grenade. NEOTODO (Adam) Add delay between pressing an attack button and the pin being fully pulled out. If pin not out when dead do not drop a live grenade | ||
if (GetActiveWeapon() == pNeoWeapon && pNeoWeapon->GetNeoWepBits() & NEO_WEP_FRAG_GRENADE) { |
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.
This is not parity, so it should probably go behind a cvar at a minimum.
nullsystem
added
the
Minor release priority
Pull request is a priority for the next minor release
label
Sep 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Grenades don't fall through the floor, picked up grenades can be used, grenades are only picked up if missing a grenade of that type, weapons dropped on death fall from their attachment point and inherit parent velocity and force of damage that led to death
Toolchain
Linked Issues