This repository has been archived by the owner on Apr 29, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 548
Fix for being able to ranged attack while resting/synthing/sitting #6328
Open
Caelic
wants to merge
11
commits into
DarkstarProject:master
Choose a base branch
from
Caelic:resting-ra-fix
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.
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
wiki link referenced in header comment. video demo: https://www.youtube.com/watch?v=yChnPS02kJs&feature=youtu.be
Add files via upload
fork sync to upstream repo
entry point for RA state, disallow RA if resting/synthing/sitting
completion check for RA, disallow completion of the RA if the player has started resting/synthing/sitting during their aiming
is there a way to clean out those unrelated changelogs in my master branch? i don't want to fully delete it and re-fork because i have other pull requests pending off that fork right now. only those last two commit changes apply to this pull request. |
you should avoid using master for exactly this reason. Make a separate branch for each thing you are working on / pull requesting. If your server is on your fork as well, give it its own branch as well. Keep master a 1:1: copy of Darkstar's master. |
code itself seems fine |
if you need help with that rebase hit me up on discord this weekend. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
CanChangeState() function doesn't catch character animations such as resting/synthing/sitting for allowing or disallowing ranged attack. you are currently able to ranged attack freely while doing these 3 actions.