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

Shields holstering support #2047

Merged
merged 1 commit into from Oct 22, 2019

Conversation

@akortunov
Copy link
Collaborator

akortunov commented Nov 24, 2018

Implements feature #5193.

Custom equipping animations: Animations.zip

Behaviour is similar to MWSE Weapon Sheathing mod, but with shield animations support.

Configs:

[Game]
weapon sheathing = true
shield sheathing = true
use additional anim sources = true

Requires skeletons from mentioned mod.

For now there are two ways to keep compatibility with Animated Morrowind and other mods with pseudo-shields:

  1. Declare bodyparts for such pseudo-shields as a Clothing, not as Armor.
  2. Create an _sh mesh without "Bip01 Sheath" node for pseudo-shield mesh.

Note: by default this PR takes model from shield bodyparts, not from ground models, for NPCs!

@akortunov akortunov force-pushed the akortunov:holstered_shield branch 2 times, most recently from 127b968 to ce246be Feb 23, 2019
@akortunov akortunov changed the title [Discussion] Shields holstering support Shields holstering support Apr 27, 2019
@akortunov akortunov force-pushed the akortunov:holstered_shield branch from ce246be to 6f90e42 Aug 11, 2019
@akortunov

This comment has been minimized.

Copy link
Collaborator Author

akortunov commented Aug 11, 2019

I updated this feature to work with upstream codebase.
If we can use this feature, I'll try to refactor it, otherwise I just will close this PR.

@akortunov akortunov force-pushed the akortunov:holstered_shield branch from 6f90e42 to 352a106 Aug 27, 2019
@akortunov akortunov force-pushed the akortunov:holstered_shield branch from 352a106 to ea2c174 Sep 18, 2019
apps/openmw/mwrender/actoranimation.cpp Outdated Show resolved Hide resolved
apps/openmw/mwrender/npcanimation.cpp Outdated Show resolved Hide resolved
docs/source/reference/modding/settings/game.rst Outdated Show resolved Hide resolved
apps/openmw/mwrender/actoranimation.cpp Show resolved Hide resolved
apps/openmw/mwrender/npcanimation.cpp Outdated Show resolved Hide resolved
@akortunov akortunov force-pushed the akortunov:holstered_shield branch from ea2c174 to 4c7a786 Sep 29, 2019
@akortunov akortunov removed the Discussion label Oct 22, 2019
@akortunov akortunov force-pushed the akortunov:holstered_shield branch from 4c7a786 to d3a3b2f Oct 22, 2019
@psi29a

This comment has been minimized.

Copy link
Member

psi29a commented Oct 22, 2019

Nice spelling catches, thanks there @unelsson

Merging.

@psi29a psi29a merged commit 262d878 into OpenMW:master Oct 22, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.