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

Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp

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

..

CMakeLists.txt

Remove unused mygui files

2015-05-03 17:26:12 +02:00

core_layouteditor.xml

Fix outdated core_layouteditor.xml

2014-10-15 22:48:15 +02:00

core.skin

Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them

2014-09-25 16:41:27 +02:00

core.xml

Fix outdated core_layouteditor.xml

2014-10-15 22:48:15 +02:00

DejaVuLGCSansMono.ttf

Console font change to provide possibility to show cyrillic symbols

2013-01-15 02:22:14 +04:00

openmw_alchemy_window.layout

Refactor item icon code into ItemWidget (Fixes #1391)

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

openmw_book.layout

Adjusted book layout to better match vanilla

2014-10-26 01:54:25 +02:00

openmw_box.skin.xml

Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them

2014-09-25 16:41:27 +02:00

openmw_button.skin.xml

Fix button graphics preventing mouse clicks (Fixes #2104)

2014-11-07 00:16:41 +01:00

openmw_chargen_birth.layout

German fixes

2013-11-16 23:15:51 +01:00

openmw_chargen_class_description.layout

Various chargen tweaks

2013-08-29 16:21:11 +02:00

openmw_chargen_class.layout

German fixes

2013-11-16 23:15:51 +01:00

openmw_chargen_create_class.layout

Fixes #1982: Long class names are cut off in the UI

2014-10-12 15:18:37 +02:00

openmw_chargen_generate_class_result.layout

Fix layout problems in generate class result dialog

2014-09-20 13:07:38 +02:00

openmw_chargen_race.layout

Chargen updates

2013-08-25 23:15:29 +02:00

openmw_chargen_review.layout

German fixes

2013-11-16 23:15:51 +01:00

openmw_chargen_select_attribute.layout

Minor cleanup

2014-09-24 23:50:28 +02:00

openmw_chargen_select_skill.layout

Minor cleanup

2014-09-24 23:50:28 +02:00

openmw_chargen_select_specialization.layout

Minor cleanup

2014-09-24 23:50:28 +02:00

openmw_companion_window.layout

Varios standardizations, fixes and optimizations

2013-08-09 23:21:25 +02:00

openmw_confirmation_dialog.layout

Change all skins to get font colors from fallback settings (Fixes #704)

2014-09-20 10:40:09 +02:00

openmw_console.layout

Implement cell loading threshold (Fixes #1874)

2014-10-02 16:50:10 +02:00

openmw_console.skin.xml

Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them

2014-09-25 16:41:27 +02:00

openmw_container_window.layout

Implement pickpocket detection. Play a voiced dialogue entry when detected.

2014-01-07 03:01:33 +01:00

openmw_count_window.layout

Tweak CountDialog layout

2014-09-25 21:04:59 +02:00

openmw_debug_window.layout

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

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

openmw_debug_window.skin.xml

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

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

openmw_dialogue_window.layout

Dialogue window text area tweak

2015-01-27 23:12:20 +01:00

openmw_dialogue_window.skin.xml

Rename some skin files to .skin.xml for consistency

2014-09-28 18:11:19 +02:00

openmw_edit_effect.layout

Add missing tooltips in edit effect dialog

2015-01-11 17:04:58 +01:00

openmw_edit_note.layout

Move Cancel buttons to right side of dialog (Fixes #1715)

2014-09-25 21:04:58 +02:00

openmw_edit.skin.xml

Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them

2014-09-25 16:41:27 +02:00

openmw_enchanting_dialog.layout

Layout tweaks

2015-02-03 15:25:36 +01:00

openmw_font.xml

Console improvements: Show scrollbar, allow copying text from the history

2014-01-04 05:13:53 +01:00

openmw_hud_box.skin.xml

Split window caption bars so that the caption can be transparent (Fixes #531)

2015-01-27 23:05:19 +01:00

openmw_hud_energybar.skin.xml

Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them

2014-09-25 16:41:27 +02:00

openmw_hud.layout

Remove advanced FPS counter (obsoleted by the OSG stats viewer)

2015-05-02 17:48:24 +02:00

openmw_infobox.layout

Standardize align values

2013-08-07 21:43:19 +02:00

openmw_interactive_messagebox.layout

Add warning when loading a savegame that depends on non-existing content files (Fixes #2261)

2015-01-11 00:06:52 +01:00

openmw_inventory_window.layout

Fixes #1158 (Armor rating label issues)

2014-02-05 05:18:10 +01:00

openmw_itemselection_dialog.layout

Increase size of item selection dialog

2013-11-26 06:42:37 +01:00

openmw_jail_screen.layout

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

openmw_journal.layout

Rewrite journal GUI topic list to use MWList

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

openmw_journal.skin.xml

Grey out completed quests in journal quests list

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

openmw_layers.xml

Add warning when loading a savegame that depends on non-existing content files (Fixes #2261)

2015-01-11 00:06:52 +01:00

openmw_levelup_dialog.layout

UI consistency fix in levelup dialog

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

openmw_list.skin.xml

Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu

2014-12-15 13:28:03 +01:00

openmw_loading_screen.layout

Loading screen align fix

2015-02-28 17:43:15 +01:00

openmw_magicselection_dialog.layout

Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu

2014-12-15 13:28:03 +01:00

openmw_mainmenu.layout

Right aligned version/revision

2014-04-28 16:23:07 +02:00

openmw_mainmenu.skin.xml

Rename some skin files to .skin.xml for consistency

2014-09-28 18:11:19 +02:00

openmw_map_window.layout

Make local map widget size configurable

2014-12-24 15:45:14 +01:00

openmw_map_window.skin.xml

Rename some skin files to .skin.xml for consistency

2014-09-28 18:11:19 +02:00

openmw_merchantrepair.layout

Layout tweaks

2015-02-03 15:25:36 +01:00

openmw_messagebox.layout

Adjust border skin for loading bar and message boxes to match vanilla MW

2014-10-02 00:27:03 +02:00

openmw_persuasion_dialog.layout

Layout tweaks

2015-02-03 15:25:36 +01:00

openmw_pointer.xml

Various fixes

2013-08-25 23:15:20 +02:00

openmw_progress.skin.xml

Fix inconsistent health bar skin

2015-05-13 17:25:54 +02:00

openmw_quickkeys_menu_assign.layout

some unfinished work on quick keys window

2012-08-26 10:52:06 +02:00

openmw_quickkeys_menu.layout

Refactor item icon code into ItemWidget (Fixes #1391)

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

openmw_recharge_dialog.layout

Refactor item icon code into ItemWidget (Fixes #1391)

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

openmw_repair.layout

Refactor item icon code into ItemWidget (Fixes #1391)

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

openmw_resources.xml

Correct the icon used for custom map markers

2015-05-11 16:38:15 +02:00

openmw_savegame_dialog.layout

Move Cancel buttons to right side of dialog (Fixes #1715)

2014-09-25 21:04:58 +02:00

openmw_screen_fader.layout

Remove name extension for internal MyGUI textures

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

openmw_scroll.layout

Fix image buttons

2013-05-08 13:55:15 +02:00

openmw_scroll.skin.xml

Rename some skin files to .skin.xml for consistency

2014-09-28 18:11:19 +02:00

openmw_settings_window.layout

Apply texture filter setting changes

2015-05-14 21:42:04 +02:00

openmw_settings.xml

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

openmw_spell_buying_window.layout

Layout tweaks

2015-02-03 15:25:36 +01:00

openmw_spell_window.layout

Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu

2014-12-15 13:28:03 +01:00

openmw_spellcreation_dialog.layout

Layout tweaks

2015-02-03 15:25:36 +01:00

openmw_stats_window.layout

Fix canvas align in skill view

2015-02-22 20:56:47 +01:00

openmw_text_input.layout

Standardize align values

2013-08-07 21:43:19 +02:00

openmw_text.skin.xml

New look for fps counter

2015-03-01 23:58:16 +01:00

openmw_tooltips.layout

Tweak spacing on some tooltips

2014-09-20 11:02:44 +02:00

openmw_trade_window.layout

Layout tweaks

2015-02-03 15:25:36 +01:00

openmw_trainingwindow.layout

Layout tweaks

2015-02-03 15:25:36 +01:00

openmw_travel_window.layout

Layout tweaks

2015-02-03 15:25:36 +01:00

openmw_wait_dialog_progressbar.layout

everything done except health/mana restore

2012-09-19 02:53:06 +02:00

openmw_wait_dialog.layout

Fix wait dialog arrow button step (Fixes #1524)

2014-06-17 14:58:11 +02:00

openmw_windows.skin.xml

Remove name extension for internal MyGUI textures

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

OpenMWResourcePlugin.xml

Add properties for new widget classes to MyGUI plugin

2014-09-25 16:25:08 +02:00

skins.xml

Fix outdated core_layouteditor.xml

2014-10-15 22:48:15 +02:00