Marc Zinnschlag
aefe8cd4ae
Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound'
...
Conflicts:
apps/openmw/mwworld/class.cpp
2014-10-12 14:06:08 +02:00
Lukasz Gromanowski
a6a3eca930
Fixes #1887 : Equipped items do not emit sounds
...
Corrected wrong return type of Class::getSound() method.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 13:38:41 +02:00
Lukasz Gromanowski
e1663de7cf
Fixes #1887 : Equipped items do not emit sounds
...
Added getSound() method to MWClass class and implementation
into Light class.
Also added additional bool parameter responsible for enabling/disabling
of playing items sounds into NpcAnimation class constructor.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 11:40:14 +02:00
MiroslavR
29f5cb46ac
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-09 19:17:39 +02:00
Marc Zinnschlag
744c56943a
Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup'
2014-10-07 18:03:25 +02:00
MiroslavR
0e19c3fdeb
Silence werewolves' footstep sounds when they are running with their claws sheathed
2014-10-06 18:48:22 +02:00
MiroslavR
b6abfb0145
Do not display hit fader if the player wasn't damaged
2014-10-06 18:31:02 +02:00
MiroslavR
ff74d54e98
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-06 18:24:41 +02:00
Jordan Ayers
2f5721bf61
Fix typo in comments.
2014-10-05 18:12:33 -05:00
scrawl
d9165593d9
Fix footstep sounds played during water-walking
2014-10-05 22:27:25 +02:00
MiroslavR
de2cb8926a
Feature #1697 : Queue fade operations, implement hit fader & werewolf overlay
2014-10-05 17:53:50 +02:00
scrawl
c4fa671381
Don't allow raising faction rank if the next rank has no name ( Fixes #1975 )
2014-10-05 16:47:55 +02:00
scrawl
fe4d74a6cb
Fix not being able to move with 0/0 encumbrance ( Fixes #1979 )
2014-10-05 15:52:33 +02:00
scrawl
5c3bc6563b
Fix divisions by zero in normalizedEncumbrance
2014-10-05 15:50:01 +02:00
scrawl
e868a48a63
Don't trigger OnPcHitMe for friendly hits ( Fixes #1950 )
...
Don't consider actors as followers if they are also in combat with the follow target
2014-09-26 22:08:07 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
40587f984d
Implement price-based mercantile skill progress ( Fixes #1947 ), thanks Hrnchamd
...
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
scrawl
62ab35881e
Don't advance skills in werewolf mode (thanks Hrnchamd)
2014-09-25 00:03:55 +02:00
scrawl
fb26c2c2de
Fix autocalculated NPCs not having health/magicka/fatigue set correctly ( Fixes #1943 )
2014-09-21 11:39:17 +02:00
scrawl
c05874e1ff
Reset CreatureLevList spawning flag if levelled list returned no creature
2014-09-18 06:06:20 +02:00
scrawl
be7839873a
Don't trigger dynamic stats recalculation when setting up actor initial stats ( Fixes #1927 )
...
This caused the magicka value set in the CS to be ignored completely, so flame atronachs were spawning with 50 magicka instead of 105.
2014-09-18 03:47:45 +02:00
scrawl
157c53bed4
Handle spellcasting for creatures with no casting animation ( Fixes #1856 )
2014-09-15 10:42:44 +02:00
scrawl
1270dada34
Don't set Attacked flag when the actor is already in combat with the attacker ( Fixes #1909 )
2014-09-14 10:35:57 +02:00
scrawl
99c276baa9
Set weapon Magical flag when enchanting a weapon
2014-09-13 21:23:44 +02:00
Marc Zinnschlag
b5d5eadf79
Merge remote-tracking branch 'scrawl/master'
2014-09-11 09:01:21 +02:00
scrawl
f3d4b63aaf
Fix AI moving load doors and throw an exception when trying to do this ( Fixes #1907 )
2014-09-11 05:53:56 +02:00
MiroslavR
86c286c24e
Fix werewolf globals
2014-09-09 15:12:42 +02:00
scrawl
cb916594d9
Always show tooltips for dead actors
2014-09-09 02:12:44 +02:00
scrawl
f18d4b4ac4
Don't show crosshair tooltips for actors in combat
2014-09-09 00:47:26 +02:00
scrawl
c54ab2e846
Don't allow talking to creatures that are in combat
2014-09-09 00:39:38 +02:00
scrawl
6b06ab23aa
Don't play sound for torches with OffDefault flag ( Fixes #1884 )
2014-09-08 15:31:47 +02:00
scrawl
adbc50366b
Use random attack strength for creatures (Bug #1876 )
...
Determining the attack strength from the time the wind-up animation was held will not work properly, as most creatures don't have this animation.
This fixes another balancing issue with Rieklings (they were previously using an attack strength of 1 every time).
2014-09-07 18:55:59 +02:00
scrawl
59720b7dc6
Implement MagicItems flag for vendors ( Fixes #1861 )
2014-09-01 02:10:36 +02:00
scrawl
10a0e2434e
Open inventory when activating an unconscious actor ( Fixes #1848 )
2014-08-26 03:06:23 +02:00
scrawl
d8943aef2f
Encapsulate magic effect magnitude (Feature #1489 )
2014-08-17 03:58:04 +02:00
scrawl
6ddd9cc5a2
Don't show weight or value for keys ( Fixes #1815 )
2014-08-16 16:51:56 +02:00
scrawl
177de58884
Use fWereWolfRunMult only when no weapon is drawn
2014-08-12 01:10:18 +02:00
scrawl
cf22d2fa36
Make Potions reveal two effects for every fWortChanceValue of alchemy skill ( Fixes #1792 )
2014-08-11 20:40:02 +02:00
scrawl
28fe81df90
Make Lights with OffDefault flag not emit light nor particles when placed in a cell ( Fixes #1796 )
2014-08-11 20:39:56 +02:00
scrawl
accab47724
Don't knock down from fall damage in onHit (CharacterController is doing that already)
2014-08-08 15:46:32 +02:00
scrawl
639ae7e06c
Implement friendly hits on followers ( Fixes #1139 )
2014-08-03 16:24:16 +02:00
scrawl
216ebac2e9
Implement weapon condition damage for ranged weapons ( Fixes #1746 )
2014-08-03 16:24:11 +02:00
scrawl
b58b8c6f8f
Adjust player position to ground when using a door marker, even if the player is levitating ( Fixes #1737 )
2014-07-31 04:28:02 +02:00
scrawl
0f1451babd
Add epsilon to armor class calculation
2014-07-30 20:26:47 +02:00
scrawl
45af34d189
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-07-29 19:35:44 +02:00
scrawl
4773d754c6
Remove redundant isHostile flag ( Fixes #1652 )
2014-07-28 16:41:12 +02:00
scrawl
d69ed78ccd
Don't add combat AI to player
2014-07-28 15:40:52 +02:00
Marc Zinnschlag
7991dfb907
Merge remote-tracking branch 'scrawl/master'
2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7
Merge branch 'scripts'
2014-07-28 09:02:24 +02:00
scrawl
d81e9cfefd
Implement actors fighting for the actor they are following ( Fixes #1141 )
2014-07-27 20:33:45 +02:00