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

..

action.cpp

Old door sound fades out on door open/close. Door sound is synchronised to angle on action.

2013-07-31 15:46:23 +02:00

action.hpp

Old door sound fades out on door open/close. Door sound is synchronised to angle on action.

2013-07-31 15:46:23 +02:00

actionalchemy.cpp

Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.

2014-04-24 22:47:45 -04:00

actionalchemy.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionapply.cpp

Fix Potion use action removing the potion even when the action is not executed (Fixes #1521)

2014-06-17 04:05:20 +02:00

actionapply.hpp

Fix Potion use action removing the potion even when the action is not executed (Fixes #1521)

2014-06-17 04:05:20 +02:00

actiondoor.cpp

Opening doors

2013-04-28 14:59:15 +02:00

actiondoor.hpp

Opening doors

2013-04-28 14:59:15 +02:00

actioneat.cpp

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

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

actioneat.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionequip.cpp

Allow equipping twohanded weapon and shield at the same time (Fixes #1785)

2014-12-12 16:49:22 +01:00

actionequip.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionopen.cpp

Closes #1081: Implement disease contraction

2014-01-03 23:33:14 +01:00

actionopen.hpp

Added "dispose corpse" button, added stealing (all items visible and no penalty yet)

2013-03-07 14:00:13 +01:00

actionread.cpp

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

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

actionread.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionrepair.cpp

Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.

2014-04-24 22:47:45 -04:00

actionrepair.hpp

Added PC repair feature

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

actionsoulgem.cpp

Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.

2014-04-24 22:47:45 -04:00

actionsoulgem.hpp

Added soulgem dialog; made interactive message boxes not close the previous UI

2013-03-30 15:51:07 +01:00

actiontake.cpp

Change stolen items handling to match MW (Fixes #1443, Fixes #2290)

2015-02-05 04:18:43 +01:00

actiontake.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actiontalk.cpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actiontalk.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionteleport.cpp

Add maximum distance for teleporting followers on using a door

2015-01-11 17:04:58 +01:00

actionteleport.hpp

Fix potential infinite recursion in ActionTeleport (Fixes #1840)

2014-08-26 02:09:23 +02:00

actiontrap.cpp

Basic RefData and CellRef change tracking

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

actiontrap.hpp

Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)

2013-11-13 14:02:15 +01:00

cellfunctors.hpp

Show marked position on map. Implement Detect X magic effects.

2014-01-01 22:37:52 +01:00

cellref.cpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

cellref.hpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

cellreflist.hpp

Minor changes to ESM::RefNum

2015-01-11 12:20:22 +13:00

cells.cpp

Account for not yet listed cells in getInteriorPtrs

2015-02-04 16:41:14 +01:00

cells.hpp

Several warning fixes

2015-01-23 15:34:47 +01:00

cellstore.cpp

Ensure the item can be equipped in the given slot when loading inventory

2015-01-23 15:32:34 +01:00

cellstore.hpp

Starting to clean up some heavy includes

2014-12-19 09:23:16 +01:00

class.cpp

ESSImport: fix NPC factions

2015-01-27 23:12:21 +01:00

class.hpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

containerstore.cpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

containerstore.hpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

contentloader.hpp

Missing iostream include

2013-11-04 10:36:22 +01:00

customdata.hpp

added customdata base class (issue #185)

2012-01-24 11:24:05 +01:00

esmloader.cpp

Remove some unused code, include cleanup

2015-01-27 23:12:13 +01:00

esmloader.hpp

Reduce includes

2015-01-10 01:00:52 +01:00

esmstore.cpp

Remove some unused code, include cleanup

2015-01-27 23:12:13 +01:00

esmstore.hpp

Several warning fixes

2015-01-23 15:34:47 +01:00

failedaction.cpp

Handle object activation as a werewolf

2013-08-08 22:34:53 -07:00

failedaction.hpp

Handle object activation as a werewolf

2013-08-08 22:34:53 -07:00

fallback.cpp

Fix exception when there are spaces in INI-imported color settings

2014-05-28 21:29:09 +02:00

fallback.hpp

some cleanup

2013-03-15 10:26:04 +01:00

globals.cpp

Several warning fixes

2015-01-23 15:34:47 +01:00

globals.hpp

Several warning fixes

2015-01-23 15:34:47 +01:00

inventorystore.cpp

Add possibility to dress up corpses (Fixes #2221)

2015-02-05 04:18:43 +01:00

inventorystore.hpp

Store selected enchant item in savegame (Fixes #1702)

2015-01-23 16:45:47 +01:00

livecellref.cpp

Include cleanup

2015-02-05 04:18:42 +01:00

livecellref.hpp

Basic RefData and CellRef change tracking

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

localscripts.cpp

Remove some unused code, include cleanup

2015-01-27 23:12:13 +01:00

localscripts.hpp

objects scripts are now stopped when they are removed from a container

2013-01-13 17:05:12 +00:00

manualref.hpp

Revert "Revert "Light charge handling fix""

2015-01-23 15:33:39 +01:00

nullaction.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

physicssystem.cpp

Fix setWaterLevel script instruction not affecting physics

2015-02-08 15:50:40 +01:00

physicssystem.hpp

Rewrite animated collision shape support (Fixes #2123)

2015-01-13 05:37:37 +01:00

player.cpp

Make sure birthsign spells are added when loading savegame

2015-02-06 01:27:17 +01:00

player.hpp

Several warning fixes

2015-01-23 15:34:47 +01:00

projectilemanager.cpp

Don't show VFX on the map (Fixes #2324)

2015-01-31 22:40:38 +01:00

projectilemanager.hpp

Several warning fixes

2015-01-23 15:34:47 +01:00

ptr.cpp

Basic RefData and CellRef change tracking

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

ptr.hpp

Reduce includes

2015-01-10 01:00:52 +01:00

recordcmp.hpp

Remove some unused code, include cleanup

2015-01-27 23:12:13 +01:00

refdata.cpp

Add support for undeleting references (Fixes #2193)

2014-12-06 21:08:18 +01:00

refdata.hpp

Add support for undeleting references (Fixes #2193)

2014-12-06 21:08:18 +01:00

scene.cpp

Add exception handling in addObjectToScene

2015-01-31 22:40:42 +01:00

scene.hpp

Implement cell loading threshold (Fixes #1874)

2014-10-02 16:50:10 +02:00

store.cpp

Remove some unused code, include cleanup

2015-01-27 23:12:13 +01:00

store.hpp

Fix overwriting script records not working

2015-01-31 22:40:40 +01:00

timestamp.cpp

Savegame: store most of CreatureStats

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

timestamp.hpp

Savegame: store most of CreatureStats

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

weather.cpp

Move weather reset to clear() method

2015-01-24 16:45:36 +01:00

weather.hpp

Move weather reset to clear() method

2015-01-24 16:45:36 +01:00

worldimp.cpp

Merge remote-tracking branch 'scrawl/master'

2015-02-06 09:23:45 +01:00

worldimp.hpp

Fix swim height, use fSwimHeightScale GMST

2015-01-31 22:40:43 +01:00