Nelsson Huotari
3194520dcd
Move base_anim settings to settings-default.cfg
2021-01-27 13:41:02 +02:00
Nelsson Huotari
f78a5d795c
Separate keyframes logic to provide basis for osgAnimation integration.
2020-11-18 22:48:47 +02:00
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
2020-10-16 22:18:54 +04:00
Andrei Kortunov
c3d84b2c7c
Ability to attach arrows to shooter's hands (feature #5642 )
2020-10-14 10:07:42 +04:00
Andrei Kortunov
47af221f10
Reset ammo when switching view to avoid warnings spam
2020-08-28 15:57:11 +04:00
Andrei Kortunov
297898182b
Reset attached arrow in the beginning of unequipping animation
2020-08-28 15:53:30 +04:00
psi29a
46db69a349
Merge branch 'swimming' into 'master'
...
Swimming-related fixes
See merge request OpenMW/openmw!247
(cherry picked from commit 8be328ef80f29e9692e29d24beefa8ced16537a7)
738c71fd Extend the "turn to movement direction" mode for swimming up and down.
10d3e82b New setting "swim upward coef"
2020-07-09 20:05:59 +00:00
elsid
3c460fb3e9
Use pointer to Sound to stop sounds started by NpcAnimation
2020-07-06 17:38:09 +02:00
bzzt lost a hitlab login
f12879a04c
allow statesetupdater as cullcallback = faster + works in paging
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
elsid
9326111f4c
Use vector for Animation::mActiveControllers
...
Container is only used to add elements, iterate over all of them and
clear. Multimap adds overhead for all of these operations without any
benefits. Reduce Animation::resetActiveGroups CPU time usage by 50%.
2020-05-21 17:32:25 +02:00
Alexei Dobrohotov
7ba8176862
Merge pull request #2819 from elsid/fix_ub
...
Fix UB in NpcAnimation::mNpcType initialization
2020-05-01 21:49:04 +03:00
elsid
6d8debe009
Initialize variable without reading itself
2020-05-01 17:23:10 +02:00
Capostrophic
87ba0bb0e0
Fix usage of uninitialized weapon type in equipmentChanged()
2020-05-01 16:37:40 +03:00
Bret Curtis
8a8107e837
as it says; revert vismask and uncomplicate openmw
2020-04-20 20:57:38 +02:00
Capostrophic
3e3f5d66b2
Don't reset dead non-werewolf vampires' vampire NPC type
2020-03-25 21:06:21 +03:00
Evil Eye
4f4982545a
make robes cover the chest slot
2020-03-19 21:30:22 +01:00
Bret Curtis
a0902bb98e
Merge pull request #2700 from akortunov/masks
...
Move VisMask to components
2020-02-17 11:58:53 +01:00
Andrei Kortunov
84979fa8b7
Move VisMask to components
2020-02-16 16:03:35 +04:00
Capostrophic
fcbd3b4324
Don't try to attach absent shield models to NPCs
2020-02-11 11:58:02 +03:00
Capostrophic
4a78674583
Make sure not to pick the ground shield model incorrectly
2020-02-02 15:39:29 +03:00
capostrophic
bbe5adb860
Use shield body part model for creatures (bug #5250 )
2020-01-10 14:18:40 +03:00
Andrei Kortunov
97ee4bc349
Improve equipment logic (bug #5223 )
2019-12-14 22:30:27 +04:00
Andrei Kortunov
d66b81d7f7
Reset holstered shield before rebuilding an NPC animation
2019-12-05 17:35:32 +04:00
Andrei Kortunov
ca2a524a5f
Avoid null pointer dereference
2019-11-13 14:50:42 +04:00
Andrei Kortunov
d3a3b2f1f6
Shields holstering support (feature #5193 )
2019-10-22 09:02:59 +04:00
Andrei Kortunov
d58f93f388
Use sayDone() only for scripting backward compatibility
2019-09-06 09:19:41 +04:00
Andrei Kortunov
afaff8231d
Use the Weapon Bone as fallback
2019-08-09 19:40:30 +04:00
Andrei Kortunov
f0cef772fa
Refactor weapon types behaviour
...
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
2019-08-09 19:40:27 +04:00
Andrei Kortunov
8557346fbd
Use glow for enchanted arrows (feature #5122 )
2019-08-07 12:58:14 +04:00
Andrei Kortunov
1eed511b4e
Use enchanted glow for pulled arrows
2019-08-07 09:45:10 +04:00
Andrei Kortunov
4c92f0c4e1
Move getEnchantmentColor() from Animation to Class
2019-08-07 08:51:46 +04:00
Andrei Kortunov
c3fdccac1f
Do not use the xbase_anim.kf as a fallback for werewolves (bug #5004 )
2019-04-30 17:51:38 +04:00
Chris Djali
1860d720bc
Merge pull request #2263 from akortunov/actor_culling
...
Do not recreate shaders to update transparency
2019-03-26 14:13:50 +00:00
elsid
fa7b304e78
Use auto for map value_type in range-based for loops
...
To avoid implicit call of copy constructor for
pair<const K, V> to pair<K, V> conversion.
2019-03-21 23:09:42 +03:00
Capostrophic
695cd5bb49
Minor NpcAnimation cleanup
2019-03-20 16:11:21 +03:00
Andrei Kortunov
e171d34192
Init NPC type properly in the NpcAnimation
2019-03-20 12:28:03 +04:00
bzzt
5ec28e09c9
Do not recreate shaders to update transparency
2019-03-18 10:37:53 +04:00
Andrei Kortunov
4c21776b94
Use relative animation time only for bows and crossbows (bug #3778 )
2019-03-08 20:16:02 +04:00
Andrei Kortunov
3032b177a1
Remove redundant includes
2019-02-23 08:02:12 +04:00
Bret Curtis
ba491a8af0
Merge pull request #2069 from Capostrophic/skeleton
...
Use the skeleton from the NPC's set model (bug #4747 )
2019-02-22 15:12:24 +01:00
AnyOldName3
8482236a82
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2019-01-24 23:09:23 +00:00
Capostrophic
6660f2f8e6
Use the skeleton from the NPC's set model (bug #4747 )
2019-01-25 01:02:27 +03:00
Andrei Kortunov
02a43d0b32
Do not scale player's model in the 1st-person view depending on race (bug #4383 )
2019-01-07 12:58:47 +04:00
AnyOldName3
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-29 01:19:01 +00:00
Andrei Kortunov
880ec3ce7b
Fix visible sheaths for invisible actors
2018-11-24 14:57:41 +04:00
Andrei Kortunov
92e45507d8
Weapon sheathing support, including quivers and scabbards (feature #4673 )
2018-11-05 11:18:20 +04:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Kyle Cooley
e2ac392a40
Move common stuff to scene util, fix errors with 1st person meshes
2018-09-27 13:14:59 +04:00
AnyOldName3
80082308f0
Merge upstream (shadermanager log system revamp)
2018-08-17 18:22:13 +01:00
