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

Conflicts:
	apps/openmw/mwrender/terrain.cpp
	components/esm/loadland.hpp
	components/esm_store/reclists.hpp

2012-10-07 20:35:54 +02: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

Issue #356: Implemented ingredient eating

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

actioneat.hpp

Issue #356: Implemented ingredient eating

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

actionequip.cpp

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

2012-09-04 15:27:10 +02: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

initial resolving

2012-10-01 00:23:49 +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

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

cells.hpp

Issue #107: World is accessed only through the interface class from now on; some include cleanup

2012-07-03 12:30:50 +02:00

cellstore.cpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

cellstore.hpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

class.cpp

removed some redundant code

2012-07-26 19:09:45 +02:00

class.hpp

Correct struct to class in forward declarations

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

containerstore.cpp

initial resolving

2012-10-01 00:23:49 +04:00

containerstore.hpp

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

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

customdata.hpp

added customdata base class (issue #185)

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

globals.cpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

globals.hpp

fixed global variable search to properly handle injected variables (DaysPassed)

2010-07-21 15:01:35 +02:00

inventorystore.cpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

inventorystore.hpp

Correct struct to class in forward declarations

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

localscripts.cpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

localscripts.hpp

Issue #107: Ptr related include cleanup

2012-07-03 13:55:53 +02:00

manualref.hpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

nullaction.hpp

Issue #351: Refactoring Action class

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

physicssystem.cpp

resolving conflicts

2012-09-21 13:13:11 +04:00

physicssystem.hpp

Tearing apart PhysicActor

2012-09-03 20:32:20 -04:00

player.cpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

player.hpp

rotateObject() added, input system rewritten

2012-08-09 00:15:52 +04:00

ptr.cpp

Issue #217: container change tracking

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

ptr.hpp

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

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

refdata.cpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

refdata.hpp

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

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

scene.cpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

scene.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04: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

initial resolving

2012-10-01 00:23:49 +04: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

2012-10-07 20:35:54 +02:00

worldimp.hpp

Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.

2012-10-07 20:00:55 +02:00