mrcheko fc6366fb27 Merge remote-tracking branch 'upstream/master' ...

Equipping_Weapon check isn't needed cause there won't be WeapType_None in
that case

Conflicts:
	apps/openmw/mwmechanics/character.cpp

2014-06-13 14:12:41 +04:00

..

activespells.cpp

Savegame: store ActiveSpells

2014-05-14 23:54:15 +02:00

activespells.hpp

Savegame: store ActiveSpells

2014-05-14 23:54:15 +02:00

actors.cpp

Combat music; some minor combat fixes

2014-06-10 14:20:29 +04:00

actors.hpp

merge master, resolve conflicts

2014-05-17 19:20:57 +04:00

aiactivate.cpp

Remove static method MWWorld::Class::get(&Ptr)

2014-05-22 20:50:00 +02:00

aiactivate.hpp

Fixed moving activatable object being incorrectly activated.

2014-05-13 20:32:29 -04:00

aiavoiddoor.cpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

aiavoiddoor.hpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

aicombat.cpp

warning fixes

2014-06-12 23:42:33 +04:00

aicombat.hpp

aiming to moving target in ranged combat ai

2014-06-08 20:59:26 +04:00

aiescort.cpp

Remove static method MWWorld::Class::get(&Ptr)

2014-05-22 20:50:00 +02:00

aiescort.hpp

Revert "Change all AI packages (except AiActivate) to use ActorIds"

2014-05-16 12:11:34 +02:00

aifollow.cpp

Revert "Change all AI packages (except AiActivate) to use ActorIds"

2014-05-16 12:11:34 +02:00

aifollow.hpp

Revert "Change all AI packages (except AiActivate) to use ActorIds"

2014-05-16 12:11:34 +02:00

aipackage.cpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

aipackage.hpp

Changed AiEScort to use new PathTo function

2014-05-14 01:44:11 -04:00

aipursue.cpp

merge master, resolve conflicts

2014-05-17 19:20:57 +04:00

aipursue.hpp

merge master, resolve conflicts

2014-05-17 19:20:57 +04:00

aisequence.cpp

Merge remote-tracking branch 'upstream/master'

2014-05-25 10:21:54 +04:00

aisequence.hpp

actor handle and id confusing fix

2014-05-18 20:13:46 +04:00

aitravel.cpp

AiWander: make sure to walk, not run

2014-04-26 05:01:26 +02:00

aitravel.hpp

Made code a bit more standardized and added a good bit of documentation.

2014-04-29 23:40:59 -04:00

aiwander.cpp

Remove static method MWWorld::Class::get(&Ptr)

2014-05-22 20:50:00 +02:00

aiwander.hpp

fix to broken aiwander logic

2014-05-01 11:41:25 +04:00

alchemy.cpp

Fix alchemy allowing same item ID in different slots (Fixes #1407)

2014-06-06 14:12:50 +02:00

alchemy.hpp

Undid some code clean up changes, and changed how some includes work

2014-05-13 13:43:50 -04:00

character.cpp

Merge remote-tracking branch 'upstream/master'

2014-06-13 14:12:41 +04:00

character.hpp

Store death animation index in CreatureStats

2014-05-26 20:52:32 +02:00

combat.cpp

Don't block hits when in hand-to-hand combat (shield not visible)

2014-06-05 22:27:46 +02:00

combat.hpp

Feature #50: Implement marksman mechanics.

2014-03-08 06:03:45 +01:00

creaturestats.cpp

Store death animation index in CreatureStats

2014-05-26 20:52:32 +02:00

creaturestats.hpp

Store death animation index in CreatureStats

2014-05-26 20:52:32 +02:00

disease.hpp

moved CellRefList into a separate file

2014-02-23 20:11:05 +01:00

drawstate.hpp

Savegame: store most of CreatureStats

2014-05-12 21:37:36 +02:00

enchanting.cpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

enchanting.hpp

Make applyEnchantment return the record ID instead of modifying Ptr

2014-05-24 14:58:48 +02:00

levelledlist.hpp

Remove useless throwing of exception

2014-05-22 15:29:36 +02:00

magiceffects.cpp

Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item.

2013-11-13 18:51:28 +01:00

magiceffects.hpp

Change ActiveSpells to use ActorId

2014-05-14 07:14:08 +02:00

mechanicsmanagerimp.cpp

Fix punishment for stealing 0 value items (Fixes #1435)

2014-06-09 03:42:29 +02:00

mechanicsmanagerimp.hpp

Say an attack phrase when combat starts

2014-05-06 00:13:31 +02:00

movement.hpp

Store the position and rotation in MWMechanics::Movement

2013-03-30 19:00:46 -07:00

npcstats.cpp

Fix potential NpcStats overwriting issue

2014-05-26 12:31:08 +02:00

npcstats.hpp

Savegame: store most of CreatureStats

2014-05-12 21:37:36 +02:00

objects.cpp

Merge branch 'savedgame'

2014-02-01 18:16:32 +01:00

objects.hpp

Feature #957: Implement area magic

2014-01-20 13:11:29 +01:00

obstacle.cpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

obstacle.hpp

Changed getNearbyDoor to use MWWorld::Ptr

2014-05-13 23:46:00 -04:00

pathfinding.cpp

Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue

2014-05-12 21:05:32 -04:00

pathfinding.hpp

Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue

2014-05-12 21:05:32 -04:00

pathgrid.cpp

A* misses 1st closest node fix

2014-05-06 23:29:39 +04:00

pathgrid.hpp

Cleanup and little tweaking.

2014-04-20 08:31:02 +10:00

pickpocket.cpp

moved CellRefList into a separate file

2014-02-23 20:11:05 +01:00

pickpocket.hpp

Implement pickpocket detection. Play a voiced dialogue entry when detected.

2014-01-07 03:01:33 +01:00

repair.cpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

repair.hpp

Added PC repair feature

2013-03-23 08:16:46 +01:00

security.cpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

security.hpp

Cleanup Security class

2013-05-19 23:19:48 +02:00

spellcasting.cpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

spellcasting.hpp

Add some more safety checks to spellcasting

2014-05-15 09:54:10 +02:00

spells.cpp

Change ActiveSpells to use ActorId

2014-05-14 07:14:08 +02:00

spells.hpp

Savegame: store most of CreatureStats

2014-05-12 21:37:36 +02:00

stat.cpp

store NPC state in saved game files

2014-02-16 15:51:45 +01:00

stat.hpp

partially store creature state in saved game files (only attributes and dynamics for now)

2014-02-16 15:56:36 +01:00

steering.cpp

merge master

2014-04-27 13:49:31 +04:00

steering.hpp

merge master

2014-04-27 13:49:31 +04:00