scrawl f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ...

Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt

2015-06-13 21:11:24 +02:00

..

alchemywindow.cpp

Scrollbars don't save their positions between openings

2015-06-04 23:09:40 +03:00

alchemywindow.hpp

Reduce includes

2015-01-10 01:00:52 +01:00

backgroundimage.cpp

Remove name extension for internal MyGUI textures

2015-05-15 23:21:29 +02:00

backgroundimage.hpp

Add option to stretch menu backgrounds/cutscenes to the whole screen

2015-01-28 00:22:56 +01:00

birth.cpp

Icon fix

2015-06-01 01:32:02 +02:00

birth.hpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

bookpage.cpp

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

bookpage.hpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

bookwindow.cpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

bookwindow.hpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

charactercreation.cpp

Port CharacterPreview

2015-05-20 02:18:20 +02:00

charactercreation.hpp

Port CharacterPreview

2015-05-20 02:18:20 +02:00

class.cpp

Remove useless #undef's for windows now that we have NOMINMAX flag

2015-06-12 04:39:44 +02:00

class.hpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

companionitemmodel.cpp

Remove NpcStats::mProfit and store it in the script instead

2015-01-31 22:40:40 +01:00

companionitemmodel.hpp

Remove NpcStats::mProfit and store it in the script instead

2015-01-31 22:40:40 +01:00

companionwindow.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

companionwindow.hpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

confirmationdialog.cpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

confirmationdialog.hpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

console.cpp

Correct the explanation for the Console::acceptCommand()

2015-06-05 22:57:35 +03:00

console.hpp

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

container.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

container.hpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

containeritemmodel.cpp

Revert "Transfer item ownership to the buyer if item wasn't stolen"

2014-09-28 12:18:46 +02:00

containeritemmodel.hpp

Fix item owner not resetting when dragging an item from a corpse to the player avatar

2014-05-15 09:54:10 +02:00

controllers.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

controllers.hpp

Reduce MyGUI includes

2015-01-10 02:50:43 +01:00

countdialog.cpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

countdialog.hpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

cursor.cpp

OpenMW compiles and runs w/o render window

2015-04-01 17:02:15 +02:00

cursor.hpp

Remove software cursor option, hw cursors seem to be working well enough

2013-11-20 06:20:16 +01:00

debugwindow.cpp

Reduce MyGUI includes

2015-01-10 02:50:43 +01:00

debugwindow.hpp

Add debug window (F10), displays Bullet's profiler output

2014-09-28 18:02:49 +02:00

dialogue.cpp

Reset the scrollbar position in the topic list when DialogueWindow is closed

2015-06-01 23:49:40 +03:00

dialogue.hpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

draganddrop.cpp

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

draganddrop.hpp

Reduce includes, move DragAndDrop to separate file

2015-01-10 01:21:17 +01:00

enchantingdialog.cpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

enchantingdialog.hpp

Fix dangling MWWorld::Ptrs in enchanting dialog after loading save game (Fixes #1722)

2014-07-29 15:32:22 +02:00

exposedwindow.cpp

Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)

2013-03-03 13:11:02 +01:00

exposedwindow.hpp

Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)

2013-03-03 13:11:02 +01:00

formatting.cpp

Icon fix

2015-06-01 01:32:02 +02:00

formatting.hpp

Reduce MyGUI includes

2015-01-10 02:50:43 +01:00

hud.cpp

Hide FPS widget since it currently doesn't work, use F3 instead

2015-06-07 19:38:59 +02:00

hud.hpp

Map rendering

2015-05-26 16:40:44 +02:00

inventoryitemmodel.cpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

inventoryitemmodel.hpp

Fix item owner not resetting when dragging an item from a corpse to the player avatar

2014-05-15 09:54:10 +02:00

inventorywindow.cpp

Fix -Wunused-private-field clang warnings

2015-06-04 20:42:05 +02:00

inventorywindow.hpp

Fix -Wunused-private-field clang warnings

2015-06-04 20:42:05 +02:00

itemmodel.cpp

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

itemmodel.hpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

itemselection.cpp

Scrollbars don't save their positions between openings

2015-06-04 23:09:40 +03:00

itemselection.hpp

Reduce includes, move DragAndDrop to separate file

2015-01-10 01:21:17 +01:00

itemview.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

itemview.hpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

itemwidget.cpp

Icon fix

2015-06-01 01:32:02 +02:00

itemwidget.hpp

Move item count text to ItemWidget

2014-09-19 09:29:00 +02:00

jailscreen.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-23 20:33:44 +02:00

jailscreen.hpp

Properly center jail progress widget, fix a bug with it not disappearing if the console is open

2015-02-07 18:38:41 +01:00

journalbooks.cpp

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

journalbooks.hpp

Rewrite journal GUI topic list to use MWList

2014-06-03 16:04:18 +02:00

journalviewmodel.cpp

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

journalviewmodel.hpp

Grey out completed quests in journal quests list

2015-02-13 16:51:34 +01:00

journalwindow.cpp

Grey out completed quests in journal quests list

2015-02-13 16:51:34 +01:00

journalwindow.hpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

layout.cpp

Move OEngine::Gui::Layout to MWGui

2015-05-01 02:22:51 +02:00

layout.hpp

Move OEngine::Gui::Layout to MWGui

2015-05-01 02:22:51 +02:00

levelupdialog.cpp

UI consistency fix in levelup dialog

2015-02-06 01:27:17 +01:00

levelupdialog.hpp

Do not attach coin widgets to a box

2014-09-03 03:03:03 +02:00

loadingscreen.cpp

Restore the "transparent" loading screen

