David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwbase/dialoguemanager.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.hpp # apps/openmw/mwgui/container.cpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwscript/dialogueextensions.cpp		2017-10-06 04:10:04 +03:00
..
docs
aiextensions.cpp	Allow to use GetDetected without a reference (bug #3110)	2017-09-18 21:46:57 +04:00
aiextensions.hpp
animationextensions.cpp
animationextensions.hpp
cellextensions.cpp
cellextensions.hpp
compilercontext.cpp
compilercontext.hpp
consoleextensions.cpp
consoleextensions.hpp
containerextensions.cpp	Merge pull request #296 from OpenMW/master while resolving conflicts	2017-09-22 19:12:41 +03:00
containerextensions.hpp
controlextensions.cpp	Check animation state for GetPCRunning and GetPCSneaking	2017-08-16 20:30:47 +04:00
controlextensions.hpp
dialogueextensions.cpp	Merge pull request #303 from OpenMW/master while resolving conflicts	2017-10-06 04:10:04 +03:00
dialogueextensions.hpp
extensions.cpp
extensions.hpp
globalscripts.cpp
globalscripts.hpp
guiextensions.cpp	Remove redundant RestBed gui mode	2017-09-24 19:08:14 +02:00
guiextensions.hpp
interpretercontext.cpp	[Client] Don't send ObjectState packets for items in containers	2017-08-20 06:58:39 +03:00
interpretercontext.hpp	Merge pull request #228 from OpenMW/master while resolving conflicts	2017-06-18 18:16:10 +03:00
locals.cpp
locals.hpp
miscextensions.cpp
miscextensions.hpp
ref.cpp
ref.hpp
scriptmanagerimp.cpp
scriptmanagerimp.hpp
skyextensions.cpp	Fixes for building in MSVC	2017-06-13 19:38:12 +09:00
skyextensions.hpp
soundextensions.cpp	Merge pull request #290 from OpenMW/master	2017-09-17 10:53:33 +03:00
soundextensions.hpp
statsextensions.cpp	Merge pull request #287 from OpenMW/master while resolving conflicts	2017-09-12 07:38:49 +03:00
statsextensions.hpp
transformationextensions.cpp	[Client] Only send ObjectScale packets for objects located in cells	2017-08-23 02:45:38 +03:00
transformationextensions.hpp
userextensions.cpp
userextensions.hpp