scrawl b8e11cf197 Merge commit 'pull/upstream/678' into HEAD ...

Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp

2015-11-13 01:34:36 +01:00

..

action.cpp

extracted MWMechanics::getPlayer()

2015-08-21 21:12:39 +12: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

Added MWMechanics::isPlayerInCombat()

2015-09-10 18:48:34 +12: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

Added MWMechanics::isPlayerInCombat()

2015-09-10 18:48:34 +12: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

Added MWMechanics::isPlayerInCombat()

2015-09-10 18:48:34 +12: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

extracted MWMechanics::getPlayer()

2015-08-21 21:12:39 +12: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

WindowManager refactoring

2015-03-11 20:04:25 +01:00

actionopen.hpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

actionread.cpp

Added MWMechanics::isPlayerInCombat()

2015-09-10 18:48:34 +12: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

Added MWMechanics::isPlayerInCombat()

2015-09-10 18:48:34 +12:00

actionrepair.hpp

Added PC repair feature

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

actionsoulgem.cpp

Added MWMechanics::isPlayerInCombat()

2015-09-10 18:48:34 +12: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

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02: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

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02: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

Remove last remains of Ogre math

2015-06-03 21:37:21 +02:00

actionteleport.hpp

Don't teleport followers when using teleportation spells

2015-05-22 19:57:02 +02:00

actiontrap.cpp

Restore projectiles

2015-06-01 21:41:13 +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

Readded collision objects and movement physics

2015-05-12 03:02:15 +02: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

Load/read methods (for ESM records) accept a deleted flag in OpenMW

2015-07-22 22:15:37 +03:00

cells.cpp

Explicitly instantiate MWWorld::Store

2015-07-09 19:22:04 +02:00

cells.hpp

Several warning fixes

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

cellstore.cpp

Load/read methods (for ESM records) accept a deleted flag in OpenMW

2015-07-22 22:15:37 +03:00

cellstore.hpp

Include cleanup

2015-07-25 04:14:22 +02:00

class.cpp

Use the correct scale for actor swim height (Fixes #2833)

2015-11-01 21:45:58 +01:00

class.hpp

Use the correct scale for actor swim height (Fixes #2833)

2015-11-01 21:45:58 +01:00

containerstore.cpp

Add new script instance when a container item is unstacked (Bug #2962)

2015-10-07 02:43:21 +02: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

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

esmloader.hpp

Reduce includes

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

esmstore.cpp

Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)

2015-07-12 15:20:22 +03:00

esmstore.hpp

Explicitly instantiate MWWorld::Store

2015-07-09 19:22:04 +02:00

failedaction.cpp

extracted MWMechanics::getPlayer()

2015-08-21 21:12:39 +12:00

failedaction.hpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

fallback.cpp

Water ripples

2015-06-16 20:36:48 +02:00

fallback.hpp

More efficient StateSetController, beginnings of sky rendering

2015-04-14 15:58:16 +02:00

globals.cpp

Merge commit 'pull/upstream/678' into HEAD

2015-11-13 01:34:36 +01:00

globals.hpp

Remove NAME handling from MWWorld::Globals

2015-07-10 00:29:40 +03:00

inventorystore.cpp

Enchantment error handling fix (Fixes #2959)

2015-10-13 18:15:39 +02:00

inventorystore.hpp

Remove an already resolved todo comment

2015-07-24 23:28:43 +02: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

improved error handling in LocalScripts::add

2015-05-27 19:45:26 +02:00

localscripts.hpp

fixed warning C4099:

2015-03-06 21:36:42 +13:00

manualref.cpp

Include cleanup

2015-07-24 23:28:36 +02:00

manualref.hpp

Move manualref code out of header

2015-02-09 15:01:49 +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

player.cpp

Include cleanup

2015-07-24 23:28:36 +02:00

player.hpp

Move attackingOrSpell flag to the CharacterController

2015-07-02 19:14:28 +02:00

projectilemanager.cpp

Fix incorrect uses of PhysicsSystem::getHalfExtents

2015-11-03 19:05:36 +01:00

projectilemanager.hpp

Move attackStrength to the CharacterController, where it should have been to begin with

2015-06-26 05:15:07 +02:00

ptr.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

ptr.hpp

fixed warning C4099:

2015-03-06 21:36:42 +13:00

recordcmp.hpp

Remove some unused code, include cleanup

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

refdata.cpp

Rotations: remove LocalRotation

2015-11-12 01:16:37 +01:00

refdata.hpp

Rotations: remove LocalRotation

2015-11-12 01:16:37 +01:00

scene.cpp

Rotations: use different rotation order when object is rotated via script (Fixes #2062)

2015-11-12 01:44:00 +01:00

scene.hpp

Rotations: use different rotation order when object is rotated via script (Fixes #2062)

2015-11-12 01:44:00 +01:00

store.cpp

Merge commit 'pull/upstream/678' into HEAD

2015-11-13 01:34:36 +01:00

store.hpp

Merge commit 'pull/upstream/678' into HEAD

2015-11-13 01:34:36 +01:00

timestamp.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

timestamp.hpp

fixed warning C4099:

2015-03-06 21:36:42 +13:00

weather.cpp

Use TimeOfDayInterpolator for Land Fog Depth

2015-11-01 23:03:16 +01:00

weather.hpp

Use TimeOfDayInterpolator for Land Fog Depth

2015-11-01 23:03:16 +01:00

worldimp.cpp

Increase the ray distance for dropObjectOnGround (Fixes #3010)

2015-11-12 23:05:44 +01:00

worldimp.hpp

Rotations: use different rotation order when object is rotated via script (Fixes #2062)

2015-11-12 01:44:00 +01:00