Commit graph

1525 commits

Author SHA1 Message Date
scrawl
a653716e2c Fix for damage/restore effects using the instant apply path when they have a duration 2015-03-01 22:22:20 +01:00
scrawl
f82751422d Fix constant effect restore enchantments being applied incorrectly (Fixes #2408) 2015-02-28 16:31:22 +01:00
Marc Zinnschlag
9109162030 Merge remote-tracking branch 'scrawl/master' 2015-02-23 20:51:18 +01:00
scrawl
77bb77b367 Fix for instant restore effects (Fixes #2392) 2015-02-23 19:07:12 +01:00
Marc Zinnschlag
07c27065d6 Merge remote-tracking branch 'slothlife/msvc-warning-fixes' 2015-02-22 21:34:46 +01:00
Marc Zinnschlag
4c5bba2947 Merge remote-tracking branch 'dteviot/SpellCastingFixes' 2015-02-17 16:44:14 +01:00
Marc Zinnschlag
8686ffcedb Merge remote-tracking branch 'scrawl/master' 2015-02-17 11:55:12 +01:00
dteviot
8d7de7d1ec Telekinesis allows safe opening of traps (Fixes #1916)
When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests.
2015-02-17 22:14:25 +13:00
cc9cii
efdee19477 Suppress warning about the lack of virtual destructor. 2015-02-16 16:41:53 +11:00
slothlife
a9b74671a6 Fix various MSVC warnings 2015-02-15 20:10:21 -06:00
scrawl
81925645a3 Unreachable enemies combat AI fix (Fixes #2271) 2015-02-14 16:51:54 +01:00
Alexander "Ace" Olofsson
d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 2015-02-09 16:23:41 +01:00
Alexander "Ace" Olofsson
8c49812d56 Remove unneeded include in obstacle.hpp 2015-02-09 15:12:10 +01:00
Alexander "Ace" Olofsson
df5a08b6de Move manualref code out of header 2015-02-09 15:01:49 +01:00
scrawl
e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
2015-02-08 21:28:29 +01:00
scrawl
9dbd9af31c Adjust fix for Bug #2360 to repair affected savegames 2015-02-08 21:26:58 +01:00
scrawl
b542143e3a Fix faction reputation case sensitivity issue (Fixes #2360) 2015-02-08 21:04:01 +01:00
scrawl
61ec9196c8 Cap the displayed attribute multiplier in levelup to attribute points left to 100 2015-02-06 01:27:17 +01:00
scrawl
b5e0e45c78 Fix iLevelUpTotal not being used in the levelUp logic 2015-02-06 01:27:17 +01:00
scrawl
f0b1d889c0 ESSImport: import player skill progress 2015-02-06 01:27:17 +01:00
scrawl
ae77eacd7e Skill progress refactoring 2015-02-06 01:27:16 +01:00
scrawl
bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
scrawl
aa6ebcd75c Change stolen items handling to match MW (Fixes #1443, Fixes #2290) 2015-02-05 04:18:43 +01:00
scrawl
6d097fbfbd Normalise spelling of "levelled" throughout the code 2015-02-05 04:18:42 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
MiroslavR
ee8f88fc42 Reset health modifier when actor dies (Fixes #2330) 2015-02-01 22:04:49 +01:00
scrawl
7e33471edb Fix code duplication 2015-01-31 22:40:43 +01:00
scrawl
bdcc3a4036 Add missing swish sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
2346c3528d Remove NpcStats::mProfit and store it in the script instead
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
2015-01-31 22:40:40 +01:00
scrawl
b9acf437fd Remove friendly hits from the save file
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
2015-01-31 22:40:39 +01:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
scrawl
f35c9b7a69 Clang warning fixes (thanks hemite) 2015-01-27 23:12:20 +01:00
scrawl
d34c8526f6 Enchanted arrows should not be added to victim (Fixes #2306) 2015-01-27 23:12:20 +01:00
scrawl
67491c7164 Fix leveled item argument issue (Fixes #2302) 2015-01-27 23:12:20 +01:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00
scrawl
378e91545d Fix Tribunal/BM summon effects not working 2015-01-23 15:34:47 +01:00
scrawl
69676906ae Don't clear known spells when reading from the savegame
This is needed because the .ess format doesn't include the racial spells in the player's spell list.
2015-01-23 15:34:14 +01:00
scrawl
eede2c8e55 ESSImport: convert breath meter and skill increases 2015-01-20 19:30:39 +01:00
scrawl
14aacf9a72 Add comment 2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc Remove unused mLastDrowningHit 2015-01-17 00:10:45 +01:00
scrawl
bf915d929a Update idle voices according to research 2015-01-15 03:35:46 +01:00
scrawl
a3c861b7fa Idle voice fix 2015-01-14 00:07:14 +01:00
scrawl
2ac4a74a34 Fix running AI for dead actors 2015-01-13 18:13:02 +01:00
scrawl
fafc14d5a0 Add proper air movement mechanics (Fixes #2077) 2015-01-13 05:37:43 +01:00
scrawl
4ed3e7bbb7 Enchanting code cleanup 2015-01-12 23:29:58 +01:00
scrawl
de23ad5c8d Change dynamic_cast to static_cast to make coverity happy 2015-01-12 23:29:58 +01:00
scrawl
cda2eea906 Enchanting: use fEnchantmentConstantDurationMult and fEffectCostMult 2015-01-12 23:29:58 +01:00
scrawl
871d59de6c Reduce Idle voice chance (Fixes #1964) 2015-01-12 23:29:58 +01:00
scrawl
c3f3f8b3d0 Use only Cell records for saving progress bar (Fixes #2259) 2015-01-11 18:01:06 +01:00
scrawl
b108fbe986 Remove incorrect implementation of fGreetDistanceReset
This can't be right. A reset distance of 512 is smaller than the maximum greeting distance for certain NPCs, which would then say greetings non-stop.
2015-01-11 17:04:58 +01:00