Marc Zinnschlag 8086933282 Merge branch 'master' into dialogue ...

Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp

2010-08-08 14:14:43 +02:00

..

action.hpp

added action interface

2010-08-03 18:20:15 +02:00

actiontake.cpp

implemented take action

2010-08-07 20:25:17 +02:00

actiontake.hpp

implemented take action

2010-08-07 20:25:17 +02:00

actiontalk.cpp

re-routed talk action from gui to dialogue manager (master branch should not incooperate this change, because the dialogue window implementer will need the original code for testing)

2010-08-06 19:25:26 +02:00

actiontalk.hpp

re-routed talk action from gui to dialogue manager (master branch should not incooperate this change, because the dialogue window implementer will need the original code for testing)

2010-08-06 19:25:26 +02:00

actionteleport.cpp

implemented teleport doors (only for the player for now)

2010-08-03 18:44:52 +02:00

actionteleport.hpp

implemented teleport doors (only for the player for now)

2010-08-03 18:44:52 +02:00

class.cpp

added insertIntoContainer function to class hierarchy

2010-08-06 22:20:20 +02:00

class.hpp

added insertIntoContainer function to class hierarchy

2010-08-06 22:20:20 +02:00

containerstore.hpp

added containerstore

2010-08-04 14:37:23 +02:00

containerutil.cpp

added GetItemCount

2010-08-07 16:21:07 +02:00

containerutil.hpp

added GetItemCount

2010-08-07 16:21:07 +02:00

environment.hpp

changed namespace, class and function names to ensure consistent spelling

2010-08-06 19:16:44 +02: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

manualref.hpp

modified Npc and Creature class to let them store a copy of their own ID

2010-08-08 14:09:09 +02:00

nullaction.hpp

added action interface

2010-08-03 18:20:15 +02:00

ptr.hpp

removed superfluous includes

2010-08-03 14:43:14 +02:00

refdata.hpp

added containerstore

2010-08-04 14:37:23 +02:00

world.cpp

Merge branch 'container'

2010-08-07 20:33:07 +02:00

world.hpp

implemented take action

2010-08-07 20:25:17 +02:00