Mark Siewert dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ...

Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.

2013-01-25 18:22:01 +01:00

..

action.cpp

Issue #370: fixed item taking sound

2012-09-04 20:56:28 +02:00

action.hpp

Issue #370: fixed item taking sound

2012-09-04 20:56:28 +02:00

actionalchemy.cpp

Issue #107: WindowManager is accessed only through the interface class from now on

2012-08-12 18:11:09 +02:00

actionalchemy.hpp

Issue #351: Refactoring Action class

2012-07-27 12:00:10 +02:00

actionapply.cpp

Issue #370: replaced custom target handling in apply action with base class implementation

2012-09-04 15:18:59 +02:00

actionapply.hpp

Issue #370: replaced custom target handling in apply action with base class implementation

2012-09-04 15:18:59 +02:00

actioneat.cpp

move ESMStore to MWWorld

2012-11-05 17:18:01 +04:00

actioneat.hpp

Issue #356: Implemented ingredient eating

2012-09-13 13:02:26 +02:00

actionequip.cpp

small fix

2013-01-09 13:27:12 +00:00

actionequip.hpp

Issue #370: replaced custom target handling in equip action with base class implementation

2012-09-04 15:27:10 +02:00

actionopen.cpp

Issue #370: replaced custom target handling in open action with base class implementation

2012-09-04 15:29:51 +02:00

actionopen.hpp

Issue #370: replaced custom target handling in open action with base class implementation

2012-09-04 15:29:51 +02:00

actionread.cpp

applying new interface vol.9, inconsistent

2012-11-06 12:36:21 +04:00

actionread.hpp

Issue #370: replaced custom target handling in read action with base class implementation

2012-09-04 15:24:55 +02:00

actiontake.cpp

Issue #370: fixed item taking sound

2012-09-04 20:56:28 +02:00

actiontake.hpp

Issue #370: replaced custom target handling in take action with base class implementation

2012-09-04 15:34:44 +02:00

actiontalk.cpp

Issue #370: replaced custom target handling in talk action with base class implementation

2012-09-04 15:38:21 +02:00

actiontalk.hpp

Issue #370: replaced custom target handling in talk action with base class implementation

2012-09-04 15:38:21 +02:00

actionteleport.cpp

some cleanup

2012-08-26 18:50:47 +02:00

actionteleport.hpp

Issue #351: Refactoring Action class

2012-07-27 12:00:10 +02:00

cellfunctors.hpp

Many bugs fixed related to changing cells

2011-11-19 01:01:19 -05:00

cells.cpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

cells.hpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2012-11-25 14:12:44 +01:00

cellstore.cpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

cellstore.hpp

- Minor code cleanup

2013-01-20 19:07:33 +01:00

class.cpp

Issue #219: added last missing function filters

2012-11-15 20:00:27 +01:00

class.hpp

Issue #219: added last missing function filters

2012-11-15 20:00:27 +01:00

containerstore.cpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

containerstore.hpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

customdata.hpp

added customdata base class (issue #185)

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

esmstore.cpp

- Minor code cleanup

2013-01-20 19:07:33 +01:00

esmstore.hpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

failedaction.cpp

various fixes

2012-11-22 17:24:28 +01:00

failedaction.hpp

Failed action

2012-11-19 21:04:49 +01:00

globals.cpp

Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work

2012-12-20 23:16:34 +00:00

globals.hpp

Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work

2012-12-20 23:16:34 +00:00

inventorystore.cpp

applying new interface vol.9, inconsistent

2012-11-06 12:36:21 +04:00

inventorystore.hpp

Correct struct to class in forward declarations

2012-08-13 13:58:35 -04:00

localscripts.cpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +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

new interface in manualref, fix various typos

2012-11-06 13:43:48 +04:00

nullaction.hpp

Issue #351: Refactoring Action class

2012-07-27 12:00:10 +02:00

physicssystem.cpp

updated MWWorld::PhysicsSystem::getFacedXXX functions

2013-01-07 23:00:00 -08:00

physicssystem.hpp

updated MWWorld::PhysicsSystem::getFacedXXX functions

2013-01-07 23:00:00 -08:00

player.cpp

clean up interfaces

2012-11-08 16:37:57 +04:00

player.hpp

GetWeaponType

2012-11-25 02:06:43 +01:00

ptr.cpp

Issue #217: container change tracking

2012-03-21 12:48:05 +01:00

ptr.hpp

fixed isInCell method

2013-01-20 14:10:04 +00:00

recordcmp.hpp

Cell names localization fix

2012-12-23 23:23:24 +04:00

refdata.cpp

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

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

refdata.hpp

Mostly removal of unnecessary #include's and a little clean up

2012-07-17 09:27:12 +02:00

scene.cpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

scene.hpp

Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell

2012-11-03 19:29:55 +00:00

store.hpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

timestamp.cpp

fixed time stamp operator

2012-08-11 11:38:26 +02:00

timestamp.hpp

Issue #256: added TimeStamp class

2012-05-18 22:04:22 +02:00

weather.cpp

more string lowercase

2013-01-09 20:51:52 +01:00

weather.hpp

fix the weather not changing when sleeping/waiting

2012-09-25 21:49:34 +02:00

worldimp.cpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

worldimp.hpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00