1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 01:49:54 +00:00
Commit graph

391 commits

Author SHA1 Message Date
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
Andrei Kortunov
5a4d0cec3a Use new logging system for game itself 2018-08-14 23:05:43 +04:00
AnyOldName3
586ac2d12d Revert "Prevent accidental culling of first person meshes"
This reverts commit c38bf6757a.
2018-08-08 22:53:56 +01:00
AnyOldName3
c38bf6757a Prevent accidental culling of first person meshes 2018-08-02 15:50:43 +01:00
AnyOldName3
cc23a968d1 Merge upstream/master 2018-08-01 14:13:45 +01:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails 2018-06-24 14:39:48 +03:00
AnyOldName3
c3d7c7de21 Prevent first-person meshes disappearing. 2018-01-23 20:13:37 +00:00
scrawl
b06512a60d Fix error message that referred to the wrong file (Bug #4159) 2017-11-10 22:51:32 +00:00
scrawl
95b3c1181a Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects (Fixes #4190) 2017-11-08 00:24:52 +00:00
Chris Robinson
780e82480d Make the PlayMode and PlayType enums scoped
Also shorten them by putting them in the MWSound namespace
2017-09-15 02:36:59 -07:00
Andrei Kortunov
7f5f5458d4 Reset player attack animation when unequip weapon or tool 2017-09-01 18:03:23 +04:00