Marek Kochanowicz
cdac934315
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
2014-07-25 11:13:52 +02:00
scrawl
4ec51b386a
Add ManualResourceLoader for fog of war textures ( Fixes #1675 )
2014-07-24 19:00:57 +02:00
scrawl
4b3e12bfb4
Fix pinned widgets receiving mouse clicks in gamemode ( Fixes #1686 )
2014-07-24 18:04:44 +02:00
scrawl
469d2afffa
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwgui/levelupdialog.cpp
2014-07-24 02:33:46 +02:00
scrawl
d4ff17f1c5
Remove unused FLTV and NAM0 from CellRef
2014-07-24 02:20:16 +02:00
scrawl
4e0c133fb3
Add comment to Cell NAM0 (it's a RefId counter)
2014-07-24 02:19:36 +02:00
scrawl
7ae9bbb1a5
Implement iCrimeThresholdMultiplier
2014-07-24 02:17:44 +02:00
scrawl
fc618cb3ea
Use separate function for fatigue restoration during resting/waiting
2014-07-24 02:17:44 +02:00
scrawl
103325bfb8
Change HUD enemy health bar to use actorId
2014-07-24 02:17:44 +02:00
scrawl
75366b2e37
Implement CellRef's faction rank (rank requirement to use item)
2014-07-24 02:17:38 +02:00
Marek Kochanowicz
a676f6bc2c
comments added
2014-07-23 20:33:52 +02:00
scrawl
ca45a63cf7
Close doors instantly when using Lock instruction
2014-07-22 17:55:54 +02:00
Marek Kochanowicz
72b129b90e
Code shuffling. Created CastableHelper to store actually usefull
...
function.
2014-07-22 17:44:56 +02:00
scrawl
2b57c7fa67
Use CellRef's global variable to disable owner ( Fixes #1677 )
2014-07-22 17:06:40 +02:00
Marek Kochanowicz
9defb188ea
handle inventory in the actors
2014-07-22 13:08:32 +02:00
Marek Kochanowicz
24eb034ba3
major refactorisation
2014-07-22 10:27:45 +02:00
Marc Zinnschlag
91afc2ebe7
Merge remote-tracking branch 'mikesc/bug1482'
2014-07-22 08:13:35 +02:00
Marc Zinnschlag
6b5f79a9ca
Merge remote-tracking branch 'miroslavr/master'
2014-07-22 08:11:11 +02:00
Marc Zinnschlag
ccf672630f
Merge remote-tracking branch 'lgro/aicombat'
2014-07-22 08:06:24 +02:00
Michał Ściubidło
e24173f94a
Fix bug 1482:
...
- put powers on cooldown only when they are used succedsfully
2014-07-21 23:56:38 +01:00
Lukasz Gromanowski
171c61022d
Added initialization of weapRange in AiCombat::execute().
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-07-21 21:17:12 +02:00
MiroslavR
3b67e9b329
Rework level up dialog to behave more like vanilla
2014-07-21 20:56:02 +02:00
scrawl
c0645d4978
Increase death count immediately on death (Bug #1588 )
...
This is required for scripts using getDeadCount as reaction to onDeath that rely on the increased value.
2014-07-21 20:37:14 +02:00
scrawl
d43c21a9fc
Make NPCs react to being attacked by other actors ( Fixes #1588 )
2014-07-21 20:36:26 +02:00
scrawl
127add7623
Don't allow dialogue with werewolf NPCs
2014-07-21 18:19:45 +02:00
Marek Kochanowicz
dcd90faaef
moved add nested to the helper
2014-07-21 14:58:45 +02:00
Marek Kochanowicz
427d6efd19
Moved removeNestedRow responsibility to the helper.
2014-07-21 14:49:47 +02:00
Marek Kochanowicz
c018ca43ac
getting rid of the asserts
2014-07-21 14:44:48 +02:00
Marek Kochanowicz
cb004936e0
moved setNestedData to the helper as well
2014-07-21 14:34:48 +02:00
Marek Kochanowicz
6573e3f319
moved responsibility for getNestedData to the inventory helper
2014-07-21 14:24:54 +02:00
Marek Kochanowicz
c4598d6200
added inventory helper (since npc and containers share same way of
...
handling items)
2014-07-21 14:10:04 +02:00
Marek Kochanowicz
3dd2ca15da
Reduced code duplication through new common base class
2014-07-21 09:52:09 +02:00
scrawl
10d4da7994
Fix date time in journal entries being off by one day ( Fixes #1668 )
2014-07-21 01:17:01 +02:00
scrawl
5629803a08
Implement correct armor mitigation mechanics
2014-07-20 23:45:31 +02:00
scrawl
804f1a5e59
Adjust combat mechanics
...
- Projectiles can not trigger critical hits
- Critical hits are only possible if the target is not in combat (Fixes #1669 )
- Hand-to-hand deals damage to health during entire duration of knockdown animation (including standing up)
2014-07-20 23:17:55 +02:00
Marek Kochanowicz
87eed066c2
undo works now
2014-07-20 22:39:39 +02:00
scrawl
90a96cd7d8
Fix bug where actors in combat with multiple other actors where not regarded as in combat with a specific actor
2014-07-20 22:34:20 +02:00
scrawl
1636fd66db
Don't add creature base damage to weapon damage (UESP was wrong)
2014-07-20 22:26:26 +02:00
Marek Kochanowicz
4d79034dbf
correctly handling the nestedTable for undo (but removing and adding
...
rows in proper QT way is still TODO)
2014-07-20 18:52:35 +02:00
scrawl
6d794dac69
Add missing messagebox for spell lock and unlock success
2014-07-20 17:09:55 +02:00
scrawl
9897f14c3c
Don't block when actor is paralyzed
2014-07-20 16:52:57 +02:00
scrawl
28a0899d2b
Implement difficulty scaling ( Fixes #1505 )
2014-07-20 16:38:20 +02:00
scrawl
5bbf07976f
Consider Shield spell effect for creature armor rating
2014-07-20 14:41:39 +02:00
scrawl
691ba02115
Reduce wepaon condition even if attack misses
2014-07-20 14:12:27 +02:00
MiroslavR
0f2305ae43
Clear selected spell when window manager is cleared
2014-07-20 13:07:47 +02:00
scrawl
63fd04882a
Make sure crime gold discounts don't reduce price to zero
2014-07-19 23:49:54 +02:00
MiroslavR
d5381e1bc4
Dynamically resize skill widgets to fit their contents ( Fixes #1610 )
2014-07-19 14:04:38 +02:00
Marek Kochanowicz
0017fc68ef
fixed ctor of nestedwrapper (missing initialization of member data field)
2014-07-19 13:08:28 +02:00
Marek Kochanowicz
1ff8abb240
store whole container representing the nested table inside of the
...
command
Static nature of C++ forced me to use templates. Bit frustraiting.
2014-07-18 18:26:22 +02:00
scrawl
d4ffd30f98
Implement Rank filter with no faction given ( Fixes #1660 )
2014-07-17 20:57:37 +02:00