mrcheko d7d5cc6689 Merge remote-tracking branch 'upstream/master' into pathfinding ...

Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aifollow.cpp
	apps/openmw/mwmechanics/aipackage.cpp
	apps/openmw/mwmechanics/aipackage.hpp
	apps/openmw/mwmechanics/aiwander.cpp
	apps/openmw/mwmechanics/pathfinding.hpp

Ogre::Vector3->osg::Vec3f; REACTION_INTERVAL->AI_REACTION_TIME; MakeOgreVec3->MakeOsgVec3

2015-12-29 19:15:40 +03:00

..

mwbase

Move werewolf functions from World to MechanicsManager

2015-12-26 18:23:13 +01:00

mwclass

Add count argument to copyObjectToCell

2015-12-19 16:48:32 +01:00

mwdialogue

Call updateDialogueGlobals before dialogue starts (Fixes #3034)

2015-12-19 21:58:49 +01:00

mwgui

Revert "Accept a ConstPtr in ItemPtr tooltips"

2015-12-19 22:52:35 +01:00

mwinput

Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves (Fixes #3100)

2015-12-26 18:15:57 +01:00

mwmechanics

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

2015-12-29 19:15:40 +03:00

mwphysics

Another collision mask fix

2015-12-19 17:02:57 +01:00

mwrender

Accept a ConstPtr in RippleSimulation

2015-12-19 15:51:41 +01:00

mwscript

Move werewolf functions from World to MechanicsManager

2015-12-26 18:23:13 +01:00

mwsound

Use a ConstPtr in SoundManager

2015-12-18 18:11:30 +01:00

mwstate

Accept a ConstPtr in RippleSimulation

2015-12-19 15:51:41 +01:00

mwworld

Move werewolf functions from World to MechanicsManager

2015-12-26 18:23:13 +01:00

android_commandLine.cpp

Fix tab indentations in apps/ and components/

2015-09-16 20:45:37 +02:00

android_commandLine.h

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

android_main.c

enable opengl es1

2015-12-02 22:40:04 +03:00

CMakeLists.txt

Rename CellStore Functor to Visitor

2015-12-06 18:13:04 +01:00

crashcatcher.cpp

Revert debce0fb80, use a sleep() to work around the X11 bug

2015-11-28 05:42:05 +01:00

doc.hpp

doc.hpp fix

2015-06-04 01:30:16 +02:00

engine.cpp

Use separate config options for min and mag texture filters

2015-12-13 17:05:19 -08:00

engine.hpp

Refactor: InputManager no longer depends on Engine

2015-11-14 03:01:24 +01:00

main.cpp

enable opengl es1

2015-12-02 22:40:04 +03:00