scrawl
49e26415be
Don't call loadGame() from within the MWMechanics::Actors update sequence
2014-02-01 18:42:00 +01:00
Marc Zinnschlag
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
2014-02-01 18:16:32 +01:00
scrawl
da34f8bda1
Fix LastHitObject
2014-01-31 04:43:35 +01:00
scrawl
067c2bc2ec
Disable combat movements for creatures without weapons
2014-01-31 04:43:35 +01:00
scrawl
7820ea5806
"Always best attack" should only affect the player
2014-01-31 04:43:35 +01:00
scrawl
52f89e9a17
Don't play "idle" voice entries for NPCs with Hello 0
...
Not entirely sure if this is correct, but it prevents the NPCs in the starting boat from incorrectly playing them.
2014-01-31 04:43:35 +01:00
scrawl
39d86a9468
Improvements to smooth NPC steering
2014-01-31 04:43:29 +01:00
scrawl
e717694b36
Reset Run stance in AiWander
2014-01-29 15:37:27 +01:00
scrawl
23ffb8a4dc
Fixes #1143 : Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame.
...
This makes the Mehra Milo script work properly.
2014-01-29 15:37:27 +01:00
scrawl
190512156d
Use some more GMSTs for enchanting
2014-01-29 15:37:26 +01:00
scrawl
ea7e0abdc2
Move WhenStrikes skill success to a more appropriate place
2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d
Use GMSTs for levelup
2014-01-29 15:37:26 +01:00
scrawl
cc40cec395
Move levelup to NpcStats
...
The code came from back in the days where NpcStats did not derive from CreatureStats.
2014-01-29 15:37:26 +01:00
mrcheko
3a5da7e6e8
merged with master
2014-01-29 00:03:00 +02:00
Marc Zinnschlag
a473c3f619
some cleanup
2014-01-28 12:36:10 +01:00
Marc Zinnschlag
fd5486864a
Merge remote-tracking branch 'gus/AIFix2'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/actors.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2014-01-28 12:33:31 +01:00
mrcheko
e50e94af0b
remove CreatureStats::mAttackType, set/getAttackType()
2014-01-27 23:05:17 +02:00
mrcheko
fe0268062d
merge with master
2014-01-27 22:38:01 +02:00
gus
846276f747
clean up
2014-01-27 15:14:24 +01:00
mrcheko
45b3aa3d93
corrected things connected to determining attack type
2014-01-26 23:32:57 +02:00
gus
f5d589388c
bug fix
2014-01-26 22:06:54 +01:00
gus
764011dd1b
clean up
2014-01-26 21:53:55 +01:00
gus
7cb47aa635
new implementation of pathfinding. Works, but need clean up
2014-01-26 21:26:19 +01:00
scrawl
b1066de81d
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit 4e360136b10061e29fd60492544aad59850513e7, reversing
changes made to 047bbe43b2ca08a63c8e18d2b4af52e0dbefb37b.
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit df7c139e2f614f8a951aae1b4889b920af0013fe, reversing
changes made to fec26342cd57269bc0801e5d901e00419fbc7cec.
2014-01-26 00:14:49 +01:00
scrawl
28185e2017
Death/godmode fixes: Revive player *after* character update, since there might be fall damage.
2014-01-25 15:54:24 +01:00
gus
707e579dfe
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-01-24 19:16:50 +01:00
gus
5ca5946760
WIP
2014-01-24 19:13:23 +01:00
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
mrcheko
87e83a92f8
refactoring of setting an attack type
2014-01-23 23:14:20 +02:00
scrawl
ea21d8fec3
Fix CreatureTargetted function
2014-01-22 13:30:45 +01:00
scrawl
f27701cbe8
Detect selling stolen items or enchanting with stolen items
2014-01-22 13:04:55 +01:00
scrawl
264226dfe3
Handle iWereWolfBounty
2014-01-22 12:33:47 +01:00
scrawl
194413c955
Feature #1119 : Implement Resistance/Weakness to normal weapons magic effect. Handle fWereWolfSilverWeaponDamageMult.
2014-01-22 12:26:53 +01:00
scrawl
16f5f5862d
Feature #956 : Implement blocking melee attacks
2014-01-21 23:25:24 +01:00
scrawl
851a7d5014
Feature #957 : Handle area effects for "on touch" range
2014-01-21 12:30:15 +01:00
scrawl
c8a9e9f7fa
Stop AiCombat when the target is dead
2014-01-20 13:54:10 +01:00
scrawl
205e8aa4e9
Feature #957 : Implement area magic
2014-01-20 13:11:29 +01:00
scrawl
df7c139e2f
Merge remote-tracking branch 'mrcheko/master'
2014-01-19 21:23:04 +01:00
scrawl
fec26342cd
Query the number of animation groups for death/hit animations, since they can vary a lot (argonian/khajiit, creatures, first person..)
2014-01-19 21:11:48 +01:00
mrcheko
339399f8b1
bug fix/logic fix/future suggestion
2014-01-19 22:09:51 +02:00
scrawl
05e75e1214
Closes #1127 : Fix for subtitles for idle dialogue appearing outside of hearing range
2014-01-19 20:54:05 +01:00
scrawl
bea161331c
Play 'hello' voiced dialogue entries in AIWander
2014-01-19 20:53:58 +01:00
scrawl
9723263730
Bug #1126 : Tweak creature attack distance a bit (still no idea where this should come from)
2014-01-19 14:47:58 +01:00
scrawl
4e360136b1
Merge remote-tracking branch 'mrcheko/master'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
2014-01-19 14:01:39 +01:00
scrawl
047bbe43b2
Don't complain about missing jump animations
2014-01-19 13:46:40 +01:00
scrawl
13646a651b
Issue #777 : Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.
2014-01-19 13:32:58 +01:00
scrawl
589fbbd871
Issue #777 : Create InventoryStore for creatures with weapons/shields
2014-01-19 11:43:23 +01:00
scrawl
69ca03c308
Issue #777 : Move DrawState to CreatureStats. All creatures can cast spells, and some creatures have weapons.
2014-01-19 09:43:41 +01:00
scrawl
525ce2f042
Some cleanup - move definitions to implementation file
2014-01-18 10:52:16 +01:00
