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.

Sign up for GitHub

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

Jump to bottom

Z targeting combat pr #1

Merged
merged 95 commits into from
Jun 1, 2022
Merged

Z targeting combat pr #1

merged 95 commits into from
Jun 1, 2022

Conversation

GitWillG
Copy link
Owner

@GitWillG GitWillG commented Jun 1, 2022 •
edited
Loading

Mering Gonnavis branch into mine

@gonnavis
branch: AnimSwordWalk.
024ab7a
@gonnavis
lerp leg between sword and walk/run by idleWalkFactor.
d7f6681
@gonnavis
lerp full combo animation ( which already processed legs ) when start…
f055d6d 
… combo.
@gonnavis
use isCombo instead of isTop.
8c6c993
@gonnavis
trim combo animation's start a little.
9d869b7
@gonnavis
trim combo animation's end to prevent sword cross player's head.
8f576d3
@gonnavis
Merge branch 'master' into AnimSwordWalk
c7a3435
@gonnavis
add silsword.
de84155
@gonnavis
handle crouch sword.
d71e237
@gonnavis
clean.
939d70f
@gonnavis
fix aimAnimation while walk/run.
93e5d3b
@gonnavis
blend walk/run into arms when aiming.
b8db971
@gonnavis
fix timing problem.
aeefba5
@gonnavis
fix unuseAnimation not stop problem.
b6c23c0
@gonnavis
new sword animations.
f927d5a
@gonnavis
move trimClip() from runtime to baker.
f056c61
@gonnavis
use isArm instead of isCombo.
2f87848
@gonnavis
check !isArm instead of isArm. && clean.
e16eb6a
@gonnavis
add isLastBone.
f5392da
@gonnavis
slowdown sword aiming animation.
8dfa702
@gonnavis
generally handle end-action transition.
441b049
@gonnavis
Revert "generally handle end-action transition."
3c365d3 
This reverts commit 441b049.
@gonnavis
set unuseAnimation = null at outter.
dd0ea6f
@gonnavis
Merge branch 'master' into AnimSwordWalkPr
276f6b5
@gonnavis
Rebuild animations.z.
a923e49
@gonnavis
add comment.
871866e
@gonnavis
Merge branch 'master' into AnimSwordWalkPr
1f4de6c
@gonnavis
revert fixing of useAnimation not stop problem, may try in another PR.
4dc4625
@gonnavis
del trimClip().
f6c2fe4
@gonnavis
revert changes of useAnimation.
713446d
gonnavis and others added 27 commits May 19, 2022 04:12
@gonnavis
dev
65464c8
@gonnavis
move codes into if (this.target).
97e6904
@gonnavis
set cameraOffset.xy only when has target.
1bc6bed
@gonnavis
dev
00707ec
@gonnavis
dev
1d04bbc
@gonnavis
use cameraManager.lastNonzeroDirectionVector instead of `ioManager.…
ec4d5c2 
…keys` in order to respect velocity damping.
@gonnavis
testing.
c6f548a
@gonnavis
clean: combatTarget.
6163d80
@gonnavis
prevent z-lock conflict with dynamicTarget.
809b6fe
@gonnavis
Merge remote-tracking branch 'upstream/z-targeting' into zTargetingCo…
4719e63 
…mbat
@gonnavis
dev
c667431
@gonnavis
Merge remote-tracking branch 'upstream/z-targeting' into zTargetingCo…
e158685 
…mbat
@gonnavis
use zTargeting.focusTargetReticle.position instead of window.npcPlaye…
766f392 
…rs[0].position.
@gonnavis
restore look npc side. && adjust camera position.
3596d66
@gonnavis
dev
c36fea9
@gonnavis
fix narutoRun direction.
c3f430f
@gonnavis
use localVector instead of new.
1aee7a3
@gonnavis
do not affect npcPlayers, only set z-lock to localPlayer.
b929139
@gonnavis
dev
0aed307
@gonnavis
ok: focusTargetReticleDynamicPosition.
884eef0
@gonnavis
support dynamic focusTargetReticle.
82121dd
@gonnavis
change focusTargetReticle.position instead of focusTargetReticleDynam…
4d1ead3 
…icPosition.
@gonnavis
fix no focusTargetReticle bug.
a5566d8
@gonnavis
rename focusTargetReticleObject to focusTargetObject.
294a402
@gonnavis
focus on / look at npcPlayer's head.
88bab52
@gonnavis
only pan camera when targetType === 'static'.
c1eb1ef
@GitWillG
Merge branch 'z-targetSwap' into zTargetingCombatPr
5f93996
@GitWillG GitWillG marked this pull request as ready for review June 1, 2022 08:43
@GitWillG GitWillG merged commit f208bdc into GitWillG:z-targetSwap Jun 1, 2022
@GitWillG GitWillG mentioned this pull request Jun 1, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GitWillG @gonnavis