Merge branch 'master' of git://github.com/zinnschlag/openmw

Gaming / Game Engines / OpenMW - scrawl [baseoftrash.de] - 27 June 2013 10:31 UTC

febc93a Merge branch 'master' of git://github.com/zinnschlag/openmw

.gitignore | 3 +
.travis.yml | 39 +
CMakeLists.txt | 55 +-
apps/esmtool/CMakeLists.txt | 5 -
apps/esmtool/esmtool.cpp | 29 +-
apps/esmtool/record.cpp | 140 +-
apps/esmtool/record.hpp | 11 +-
apps/launcher/CMakeLists.txt | 7 +
apps/launcher/graphicspage.cpp | 136 +-
apps/launcher/graphicspage.hpp | 10 +-
apps/launcher/main.cpp | 16 +-
apps/launcher/maindialog.cpp | 23 +-
apps/launcher/maindialog.hpp | 4 +-
apps/launcher/settings/gamesettings.cpp | 8 +-
apps/launcher/settings/gamesettings.hpp | 1 +
apps/launcher/settings/settingsbase.hpp | 25 +-
apps/mwiniimporter/importer.cpp | 50 +-
apps/mwiniimporter/importer.hpp | 21 +-
apps/mwiniimporter/main.cpp | 28 +-
apps/opencs/CMakeLists.txt | 41 +-
apps/opencs/editor.cpp | 5 +
apps/opencs/editor.hpp | 7 +-
apps/opencs/model/doc/document.cpp | 1942 ++++-
apps/opencs/model/doc/document.hpp | 2 +
apps/opencs/model/settings/settingcontainer.cpp | 82 +
apps/opencs/model/settings/settingcontainer.hpp | 47 +
apps/opencs/model/settings/settingsitem.cpp | 104 +
apps/opencs/model/settings/settingsitem.hpp | 63 +
apps/opencs/model/settings/support.cpp | 1 +
apps/opencs/model/settings/support.hpp | 39 +
apps/opencs/model/settings/usersettings.cpp | 266 +
apps/opencs/model/settings/usersettings.hpp | 83 +
apps/opencs/model/tools/birthsigncheck.cpp | 39 +
apps/opencs/model/tools/birthsigncheck.hpp | 29 +
apps/opencs/model/tools/classcheck.cpp | 72 +
apps/opencs/model/tools/classcheck.hpp | 29 +
apps/opencs/model/tools/factioncheck.cpp | 61 +
apps/opencs/model/tools/factioncheck.hpp | 29 +
apps/opencs/model/tools/racecheck.cpp | 68 +
apps/opencs/model/tools/racecheck.hpp | 34 +
apps/opencs/model/tools/regioncheck.cpp | 33 +
apps/opencs/model/tools/regioncheck.hpp | 29 +
apps/opencs/model/tools/soundcheck.cpp | 29 +
apps/opencs/model/tools/soundcheck.hpp | 29 +
apps/opencs/model/tools/spellcheck.cpp | 35 +
apps/opencs/model/tools/spellcheck.hpp | 29 +
apps/opencs/model/tools/tools.cpp | 21 +
apps/opencs/model/world/cell.cpp | 20 +
apps/opencs/model/world/cell.hpp | 17 +
apps/opencs/model/world/columnbase.hpp | 10 +-
apps/opencs/model/world/columns.hpp | 376 +-
apps/opencs/model/world/commands.cpp | 4 +-
apps/opencs/model/world/data.cpp | 217 +-
apps/opencs/model/world/data.hpp | 58 +
apps/opencs/model/world/idcollection.hpp | 200 +-
apps/opencs/model/world/idtable.cpp | 8 +-
apps/opencs/model/world/idtable.hpp | 2 +-
apps/opencs/model/world/record.hpp | 27 +-
apps/opencs/model/world/refidadapter.cpp | 6 +
apps/opencs/model/world/refidadapter.hpp | 37 +
apps/opencs/model/world/refidadapterimp.cpp | 575 ++
apps/opencs/model/world/refidadapterimp.hpp | 766 ++
apps/opencs/model/world/refidcollection.cpp | 540 ++
apps/opencs/model/world/refidcollection.hpp | 95 +
apps/opencs/model/world/refiddata.cpp | 198 +
apps/opencs/model/world/refiddata.hpp | 188 +
apps/opencs/model/world/scriptcontext.cpp | 22 +
apps/opencs/model/world/scriptcontext.hpp | 26 +
apps/opencs/model/world/universalid.cpp | 111 +-
apps/opencs/model/world/universalid.hpp | 41 +-
apps/opencs/ocspropertywidget.cpp | 6 +
apps/opencs/ocspropertywidget.hpp | 18 +
apps/opencs/view/doc/startup.cpp | 9 +-
apps/opencs/view/doc/subview.cpp | 5 +
apps/opencs/view/doc/subview.hpp | 3 +-
apps/opencs/view/doc/view.cpp | 143 +-
apps/opencs/view/doc/view.hpp | 31 +
apps/opencs/view/doc/viewmanager.cpp | 76 +-
apps/opencs/view/doc/viewmanager.hpp | 3 +
apps/opencs/view/settings/abstractblock.cpp | 112 +
apps/opencs/view/settings/abstractblock.hpp | 82 +
apps/opencs/view/settings/abstractpage.cpp | 44 +
apps/opencs/view/settings/abstractpage.hpp | 70 +
apps/opencs/view/settings/abstractwidget.cpp | 78 +
apps/opencs/view/settings/abstractwidget.hpp | 69 +
apps/opencs/view/settings/blankpage.cpp | 50 +
apps/opencs/view/settings/blankpage.hpp | 28 +
apps/opencs/view/settings/customblock.cpp | 121 +
apps/opencs/view/settings/customblock.hpp | 47 +
apps/opencs/view/settings/editorpage.cpp | 53 +
apps/opencs/view/settings/editorpage.hpp | 33 +
apps/opencs/view/settings/groupblock.cpp | 108 +
apps/opencs/view/settings/groupblock.hpp | 43 +
apps/opencs/view/settings/groupbox.cpp | 56 +
apps/opencs/view/settings/groupbox.hpp | 28 +
apps/opencs/view/settings/itemblock.cpp | 115 +
apps/opencs/view/settings/itemblock.hpp | 48 +
apps/opencs/view/settings/proxyblock.cpp | 152 +
apps/opencs/view/settings/proxyblock.hpp | 52 +
apps/opencs/view/settings/settingwidget.cpp | 1 +
apps/opencs/view/settings/settingwidget.hpp | 214 +
apps/opencs/view/settings/support.cpp | 1 +
apps/opencs/view/settings/support.hpp | 203 +
apps/opencs/view/settings/toggleblock.cpp | 80 +
apps/opencs/view/settings/toggleblock.hpp | 29 +
apps/opencs/view/settings/usersettingsdialog.cpp | 117 +
apps/opencs/view/settings/usersettingsdialog.hpp | 73 +
apps/opencs/view/settings/windowpage.cpp | 144 +
apps/opencs/view/settings/windowpage.hpp | 34 +
apps/opencs/view/world/enumdelegate.cpp | 31 +-
apps/opencs/view/world/enumdelegate.hpp | 3 +-
apps/opencs/view/world/recordstatusdelegate.cpp | 122 +
apps/opencs/view/world/recordstatusdelegate.hpp | 53 +
apps/opencs/view/world/scripthighlighter.cpp | 118 +
apps/opencs/view/world/scripthighlighter.hpp | 80 +
apps/opencs/view/world/scriptsubview.cpp | 99 +
apps/opencs/view/world/scriptsubview.hpp | 62 +
apps/opencs/view/world/subviews.cpp | 27 +-
apps/opencs/view/world/table.cpp | 15 +-
apps/opencs/view/world/table.hpp | 3 +
apps/opencs/view/world/tablesubview.cpp | 12 +-
apps/opencs/view/world/tablesubview.hpp | 4 +-
apps/opencs/view/world/util.cpp | 10 +
apps/opencs/view/world/util.hpp | 9 +
apps/openmw/CMakeLists.txt | 34 +-
apps/openmw/engine.cpp | 111 +-
apps/openmw/engine.hpp | 5 -
apps/openmw/main.cpp | 9 +-
apps/openmw/mwbase/dialoguemanager.hpp | 4 +-
apps/openmw/mwbase/journal.hpp | 2 +
apps/openmw/mwbase/mechanicsmanager.hpp | 5 +
apps/openmw/mwbase/scriptmanager.hpp | 2 +
apps/openmw/mwbase/windowmanager.hpp | 25 +-
apps/openmw/mwbase/world.hpp | 28 +-
apps/openmw/mwclass/apparatus.cpp | 12 +
apps/openmw/mwclass/apparatus.hpp | 4 +
apps/openmw/mwclass/armor.cpp | 90 +-
apps/openmw/mwclass/armor.hpp | 12 +-
apps/openmw/mwclass/book.cpp | 20 +-
apps/openmw/mwclass/book.hpp | 8 +-
apps/openmw/mwclass/clothing.cpp | 62 +-
apps/openmw/mwclass/clothing.hpp | 12 +-
apps/openmw/mwclass/creature.cpp | 75 +
apps/openmw/mwclass/creature.hpp | 21 +
apps/openmw/mwclass/door.cpp | 14 +-
apps/openmw/mwclass/ingredient.cpp | 13 +
apps/openmw/mwclass/ingredient.hpp | 4 +
apps/openmw/mwclass/light.cpp | 12 +
apps/openmw/mwclass/light.hpp | 4 +
apps/openmw/mwclass/lockpick.cpp | 20 +
apps/openmw/mwclass/lockpick.hpp | 7 +
apps/openmw/mwclass/misc.cpp | 15 +
apps/openmw/mwclass/misc.hpp | 4 +
apps/openmw/mwclass/npc.cpp | 89 +-
apps/openmw/mwclass/npc.hpp | 6 +
apps/openmw/mwclass/potion.cpp | 12 +
apps/openmw/mwclass/potion.hpp | 4 +
apps/openmw/mwclass/probe.cpp | 20 +
apps/openmw/mwclass/probe.hpp | 7 +
apps/openmw/mwclass/repair.cpp | 12 +
apps/openmw/mwclass/repair.hpp | 4 +
apps/openmw/mwclass/weapon.cpp | 49 +-
apps/openmw/mwclass/weapon.hpp | 12 +-
apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 85 +-
apps/openmw/mwdialogue/dialoguemanagerimp.hpp | 7 +-
apps/openmw/mwdialogue/filter.cpp | 9 +-
apps/openmw/mwdialogue/journalentry.hpp | 4 +-
apps/openmw/mwdialogue/journalimp.cpp | 7 +
apps/openmw/mwdialogue/journalimp.hpp | 2 +
apps/openmw/mwgui/alchemywindow.cpp | 83 +-
apps/openmw/mwgui/alchemywindow.hpp | 22 +-
apps/openmw/mwgui/birth.cpp | 353 +-
apps/openmw/mwgui/birth.hpp | 4 +-
apps/openmw/mwgui/bookpage.cpp | 1236 +++
apps/openmw/mwgui/bookpage.hpp | 122 +
apps/openmw/mwgui/bookwindow.cpp | 256 +-
apps/openmw/mwgui/bookwindow.hpp | 8 +-
apps/openmw/mwgui/charactercreation.cpp | 1140 +--
apps/openmw/mwgui/charactercreation.hpp | 8 +-
apps/openmw/mwgui/class.cpp | 1405 ++-
apps/openmw/mwgui/class.hpp | 20 +-
apps/openmw/mwgui/companionitemmodel.cpp | 34 +
apps/openmw/mwgui/companionitemmodel.hpp | 22 +
apps/openmw/mwgui/companionwindow.cpp | 93 +-
apps/openmw/mwgui/companionwindow.hpp | 29 +-
apps/openmw/mwgui/confirmationdialog.cpp | 9 +-
apps/openmw/mwgui/confirmationdialog.hpp | 4 +-
apps/openmw/mwgui/console.cpp | 65 +-
apps/openmw/mwgui/container.cpp | 836 +-
apps/openmw/mwgui/container.hpp | 127 +-
apps/openmw/mwgui/containeritemmodel.cpp | 174 +
apps/openmw/mwgui/containeritemmodel.hpp | 38 +
apps/openmw/mwgui/countdialog.cpp | 22 +-
apps/openmw/mwgui/countdialog.hpp | 7 +-
apps/openmw/mwgui/cursor.cpp | 2 -
apps/openmw/mwgui/cursor.hpp | 1 -
apps/openmw/mwgui/dialogue.cpp | 875 +-
apps/openmw/mwgui/dialogue.hpp | 110 +-
apps/openmw/mwgui/dialogue_history.cpp | 76 -
apps/openmw/mwgui/dialogue_history.hpp | 19 -
apps/openmw/mwgui/enchantingdialog.cpp | 126 +-
apps/openmw/mwgui/enchantingdialog.hpp | 5 +-
apps/openmw/mwgui/fontloader.cpp | 238 +
apps/openmw/mwgui/fontloader.hpp | 25 +
apps/openmw/mwgui/formatting.cpp | 496 +-
apps/openmw/mwgui/formatting.hpp | 11 +-
apps/openmw/mwgui/hud.cpp | 839 +-
apps/openmw/mwgui/hud.hpp | 4 +-
apps/openmw/mwgui/inventoryitemmodel.cpp | 97 +
apps/openmw/mwgui/inventoryitemmodel.hpp | 31 +
apps/openmw/mwgui/inventorywindow.cpp | 297 +-
apps/openmw/mwgui/inventorywindow.hpp | 55 +-
apps/openmw/mwgui/itemmodel.cpp | 120 +
apps/openmw/mwgui/itemmodel.hpp | 84 +
apps/openmw/mwgui/itemselection.cpp | 42 +-
apps/openmw/mwgui/itemselection.hpp | 18 +-
apps/openmw/mwgui/itemview.cpp | 200 +
apps/openmw/mwgui/itemview.hpp | 52 +
apps/openmw/mwgui/journalbooks.cpp | 326 +
apps/openmw/mwgui/journalbooks.hpp | 29 +
apps/openmw/mwgui/journalviewmodel.cpp | 389 +
apps/openmw/mwgui/journalviewmodel.hpp | 93 +
apps/openmw/mwgui/journalwindow.cpp | 573 +-
apps/openmw/mwgui/journalwindow.hpp | 41 +-
apps/openmw/mwgui/keywordsearch.hpp | 199 +
apps/openmw/mwgui/levelupdialog.cpp | 8 +-
apps/openmw/mwgui/levelupdialog.hpp | 4 +-
apps/openmw/mwgui/list.cpp | 268 +-
apps/openmw/mwgui/list.hpp | 1 -
apps/openmw/mwgui/loadingscreen.cpp | 43 +-
apps/openmw/mwgui/loadingscreen.hpp | 7 +-
apps/openmw/mwgui/mainmenu.cpp | 13 +-
apps/openmw/mwgui/map_window.cpp | 446 -
apps/openmw/mwgui/map_window.hpp | 107 -
apps/openmw/mwgui/mapwindow.cpp | 449 +
apps/openmw/mwgui/mapwindow.hpp | 108 +
apps/openmw/mwgui/merchantrepair.cpp | 20 +-
apps/openmw/mwgui/merchantrepair.hpp | 4 +-
apps/openmw/mwgui/messagebox.cpp | 610 +-
apps/openmw/mwgui/messagebox.hpp | 16 +-
apps/openmw/mwgui/pickpocketitemmodel.cpp | 55 +
apps/openmw/mwgui/pickpocketitemmodel.hpp | 26 +
apps/openmw/mwgui/quickkeysmenu.cpp | 37 +-
apps/openmw/mwgui/quickkeysmenu.hpp | 9 +-
apps/openmw/mwgui/race.cpp | 667 +-
apps/openmw/mwgui/race.hpp | 16 +-
apps/openmw/mwgui/referenceinterface.cpp | 12 +-
apps/openmw/mwgui/repair.cpp | 6 +-
apps/openmw/mwgui/repair.hpp | 5 +-
apps/openmw/mwgui/review.cpp | 579 +-
apps/openmw/mwgui/review.hpp | 5 +-
apps/openmw/mwgui/scrollwindow.cpp | 113 +-
apps/openmw/mwgui/scrollwindow.hpp | 4 +-
apps/openmw/mwgui/settingswindow.cpp | 48 +-
apps/openmw/mwgui/settingswindow.hpp | 5 +-
apps/openmw/mwgui/sortfilteritemmodel.cpp | 171 +
apps/openmw/mwgui/sortfilteritemmodel.hpp | 53 +
apps/openmw/mwgui/soulgemdialog.cpp | 1 -
apps/openmw/mwgui/spellbuyingwindow.cpp | 23 +-
apps/openmw/mwgui/spellbuyingwindow.hpp | 4 +-
apps/openmw/mwgui/spellcreationdialog.cpp | 51 +-
apps/openmw/mwgui/spellcreationdialog.hpp | 10 +-
apps/openmw/mwgui/spellicons.cpp | 5 -
apps/openmw/mwgui/spellwindow.cpp | 30 +-
apps/openmw/mwgui/spellwindow.hpp | 4 +-
apps/openmw/mwgui/stats_window.cpp | 580 --
apps/openmw/mwgui/stats_window.hpp | 83 -
apps/openmw/mwgui/statswindow.cpp | 577 ++
apps/openmw/mwgui/statswindow.hpp | 78 +
apps/openmw/mwgui/text_input.cpp | 69 -
apps/openmw/mwgui/text_input.hpp | 36 -
apps/openmw/mwgui/textinput.cpp | 73 +
apps/openmw/mwgui/textinput.hpp | 33 +
apps/openmw/mwgui/tooltips.cpp | 1261 ++-
apps/openmw/mwgui/tooltips.hpp | 15 +-
apps/openmw/mwgui/tradeitemmodel.cpp | 198 +
apps/openmw/mwgui/tradeitemmodel.hpp | 53 +
apps/openmw/mwgui/tradewindow.cpp | 248 +-
apps/openmw/mwgui/tradewindow.hpp | 45 +-
apps/openmw/mwgui/trainingwindow.cpp | 23 +-
apps/openmw/mwgui/trainingwindow.hpp | 4 +-
apps/openmw/mwgui/travelwindow.cpp | 51 +-
apps/openmw/mwgui/travelwindow.hpp | 5 +-
apps/openmw/mwgui/waitdialog.cpp | 28 +-
apps/openmw/mwgui/waitdialog.hpp | 6 +-
apps/openmw/mwgui/widgets.cpp | 1473 ++--
apps/openmw/mwgui/widgets.hpp | 14 -
apps/openmw/mwgui/window_base.cpp | 55 -
apps/openmw/mwgui/window_base.hpp | 51 -
apps/openmw/mwgui/window_pinnable_base.cpp | 28 -
apps/openmw/mwgui/window_pinnable_base.hpp | 28 -
apps/openmw/mwgui/windowbase.cpp | 52 +
apps/openmw/mwgui/windowbase.hpp | 47 +
apps/openmw/mwgui/windowmanagerimp.cpp | 2086 ++---
apps/openmw/mwgui/windowmanagerimp.hpp | 49 +-
apps/openmw/mwgui/windowpinnablebase.cpp | 27 +
apps/openmw/mwgui/windowpinnablebase.hpp | 28 +
apps/openmw/mwinput/inputmanagerimp.cpp | 467 +-
apps/openmw/mwinput/inputmanagerimp.hpp | 47 +-
apps/openmw/mwmechanics/activators.cpp | 81 -
apps/openmw/mwmechanics/activators.hpp | 45 -
apps/openmw/mwmechanics/actors.cpp | 35 +-
apps/openmw/mwmechanics/actors.hpp | 3 +
apps/openmw/mwmechanics/aiescort.cpp | 202 +-
apps/openmw/mwmechanics/aiescort.hpp | 25 +-
apps/openmw/mwmechanics/aitravel.cpp | 112 +-
apps/openmw/mwmechanics/aitravel.hpp | 48 +-
apps/openmw/mwmechanics/aiwander.cpp | 342 +-
apps/openmw/mwmechanics/aiwander.hpp | 67 +-
apps/openmw/mwmechanics/character.cpp | 551 +-
apps/openmw/mwmechanics/character.hpp | 57 +-
apps/openmw/mwmechanics/enchanting.cpp | 287 +-
apps/openmw/mwmechanics/enchanting.hpp | 36 +-
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 69 +-
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 7 +-
apps/openmw/mwmechanics/npcstats.cpp | 5 +-
apps/openmw/mwmechanics/objects.cpp | 81 +
apps/openmw/mwmechanics/objects.hpp | 45 +
apps/openmw/mwmechanics/pathfinding.cpp | 231 +
apps/openmw/mwmechanics/pathfinding.hpp | 31 +
apps/openmw/mwmechanics/security.cpp | 109 +
apps/openmw/mwmechanics/security.hpp | 27 +
apps/openmw/mwmechanics/spells.cpp | 4 +-
apps/openmw/mwrender/activatoranimation.cpp | 26 +-
apps/openmw/mwrender/actors.cpp | 4 +
apps/openmw/mwrender/animation.cpp | 780 +-
apps/openmw/mwrender/animation.hpp | 188 +-
apps/openmw/mwrender/camera.cpp | 341 +
apps/openmw/mwrender/camera.hpp | 112 +
apps/openmw/mwrender/characterpreview.cpp | 103 +-
apps/openmw/mwrender/characterpreview.hpp | 3 +-
apps/openmw/mwrender/creatureanimation.cpp | 24 +-
apps/openmw/mwrender/debugging.cpp | 1 -
apps/openmw/mwrender/debugging.hpp | 2 -
apps/openmw/mwrender/localmap.cpp | 6 +-
apps/openmw/mwrender/npcanimation.cpp | 460 +-
apps/openmw/mwrender/npcanimation.hpp | 23 +-
apps/openmw/mwrender/objects.cpp | 33 +-
apps/openmw/mwrender/occlusionquery.cpp | 63 +-
apps/openmw/mwrender/occlusionquery.hpp | 6 +-
apps/openmw/mwrender/player.cpp | 372 -
apps/openmw/mwrender/player.hpp | 118 -
apps/openmw/mwrender/renderingmanager.cpp | 248 +-
apps/openmw/mwrender/renderingmanager.hpp | 75 +-
apps/openmw/mwrender/shadows.cpp | 5 +-
apps/openmw/mwrender/sky.cpp | 98 +-
apps/openmw/mwrender/sky.hpp | 20 +-
apps/openmw/mwrender/terrain.cpp | 11 +
apps/openmw/mwrender/terrain.hpp | 3 +
apps/openmw/mwrender/terrainmaterial.cpp | 169 +-
apps/openmw/mwrender/terrainmaterial.hpp | 3 +
apps/openmw/mwrender/videoplayer.cpp | 25 +-
apps/openmw/mwrender/water.cpp | 4 -
apps/openmw/mwrender/water.hpp | 4 +-
apps/openmw/mwscript/aiextensions.cpp | 19 +-
apps/openmw/mwscript/containerextensions.cpp | 18 +-
apps/openmw/mwscript/controlextensions.cpp | 1 +
apps/openmw/mwscript/docs/vmformat.txt | 22 +-
apps/openmw/mwscript/globalscripts.cpp | 10 +-
apps/openmw/mwscript/globalscripts.hpp | 2 +
apps/openmw/mwscript/interpretercontext.cpp | 22 +-
apps/openmw/mwscript/locals.cpp | 13 +-
apps/openmw/mwscript/locals.hpp | 10 +-
apps/openmw/mwscript/miscextensions.cpp | 75 +-
apps/openmw/mwscript/scriptmanagerimp.cpp | 6 +
apps/openmw/mwscript/scriptmanagerimp.hpp | 2 +
apps/openmw/mwscript/statsextensions.cpp | 14 +-
apps/openmw/mwscript/transformationextensions.cpp | 236 +-
apps/openmw/mwsound/ffmpeg_decoder.hpp | 12 +-
apps/openmw/mwsound/openal_output.cpp | 10 +-
apps/openmw/mwsound/soundmanagerimp.cpp | 19 +-
apps/openmw/mwworld/actiondoor.cpp | 16 +
apps/openmw/mwworld/actiondoor.hpp | 18 +
apps/openmw/mwworld/actionequip.cpp | 91 +-
apps/openmw/mwworld/cellfunctors.hpp | 6 +-
apps/openmw/mwworld/cells.cpp | 33 +-
apps/openmw/mwworld/cells.hpp | 2 +
apps/openmw/mwworld/cellstore.hpp | 38 +-
apps/openmw/mwworld/class.cpp | 33 +-
apps/openmw/mwworld/class.hpp | 20 +-
apps/openmw/mwworld/containerstore.cpp | 85 +-
apps/openmw/mwworld/containerstore.hpp | 8 +-
apps/openmw/mwworld/esmstore.cpp | 9 -
apps/openmw/mwworld/esmstore.hpp | 36 +
apps/openmw/mwworld/globals.cpp | 9 -
apps/openmw/mwworld/inventorystore.cpp | 19 +-
apps/openmw/mwworld/inventorystore.hpp | 4 +-
apps/openmw/mwworld/livecellref.hpp | 45 +
apps/openmw/mwworld/physicssystem.cpp | 108 +-
apps/openmw/mwworld/physicssystem.hpp | 10 +-
apps/openmw/mwworld/player.cpp | 102 +-
apps/openmw/mwworld/player.hpp | 44 +-
apps/openmw/mwworld/ptr.hpp | 2 +-
apps/openmw/mwworld/refdata.cpp | 21 +-
apps/openmw/mwworld/refdata.hpp | 10 +-
apps/openmw/mwworld/scene.cpp | 73 +-
apps/openmw/mwworld/scene.hpp | 5 +-
apps/openmw/mwworld/store.cpp | 38 +-
apps/openmw/mwworld/store.hpp | 66 +-
apps/openmw/mwworld/weather.cpp | 671 +-
apps/openmw/mwworld/weather.hpp | 26 +-
apps/openmw/mwworld/worldimp.cpp | 426 +-
apps/openmw/mwworld/worldimp.hpp | 44 +-
cmake/FindOIS.cmake | 87 -
cmake/FindSDL2.cmake | 193 +
components/CMakeLists.txt | 6 +-
components/bsa/bsa_archive.cpp | 27 +-
components/compiler/fileparser.cpp | 13 +
components/compiler/lineparser.cpp | 8 +-
components/compiler/nullerrorhandler.cpp | 6 +
components/compiler/nullerrorhandler.hpp | 21 +
components/compiler/parser.cpp | 5 +
components/compiler/parser.hpp | 7 +
components/compiler/scanner.cpp | 37 +-
components/esm/aipackage.cpp | 6 +
components/esm/aipackage.hpp | 3 +
components/esm/cellref.hpp | 90 +
components/esm/esmreader.cpp | 5 +-
components/esm/esmreader.hpp | 7 +-
components/esm/loadacti.cpp | 7 +
components/esm/loadacti.hpp | 3 +
components/esm/loadalch.cpp | 12 +
components/esm/loadalch.hpp | 4 +
components/esm/loadappa.cpp | 12 +
components/esm/loadappa.hpp | 3 +
components/esm/loadarmo.cpp | 15 +
components/esm/loadarmo.hpp | 7 +-
components/esm/loadbody.cpp | 4 +-
components/esm/loadbody.hpp | 6 +-
components/esm/loadbook.cpp | 14 +
components/esm/loadbook.hpp | 3 +
components/esm/loadbsgn.cpp | 8 +
components/esm/loadbsgn.hpp | 3 +
components/esm/loadcell.cpp | 54 +-
components/esm/loadcell.hpp | 84 +-
components/esm/loadclas.cpp | 19 +
components/esm/loadclas.hpp | 6 +
components/esm/loadclot.cpp | 20 +-
components/esm/loadclot.hpp | 3 +
components/esm/loadcont.cpp | 9 +
components/esm/loadcont.hpp | 3 +
components/esm/loadcrea.cpp | 26 +
components/esm/loadcrea.hpp | 6 +
components/esm/loaddoor.cpp | 8 +
components/esm/loaddoor.hpp | 3 +
components/esm/loadfact.cpp | 42 +-
components/esm/loadfact.hpp | 13 +-
components/esm/loadingr.cpp | 18 +-
components/esm/loadingr.hpp | 3 +
components/esm/loadlevlist.cpp | 8 +-
components/esm/loadlevlist.hpp | 20 +-
components/esm/loadligh.cpp | 14 +
components/esm/loadligh.hpp | 3 +
components/esm/loadlock.cpp | 14 +-
components/esm/loadlock.hpp | 3 +
components/esm/loadmisc.cpp | 10 +
components/esm/loadmisc.hpp | 3 +
components/esm/loadnpc.cpp | 57 +-
components/esm/loadnpc.hpp | 21 +-
components/esm/loadprob.cpp | 13 +-
components/esm/loadprob.hpp | 3 +
components/esm/loadrace.cpp | 30 +
components/esm/loadrace.hpp | 16 +-
components/esm/loadregn.cpp | 19 +-
components/esm/loadregn.hpp | 3 +
components/esm/loadrepa.cpp | 12 +-
components/esm/loadrepa.hpp | 3 +
components/esm/loadscpt.cpp | 15 +-
components/esm/loadscpt.hpp | 5 +-
components/esm/loadskil.cpp | 15 +-
components/esm/loadsoun.cpp | 8 +
components/esm/loadsoun.hpp | 3 +
components/esm/loadspel.cpp | 10 +
components/esm/loadspel.hpp | 3 +
components/esm/loadstat.cpp | 4 +
components/esm/loadstat.hpp | 3 +
components/esm/loadweap.cpp | 20 +
components/esm/loadweap.hpp | 5 +-
components/fileorderlist/model/datafilesmodel.cpp | 3 +-
components/files/configurationmanager.hpp | 8 +-
components/interpreter/defines.cpp | 1 -
components/interpreter/runtime.cpp | 9 +-
components/misc/utf8stream.hpp | 116 +
components/nif/controlled.hpp | 23 +-
components/nif/controller.hpp | 121 +-
components/nif/data.hpp | 40 +-
components/nif/niffile.cpp | 63 +-
components/nif/niffile.hpp | 14 +-
components/nif/nifstream.hpp | 6 +
components/nif/node.hpp | 26 +-
components/nif/property.hpp | 33 +-
components/nif/record.hpp | 4 +
components/nif/recordptr.hpp | 1 +
components/nifbullet/bulletnifloader.cpp | 21 +-
components/nifogre/material.cpp | 394 +
components/nifogre/material.hpp | 57 +
components/nifogre/mesh.cpp | 387 +
components/nifogre/mesh.hpp | 55 +
components/nifogre/ogrenifloader.cpp | 1796 ++--
components/nifogre/ogrenifloader.hpp | 78 +-
components/nifogre/skeleton.cpp | 153 +
components/nifogre/skeleton.hpp | 62 +
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 | 9 +-
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/oics/tinyxml.cpp | 8 +-
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/CMakeLists.txt | 36 +-
extern/shiny/Docs/Configurations.dox | 2 +-
extern/shiny/Docs/Macros.dox | 23 +-
extern/shiny/Docs/Materials.dox | 7 +-
extern/shiny/Editor/Actions.cpp | 195 +
extern/shiny/Editor/Actions.hpp | 307 +
extern/shiny/Editor/AddPropertyDialog.cpp | 31 +
extern/shiny/Editor/AddPropertyDialog.h | 22 +
extern/shiny/Editor/AddPropertyDialog.hpp | 29 +
extern/shiny/Editor/CMakeLists.txt | 61 +
extern/shiny/Editor/ColoredTabWidget.hpp | 24 +
extern/shiny/Editor/Editor.cpp | 117 +
extern/shiny/Editor/Editor.hpp | 73 +
extern/shiny/Editor/MainWindow.cpp | 952 +++
extern/shiny/Editor/MainWindow.hpp | 139 +
extern/shiny/Editor/NewMaterialDialog.cpp | 14 +
extern/shiny/Editor/NewMaterialDialog.hpp | 22 +
extern/shiny/Editor/PropertySortModel.cpp | 35 +
extern/shiny/Editor/PropertySortModel.hpp | 21 +
extern/shiny/Editor/Query.cpp | 134 +
extern/shiny/Editor/Query.hpp | 121 +
extern/shiny/Editor/addpropertydialog.ui | 118 +
extern/shiny/Editor/mainwindow.ui | 420 +
extern/shiny/Editor/newmaterialdialog.ui | 98 +
extern/shiny/Main/Factory.cpp | 348 +-
extern/shiny/Main/Factory.hpp | 70 +-
extern/shiny/Main/Language.hpp | 1 +
extern/shiny/Main/MaterialInstance.cpp | 220 +-
extern/shiny/Main/MaterialInstance.hpp | 23 +-
extern/shiny/Main/MaterialInstancePass.cpp | 23 +-
extern/shiny/Main/MaterialInstancePass.hpp | 4 +-
extern/shiny/Main/MaterialInstanceTextureUnit.hpp | 1 +
extern/shiny/Main/Platform.cpp | 7 +-
extern/shiny/Main/Platform.hpp | 17 +-
extern/shiny/Main/PropertyBase.cpp | 48 +-
extern/shiny/Main/PropertyBase.hpp | 15 +-
extern/shiny/Main/ScriptLoader.cpp | 23 +-
extern/shiny/Main/ShaderInstance.cpp | 20 +-
extern/shiny/Main/ShaderSet.cpp | 24 +
extern/shiny/Main/ShaderSet.hpp | 5 +
extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp | 3 +-
extern/shiny/Platforms/Ogre/OgreMaterial.cpp | 18 +-
extern/shiny/Platforms/Ogre/OgreMaterial.hpp | 4 +
.../Platforms/Ogre/OgreMaterialSerializer.cpp | 9 +
extern/shiny/Platforms/Ogre/OgrePass.cpp | 16 +-
extern/shiny/Platforms/Ogre/OgrePass.hpp | 2 +-
extern/shiny/Platforms/Ogre/OgrePlatform.cpp | 11 +-
extern/shiny/Platforms/Ogre/OgrePlatform.hpp | 2 +
.../shiny/Platforms/Ogre/OgreTextureUnitState.cpp | 3 +-
.../shiny/Platforms/Ogre/OgreTextureUnitState.hpp | 2 +-
extern/shiny/Preprocessor/aq.cpp | 236 -
extern/shiny/Preprocessor/cpp_re.cpp | 442 -
extern/shiny/Preprocessor/cpp_re.inc | 9044 --------------------
.../Preprocessor/instantiate_cpp_exprgrammar.cpp | 52 -
.../shiny/Preprocessor/instantiate_cpp_grammar.cpp | 56 -
.../Preprocessor/instantiate_cpp_literalgrs.cpp | 56 -
.../Preprocessor/instantiate_defined_grammar.cpp | 52 -
.../Preprocessor/instantiate_predef_macros.cpp | 52 -
.../shiny/Preprocessor/instantiate_re2c_lexer.cpp | 65 -
.../Preprocessor/instantiate_re2c_lexer_str.cpp | 64 -
extern/shiny/Preprocessor/token_ids.cpp | 447 -
files/CMakeLists.txt | 3 +
files/materials/atmosphere.shader | 15 +-
files/materials/clouds.shader | 17 +-
files/materials/core.h | 11 +-
files/materials/moon.shader | 18 +-
files/materials/mygui.mat | 25 +
files/materials/mygui.shader | 45 +
files/materials/mygui.shaderset | 15 +
files/materials/objects.mat | 41 +-
files/materials/objects.shader | 182 +-
files/materials/shadowcaster.shader | 3 +-
files/materials/sky.mat | 35 +-
files/materials/stars.shader | 17 +-
files/materials/sun.shader | 18 +-
files/materials/terrain.shader | 32 +-
files/mygui/CMakeLists.txt | 1 +
files/mygui/core.skin | 1 -
files/mygui/openmw_alchemy_window.layout | 6 +-
files/mygui/openmw_book.layout | 26 +-
files/mygui/openmw_companion_window.layout | 6 +-
files/mygui/openmw_container_window.layout | 6 +-
files/mygui/openmw_dialogue_window.layout | 15 +-
files/mygui/openmw_enchanting_dialog.layout | 4 +-
files/mygui/openmw_font.xml | 36 +-
files/mygui/openmw_hud.layout | 14 +-
files/mygui/openmw_inventory_window.layout | 6 +-
files/mygui/openmw_itemselection_dialog.layout | 6 +-
files/mygui/openmw_journal.layout | 112 +-
files/mygui/openmw_journal_skin.xml | 4 +-
files/mygui/openmw_layers.xml | 2 +-
files/mygui/openmw_list.skin.xml | 9 +
files/mygui/openmw_scroll.layout | 2 +-
files/mygui/openmw_settings.xml | 2 +-
files/mygui/openmw_settings_window.layout | 46 +-
files/mygui/openmw_trade_window.layout | 6 +-
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/datafilespage.ui | 12 +-
files/ui/graphicspage.ui | 10 +
files/ui/playpage.ui | 19 +-
libs/openengine/bullet/physic.cpp | 153 +-
libs/openengine/bullet/physic.hpp | 17 +-
libs/openengine/bullet/trace.cpp | 10 +-
libs/openengine/bullet/trace.h | 2 +-
libs/openengine/gui/manager.cpp | 565 +-
libs/openengine/gui/manager.hpp | 3 +-
libs/openengine/ogre/fader.cpp | 12 +-
libs/openengine/ogre/fader.hpp | 4 +
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/particles.cpp | 693 ++
libs/openengine/ogre/particles.hpp | 41 +
libs/openengine/ogre/renderer.cpp | 191 +-
libs/openengine/ogre/renderer.hpp | 25 +-
readme.txt | 114 +-
699 files changed, 61563 insertions(+), 25669 deletions(-)

Upstream: github.com

  • Share