2015-06-07 21:21:57 +02:00

loadingscreen.hpp

Restore the "transparent" loading screen

2015-06-07 21:21:57 +02:00

mainmenu.cpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

mainmenu.hpp

Main menu background videos

2015-05-02 18:15:00 +02:00

mapwindow.cpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

mapwindow.hpp

Restore display of global map overlay, no exploration yet

2015-05-28 18:49:24 +02:00

merchantrepair.cpp

Scrollbars don't save their positions between openings

2015-06-04 23:09:40 +03:00

merchantrepair.hpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

messagebox.cpp

Fix -Wunused-private-field clang warnings

2015-06-04 20:42:05 +02:00

messagebox.hpp

Fix -Wunused-private-field clang warnings

2015-06-04 20:42:05 +02:00

mode.hpp

Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714)

2015-02-07 04:05:28 +01:00

pickpocketitemmodel.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-23 20:33:44 +02:00

pickpocketitemmodel.hpp

Open inventory when activating an unconscious actor (Fixes #1848)

2014-08-26 03:06:23 +02:00

quickkeysmenu.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

quickkeysmenu.hpp

Allow binding Hand To Hand in quick keys menu (Fixes #2024)

2015-03-12 02:23:46 +01:00

race.cpp

Port CharacterPreview

2015-05-20 02:18:20 +02:00

race.hpp

Port CharacterPreview

2015-05-20 02:18:20 +02:00

recharge.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

recharge.hpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

referenceinterface.cpp

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

referenceinterface.hpp

Fix console reference label not resetting when loading save

2014-06-13 02:26:52 +02:00

repair.cpp

Scrollbars don't save their positions between openings

2015-06-04 23:09:40 +03:00

repair.hpp

Refactor item icon code into ItemWidget (Fixes #1391)

2014-06-05 22:13:18 +02:00

review.cpp

Remove useless #undef's for windows now that we have NOMINMAX flag

2015-06-12 04:39:44 +02:00

review.hpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

savegamedialog.cpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

savegamedialog.hpp

Restore savegame screenshot display

2015-05-28 02:34:38 +02:00

screenfader.cpp

Reduce MyGUI includes

2015-01-10 02:50:43 +01:00

screenfader.hpp

Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available

2014-10-11 23:09:20 +02:00

scrollwindow.cpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

scrollwindow.hpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

settingswindow.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

settingswindow.hpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

sortfilteritemmodel.cpp

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

sortfilteritemmodel.hpp

Implement weapon/spell cycling hotkeys (Fixes #1024)

2014-12-15 16:23:08 +01:00

soulgemdialog.cpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

soulgemdialog.hpp

Added soulgem dialog; made interactive message boxes not close the previous UI

2013-03-30 15:51:07 +01:00

spellbuyingwindow.cpp

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

spellbuyingwindow.hpp

Esc button exits all non-modal GUI windows

2014-05-26 23:13:37 -04:00

spellcreationdialog.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

spellcreationdialog.hpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

spellicons.cpp

Icon fix

2015-06-01 01:32:02 +02:00

spellicons.hpp

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

spellmodel.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

spellmodel.hpp

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

spellview.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

spellview.hpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

spellwindow.cpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

spellwindow.hpp

provide incremental update of SpellWindow (Fixes #2411)

2015-04-03 17:59:13 +13:00

statswindow.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

statswindow.hpp

Reduce includes in MWGui

2015-01-10 03:56:06 +01:00

textinput.cpp

Reduce MyGUI includes

2015-01-10 02:50:43 +01:00

textinput.hpp

Reduce MyGUI includes

2015-01-10 02:50:43 +01:00

timeadvancer.cpp

Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714)

2015-02-07 04:05:28 +01:00

timeadvancer.hpp

Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714)

2015-02-07 04:05:28 +01:00

tooltips.cpp

Icon fix

2015-06-01 01:32:02 +02:00

tooltips.hpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-04 02:41:50 +02:00

tradeitemmodel.cpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

tradeitemmodel.hpp

Revert "Transfer item ownership to the buyer if item wasn't stolen"

2014-09-28 12:18:46 +02:00

tradewindow.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-07 15:23:54 +02:00

tradewindow.hpp

Reduce MyGUI includes

2015-01-10 02:50:43 +01:00

trainingwindow.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

trainingwindow.hpp

Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714)

2015-02-07 04:05:28 +01:00

travelwindow.cpp

Remove last remains of Ogre

2015-06-03 23:04:35 +02:00

travelwindow.hpp

Reduce includes

2015-01-10 01:00:52 +01:00

videowidget.cpp

Catch exception for not found videos

2015-05-15 00:23:31 +02:00

videowidget.hpp

Port VideoWidget

2015-05-01 03:03:44 +02:00

waitdialog.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-23 20:33:44 +02:00

waitdialog.hpp

Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714)

2015-02-07 04:05:28 +01:00

widgets.cpp

Remove useless #undef's for windows now that we have NOMINMAX flag

2015-06-12 04:39:44 +02:00

widgets.hpp

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

windowbase.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-23 20:33:44 +02:00

windowbase.hpp

Move OEngine::Gui::Layout to MWGui

2015-05-01 02:22:51 +02:00

windowmanagerimp.cpp

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

windowmanagerimp.hpp

Port fog of war

2015-05-28 03:50:49 +02:00

windowpinnablebase.cpp

Use mouse pressed event for pin button instead of mouse click

2015-01-31 22:40:41 +01:00

windowpinnablebase.hpp

Use mouse pressed event for pin button instead of mouse click

2015-01-31 22:40:41 +01:00