1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:49:56 +00:00
openmw-tes3mp/components
cc9cii 312b7cd571 Merge branch 'master' into QtOGre
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
2014-09-30 10:52:04 +10:00
..
bsa Merge branch 'master' into QtOGre 2014-09-30 10:52:04 +10:00
compiler Fix cppcheck issues 2014-09-26 17:48:14 +02:00
contentselector Add missing case folding for dependency filenames (Fixes #1940) 2014-09-26 20:47:53 +02:00
esm Fix cppcheck issues 2014-09-26 17:48:14 +02:00
esmterrain Merge branch 'master' of https://github.com/OpenMW/openmw 2014-08-12 19:53:37 +02:00
files the global config path is not always $prefix/etc, so just define the whole path in the build system 2014-09-19 20:23:39 +02:00
fontloader Add FontLoader and transparent BG texture to the MyGUI plugin 2014-09-12 04:27:23 +02:00
interpreter inherit target ID when starting a script from another script 2014-07-17 13:37:57 +02:00
loadinglistener Show wallpaper when loading a savegame 2014-06-02 23:26:43 +02:00
misc Remove extra semicolons at the end of some lines. 2014-09-06 13:04:52 -05:00
nif Merge branch 'master' into QtOGre 2014-09-30 10:52:04 +10:00
nifbullet Remove old nifbullet test 2014-09-26 16:10:55 +02:00
nifcache Moved functions from niffile.cpp to where they belong. 2014-08-24 13:45:36 -04:00
nifogre Fix cppcheck issues 2014-09-26 17:48:14 +02:00
nifoverrides Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes 2014-01-05 18:09:50 +01:00
ogreinit Fix cppcheck issues 2014-09-26 17:48:14 +02:00
settings Remove -Wno-ignored-qualifiers and fix caused warnings 2014-08-14 19:18:30 +02:00
terrain Merge branch 'master' into QtOGre 2014-09-30 10:52:04 +10:00
to_utf8 Exit if an unknown encoding option is specified 2014-07-17 16:16:14 +02:00
translation Fix cppcheck issues 2014-09-26 17:48:14 +02:00
version Distinguish between release and development builds 2014-01-23 13:18:05 +01:00
widgets Fix cppcheck issues 2014-09-26 17:48:14 +02:00
CMakeLists.txt Add NumericEditBox widget 2014-09-25 21:04:51 +02:00
doc.hpp second set of additional doxygen comments 2010-09-25 20:15:05 +02:00