Aesylwinn b4a000913c Merge remote-tracking branch 'yar/master' into Even ...

# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp

2016-07-17 23:50:52 -04:00

..

model

Fix cppcheck warnings

2016-07-07 23:50:48 +08:00

view

Fix cppcheck warnings

2016-07-07 23:50:48 +08:00

CMakeLists.txt

Share selection functionality with instance editing mode.

2016-05-18 10:46:25 -04:00

editor.cpp

Read fallback settings in OpenCS

2016-01-11 23:10:16 +01:00

editor.hpp

removed old user settings system

2015-12-15 12:49:55 +01:00

main.cpp

Syncing inventory, animations, position, 8 key attributes

2016-07-07 23:50:48 +08:00

Networking.cpp

Add OpenMW-mp target

2016-01-04 20:15:55 +08:00