Merge branch 'master' into ref

Gaming / Game Engines / OpenMW - Marc Zinnschlag [zpages.de] - 6 July 2013 10:54 UTC

4986b7d Merge branch 'master' into ref

.travis.yml | 5 +-
CMakeLists.txt | 43 +-
apps/esmtool/CMakeLists.txt | 5 -
apps/esmtool/esmtool.cpp | 23 +-
apps/launcher/CMakeLists.txt | 1 +
apps/launcher/graphicspage.cpp | 136 +-
apps/launcher/graphicspage.hpp | 10 +-
apps/launcher/main.cpp | 16 +-
apps/launcher/maindialog.cpp | 23 +-
apps/launcher/settings/gamesettings.cpp | 6 +-
apps/launcher/settings/gamesettings.hpp | 1 +
apps/launcher/settings/settingsbase.hpp | 22 +-
apps/mwiniimporter/importer.cpp | 50 +-
apps/mwiniimporter/importer.hpp | 21 +-
apps/mwiniimporter/main.cpp | 28 +-
apps/opencs/CMakeLists.txt | 5 +-
apps/opencs/editor.cpp | 5 +
apps/opencs/editor.hpp | 2 +
apps/opencs/model/doc/document.cpp | 1943 +++++++++++++++++++-
apps/opencs/model/doc/document.hpp | 2 +
apps/opencs/model/settings/settingcontainer.hpp | 18 +-
apps/opencs/model/settings/settingsitem.cpp | 16 +-
apps/opencs/model/settings/settingsitem.hpp | 26 +-
apps/opencs/model/settings/usersettings.cpp | 255 ++-
apps/opencs/model/settings/usersettings.hpp | 57 +-
apps/opencs/model/world/columnbase.hpp | 3 +-
apps/opencs/model/world/columns.hpp | 4 +-
apps/opencs/model/world/refidcollection.cpp | 4 +-
apps/opencs/view/doc/subview.cpp | 5 +
apps/opencs/view/doc/subview.hpp | 3 +-
apps/opencs/view/doc/view.cpp | 43 +-
apps/opencs/view/doc/view.hpp | 13 +-
apps/opencs/view/doc/viewmanager.cpp | 19 +-
apps/opencs/view/doc/viewmanager.hpp | 3 +
apps/opencs/view/settings/abstractblock.cpp | 12 +-
apps/opencs/view/settings/abstractblock.hpp | 27 +-
apps/opencs/view/settings/abstractpage.cpp | 5 +
apps/opencs/view/settings/abstractpage.hpp | 19 +-
apps/opencs/view/settings/abstractwidget.hpp | 23 +-
apps/opencs/view/settings/blankpage.cpp | 12 +-
apps/opencs/view/settings/blankpage.hpp | 5 +-
apps/opencs/view/settings/customblock.cpp | 15 +-
apps/opencs/view/settings/customblock.hpp | 15 +-
apps/opencs/view/settings/editorpage.cpp | 154 +-
apps/opencs/view/settings/editorpage.hpp | 31 +-
apps/opencs/view/settings/groupblock.cpp | 14 +-
apps/opencs/view/settings/groupblock.hpp | 13 +-
apps/opencs/view/settings/groupbox.hpp | 1 +
apps/opencs/view/settings/itemblock.hpp | 10 +
apps/opencs/view/settings/proxyblock.cpp | 7 +-
apps/opencs/view/settings/proxyblock.hpp | 16 +-
apps/opencs/view/settings/settingwidget.hpp | 8 +-
apps/opencs/view/settings/support.hpp | 129 +-
apps/opencs/view/settings/toggleblock.cpp | 24 +-
apps/opencs/view/settings/toggleblock.hpp | 6 +-
apps/opencs/view/settings/usersettingsdialog.cpp | 108 +-
apps/opencs/view/settings/usersettingsdialog.hpp | 33 +-
apps/opencs/view/settings/windowpage.cpp | 144 ++
apps/opencs/view/settings/windowpage.hpp | 34 +
apps/opencs/view/world/recordstatusdelegate.cpp | 122 ++
apps/opencs/view/world/recordstatusdelegate.hpp | 53 +
apps/opencs/view/world/table.cpp | 15 +-
apps/opencs/view/world/table.hpp | 3 +
apps/opencs/view/world/tablesubview.cpp | 9 +-
apps/opencs/view/world/tablesubview.hpp | 4 +-
apps/opencs/view/world/util.hpp | 6 +
apps/openmw/CMakeLists.txt | 15 +-
apps/openmw/engine.cpp | 35 +-
apps/openmw/engine.hpp | 5 -
apps/openmw/main.cpp | 9 +-
apps/openmw/mwbase/mechanicsmanager.hpp | 2 +
apps/openmw/mwbase/windowmanager.hpp | 10 +-
apps/openmw/mwbase/world.hpp | 4 +
apps/openmw/mwclass/creature.cpp | 53 +
apps/openmw/mwclass/creature.hpp | 15 +
apps/openmw/mwgui/bookpage.cpp | 15 +-
apps/openmw/mwgui/bookwindow.cpp | 41 +-
apps/openmw/mwgui/bookwindow.hpp | 3 +-
apps/openmw/mwgui/charactercreation.cpp | 6 +
apps/openmw/mwgui/charactercreation.hpp | 1 +
apps/openmw/mwgui/class.cpp | 4 +-
apps/openmw/mwgui/console.cpp | 9 +-
apps/openmw/mwgui/containeritemmodel.cpp | 71 +-
apps/openmw/mwgui/containeritemmodel.hpp | 3 +-
apps/openmw/mwgui/controllers.cpp | 54 +
apps/openmw/mwgui/controllers.hpp | 46 +
apps/openmw/mwgui/countdialog.cpp | 5 +-
apps/openmw/mwgui/dialogue.cpp | 20 +-
apps/openmw/mwgui/enchantingdialog.cpp | 22 +-
apps/openmw/mwgui/fontloader.cpp | 238 +++
apps/openmw/mwgui/fontloader.hpp | 25 +
apps/openmw/mwgui/formatting.cpp | 10 +-
apps/openmw/mwgui/itemmodel.cpp | 34 +-
apps/openmw/mwgui/journalbooks.cpp | 24 +-
apps/openmw/mwgui/journalwindow.cpp | 3 +-
apps/openmw/mwgui/loadingscreen.cpp | 3 +-
apps/openmw/mwgui/mapwindow.cpp | 4 +
apps/openmw/mwgui/mapwindow.hpp | 1 +
apps/openmw/mwgui/race.cpp | 14 +
apps/openmw/mwgui/race.hpp | 4 +
apps/openmw/mwgui/settingswindow.cpp | 16 +-
apps/openmw/mwgui/settingswindow.hpp | 1 -
apps/openmw/mwgui/sortfilteritemmodel.cpp | 3 +-
apps/openmw/mwgui/spellcreationdialog.cpp | 4 +
apps/openmw/mwgui/spellcreationdialog.hpp | 2 +-
apps/openmw/mwgui/textinput.cpp | 8 +-
apps/openmw/mwgui/tooltips.cpp | 15 +-
apps/openmw/mwgui/tooltips.hpp | 5 -
apps/openmw/mwgui/tradewindow.cpp | 4 +-
apps/openmw/mwgui/waitdialog.cpp | 5 +-
apps/openmw/mwgui/waitdialog.hpp | 3 +-
apps/openmw/mwgui/widgets.cpp | 109 ++
apps/openmw/mwgui/widgets.hpp | 31 +
apps/openmw/mwgui/windowmanagerimp.cpp | 146 +-
apps/openmw/mwgui/windowmanagerimp.hpp | 24 +-
apps/openmw/mwinput/inputmanagerimp.cpp | 410 +++--
apps/openmw/mwinput/inputmanagerimp.hpp | 45 +-
apps/openmw/mwmechanics/actors.cpp | 15 +-
apps/openmw/mwmechanics/actors.hpp | 1 +
apps/openmw/mwmechanics/aiescort.cpp | 210 ++-
apps/openmw/mwmechanics/aiescort.hpp | 23 +-
apps/openmw/mwmechanics/aitravel.cpp | 47 +-
apps/openmw/mwmechanics/aitravel.hpp | 4 +-
apps/openmw/mwmechanics/aiwander.cpp | 342 +++-
apps/openmw/mwmechanics/aiwander.hpp | 67 +-
apps/openmw/mwmechanics/character.cpp | 41 +-
apps/openmw/mwmechanics/character.hpp | 4 +
apps/openmw/mwmechanics/enchanting.cpp | 169 +-
apps/openmw/mwmechanics/enchanting.hpp | 9 +-
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 7 +
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 1 +
apps/openmw/mwmechanics/pathfinding.cpp | 254 ++-
apps/openmw/mwmechanics/pathfinding.hpp | 26 +-
apps/openmw/mwrender/characterpreview.cpp | 3 +
apps/openmw/mwrender/characterpreview.hpp | 1 +
apps/openmw/mwrender/renderingmanager.cpp | 47 +-
apps/openmw/mwrender/videoplayer.cpp | 21 +-
apps/openmw/mwscript/aiextensions.cpp | 14 +-
apps/openmw/mwsound/ffmpeg_decoder.hpp | 12 +-
apps/openmw/mwworld/player.cpp | 12 +-
apps/openmw/mwworld/player.hpp | 6 +-
apps/openmw/mwworld/scene.cpp | 5 +-
apps/openmw/mwworld/store.hpp | 8 +
apps/openmw/mwworld/weather.cpp | 556 +++---
apps/openmw/mwworld/weather.hpp | 16 +-
apps/openmw/mwworld/worldimp.cpp | 41 +
apps/openmw/mwworld/worldimp.hpp | 4 +
cmake/FindOIS.cmake | 87 -
cmake/FindSDL2.cmake | 193 ++
components/fileorderlist/model/datafilesmodel.cpp | 3 +-
components/files/configurationmanager.hpp | 8 +-
components/to_utf8/gen_iconv.cpp | 4 +-
components/to_utf8/tables_gen.hpp | 259 +++
components/to_utf8/to_utf8.cpp | 6 +
components/to_utf8/to_utf8.hpp | 3 +-
credits.txt | 5 +-
extern/oics/ICSInputControlSystem.cpp | 246 +--
extern/oics/ICSInputControlSystem.h | 56 +-
extern/oics/ICSInputControlSystem_joystick.cpp | 113 +-
extern/oics/ICSInputControlSystem_keyboard.cpp | 26 +-
extern/oics/ICSInputControlSystem_mouse.cpp | 32 +-
extern/oics/ICSPrerequisites.h | 13 +-
extern/sdl4ogre/CMakeLists.txt | 20 +
extern/sdl4ogre/OISCompat.h | 159 ++
extern/sdl4ogre/cursormanager.hpp | 35 +
extern/sdl4ogre/events.h | 76 +
extern/sdl4ogre/sdlcursormanager.cpp | 177 ++
extern/sdl4ogre/sdlcursormanager.hpp | 42 +
extern/sdl4ogre/sdlinputwrapper.cpp | 348 ++++
extern/sdl4ogre/sdlinputwrapper.hpp | 74 +
extern/shiny/Docs/Materials.dox | 2 +
extern/shiny/Editor/Actions.hpp | 2 +-
extern/shiny/Editor/Query.hpp | 2 +-
files/materials/core.h | 11 +-
files/mygui/CMakeLists.txt | 1 +
files/mygui/core.skin | 1 -
files/mygui/openmw_chargen_race.layout | 2 +-
files/mygui/openmw_count_window.layout | 2 +-
files/mygui/openmw_dialogue_window.layout | 2 +-
files/mygui/openmw_edit.skin.xml | 2 +-
files/mygui/openmw_edit_effect.layout | 8 +-
files/mygui/openmw_font.xml | 45 +-
files/mygui/openmw_list.skin.xml | 4 +-
files/mygui/openmw_map_window_skin.xml | 4 +-
files/mygui/openmw_scroll_skin.xml | 4 +-
files/mygui/openmw_settings.xml | 2 +-
files/mygui/openmw_settings_window.layout | 77 +-
files/mygui/openmw_wait_dialog.layout | 2 +-
files/opencs.cfg | 5 +
files/opencs/added.png | Bin 0 -> 862 bytes
files/opencs/base.png | Bin 0 -> 460 bytes
files/opencs/modified.png | Bin 0 -> 2149 bytes
files/opencs/raster/activator.png | Bin 0 -> 2297 bytes
files/opencs/raster/added.png | Bin 0 -> 615 bytes
files/opencs/raster/apparatus.png | Bin 0 -> 1440 bytes
files/opencs/raster/armor.png | Bin 0 -> 1641 bytes
files/opencs/raster/base.png | Bin 0 -> 460 bytes
files/opencs/raster/body-part.png | Bin 0 -> 1359 bytes
files/opencs/raster/book.png | Bin 0 -> 1336 bytes
files/opencs/raster/clothing.png | Bin 0 -> 1377 bytes
files/opencs/raster/container.png | Bin 0 -> 1526 bytes
files/opencs/raster/creature.png | Bin 0 -> 2297 bytes
files/opencs/raster/dialogoue-info.png | Bin 0 -> 1851 bytes
files/opencs/raster/dialogoue-journal.png | Bin 0 -> 1991 bytes
files/opencs/raster/dialogoue-regular.png | Bin 0 -> 1486 bytes
files/opencs/raster/dialogue-greeting.png | Bin 0 -> 1948 bytes
files/opencs/raster/dialogue-persuasion.png | Bin 0 -> 1987 bytes
files/opencs/raster/dialogue-speech.png | Bin 0 -> 1987 bytes
files/opencs/raster/door.png | Bin 0 -> 1627 bytes
files/opencs/raster/ingredient.png | Bin 0 -> 1444 bytes
files/opencs/raster/leveled-creature.png | Bin 0 -> 2150 bytes
files/opencs/raster/light.png | Bin 0 -> 747 bytes
files/opencs/raster/lockpick.png | Bin 0 -> 671 bytes
files/opencs/raster/miscellaneous.png | Bin 0 -> 1716 bytes
files/opencs/raster/modified.png | Bin 0 -> 1320 bytes
files/opencs/raster/npc.png | Bin 0 -> 2143 bytes
files/opencs/raster/potion.png | Bin 0 -> 1582 bytes
files/opencs/raster/probe.png | Bin 0 -> 587 bytes
files/opencs/raster/random-item.png | Bin 0 -> 1698 bytes
files/opencs/raster/removed.png | Bin 0 -> 1251 bytes
files/opencs/raster/repair.png | Bin 0 -> 1115 bytes
files/opencs/raster/sound.png | Bin 0 -> 1144 bytes
files/opencs/raster/soundgen.png | Bin 0 -> 2041 bytes
files/opencs/raster/static.png | Bin 0 -> 1518 bytes
files/opencs/raster/weapon.png | Bin 0 -> 1003 bytes
files/opencs/removed.png | Bin 0 -> 1772 bytes
files/opencs/resources.qrc | 4 +
files/opencs/scalable/Palette.svg | 569 ++++++
.../scalable/referenceable-record/.directory | 5 +
.../scalable/referenceable-record/activator.svg | 1088 +++++++++++
.../scalable/referenceable-record/apparatus.svg | 1058 +++++++++++
.../opencs/scalable/referenceable-record/book.svg | 687 +++++++
.../scalable/referenceable-record/container.svg | 1899 +++++++++++++++++++
.../scalable/referenceable-record/ingredient.svg | 1107 +++++++++++
.../opencs/scalable/referenceable-record/light.svg | 1508 +++++++++++++++
.../referenceable-record/miscellaneous.svg | 965 ++++++++++
.../scalable/referenceable-record/potion.svg | 1161 ++++++++++++
.../scalable/referenceable-record/random-item.svg | 156 ++
.../scalable/referenceable-record/repair.svg | 1280 +++++++++++++
.../scalable/referenceable-record/static.svg | 1141 ++++++++++++
.../scalable/referenceable-record/weapon.svg | 1206 ++++++++++++
files/opencs/scalable/status/.directory | 5 +
files/opencs/scalable/status/added.svg | 932 ++++++++++
files/opencs/scalable/status/base.svg | 942 ++++++++++
files/opencs/scalable/status/modified.svg | 1155 ++++++++++++
files/opencs/scalable/status/removed.svg | 935 ++++++++++
files/opencs/scalable/top-level/gmst.svg | 1047 +++++++++++
files/opencs/scalable/top-level/topic-regular.svg | 1045 +++++++++++
files/settings-default.cfg | 1 +
files/ui/graphicspage.ui | 10 +
files/ui/playpage.ui | 19 +-
libs/openengine/bullet/physic.cpp | 10 +
libs/openengine/bullet/physic.hpp | 3 +
libs/openengine/ogre/imagerotate.cpp | 88 +
libs/openengine/ogre/imagerotate.hpp | 27 +
libs/openengine/ogre/osx_utils.h | 14 +
libs/openengine/ogre/osx_utils.mm | 16 +
libs/openengine/ogre/renderer.cpp | 171 +-
libs/openengine/ogre/renderer.hpp | 22 +-
readme.txt | 50 +-
260 files changed, 27833 insertions(+), 2154 deletions(-)

Upstream: github.com

  • Share