scrawl 1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips ...

Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp

2012-04-24 02:02:03 +02:00

..

action.hpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

actiontake.cpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

actiontake.hpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

actiontalk.cpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

actiontalk.hpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

actionteleport.cpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

actionteleport.hpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

cellfunctors.hpp

Many bugs fixed related to changing cells

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

cells.cpp

provisionally fill up containers on cell load

2012-03-10 12:36:29 +01:00

cells.hpp

provisionally fill up containers on cell load

2012-03-10 12:36:29 +01:00

class.cpp

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

class.hpp

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

containerstore.cpp

Issue #217: added getWeight function to ContainerStore

2012-03-22 09:45:48 +01:00

containerstore.hpp

Issue #217: added getWeight function to ContainerStore

2012-03-22 09:45:48 +01:00

customdata.hpp

added customdata base class (issue #185)

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

globals.cpp

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

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

globals.hpp

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

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

inventorystore.cpp

Merge branch 'master' into next

2012-04-23 15:32:02 +02:00

inventorystore.hpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

localscripts.cpp

Issue #19: More local script related cleanup

2011-10-07 09:52:42 +02:00

localscripts.hpp

Issue #19: More local script related cleanup

2011-10-07 09:52:42 +02:00

manualref.hpp

manually created objects were initialised incompletely

2012-02-23 12:33:50 +01:00

nullaction.hpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

physicssystem.cpp

Preparing for clothes/armor

2012-04-02 22:08:46 -04:00

physicssystem.hpp

Preparing for clothes/armor

2012-04-02 22:08:46 -04:00

player.cpp

made player respect NpcStats for mDrawState

2012-04-08 19:43:04 +02:00

player.hpp

made player respect NpcStats for mDrawState

2012-04-08 19:43:04 +02:00

ptr.cpp

Issue #217: container change tracking

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

ptr.hpp

constness fix

2012-03-30 17:01:23 +02:00

refdata.cpp

minor fix

2012-01-30 12:38:13 +01:00

refdata.hpp

replaced container store in ref data with new custom data implementation

2012-01-27 14:55:58 +01:00

scene.cpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

scene.hpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

weather.cpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

weather.hpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

world.cpp

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

world.hpp

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00