mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-26 06:40:22 +00:00
Code Issues Projects Releases Wiki Activity
OpenMW/apps/openmw/mwgui
History
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
2015-05-04 02:41:50 +02:00
..
alchemywindow.cpp
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
alchemywindow.hpp
Reduce includes
2015-01-10 01:00:52 +01:00
backgroundimage.cpp
fixing MSVC 2013 warning C4244: & C4305
2015-03-08 13:07:29 +13:00
backgroundimage.hpp
Add option to stretch menu backgrounds/cutscenes to the whole screen
2015-01-28 00:22:56 +01:00
birth.cpp
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +02:00
birth.hpp
Reduce includes in MWGui
2015-01-10 03:56:06 +01:00
bookpage.cpp
fixing MSVC 2013 warning C4244: & C4305
2015-03-08 13:22:56 +13:00
bookpage.hpp
fixing MSVC 2013 warning C4244: & C4305
2015-03-08 13:07:29 +13:00
bookwindow.cpp
Book/scroll window refactoring
2015-03-11 20:33:55 +01:00
bookwindow.hpp
Book/scroll window refactoring
2015-03-11 20:33:55 +01:00
charactercreation.cpp
CharacterCreation refactoring
2015-03-12 00:43:28 +01:00
charactercreation.hpp
CharacterCreation refactoring
2015-03-12 00:43:28 +01:00
class.cpp
Reduce MyGUI includes
2015-01-10 02:50:43 +01: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
fixing MSVC 2013 warning C4244: & C4305
2015-03-08 13:07:29 +13:00
companionwindow.hpp
Reset item model when reference is reset (Fixes #1628)
2014-07-12 18:53:22 +02:00
confirmationdialog.cpp
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
confirmationdialog.hpp
Add missing confirmation dialog for deleting map notes
2014-09-07 18:55:59 +02:00
console.cpp
Don't put duplicate lines in the console history
2015-01-27 23:12:20 +01:00
console.hpp
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
container.cpp
Change stolen items handling to match MW (Fixes #1443, Fixes #2290)
2015-02-05 04:18:43 +01:00
container.hpp
Reduce includes, move DragAndDrop to separate file
2015-01-10 01:21:17 +01: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
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
countdialog.hpp
Add NumericEditBox widget
2014-09-25 21:04:51 +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
WindowManager refactoring
2015-03-11 20:04:25 +01:00
dialogue.hpp
Reduce includes in MWGui
2015-01-10 03:56:06 +01:00
draganddrop.cpp
Reduce MyGUI includes
2015-01-10 02:50:43 +01: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
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +02:00
formatting.hpp
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
hud.cpp
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-05-04 02:41:50 +02:00
hud.hpp
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
2015-05-02 17:48:24 +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
Silence error message
2015-05-04 00:34:30 +02:00
inventorywindow.hpp
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
itemmodel.cpp
Include cleanup
2015-02-05 04:18:42 +01:00
itemmodel.hpp
Stolen item tracking overhaul part 2 (Fixes #2338)
2015-02-06 01:27:16 +01:00
itemselection.cpp
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
itemselection.hpp
Reduce includes, move DragAndDrop to separate file
2015-01-10 01:21:17 +01:00
itemview.cpp
fixing MSVC 2013 warning C4244: & C4305
2015-03-08 13:07:29 +13:00
itemview.hpp
Get rid of unneeded setSize/setCoord overrides
2015-01-29 03:38:59 +01:00
itemwidget.cpp
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +02:00
itemwidget.hpp
Move item count text to ItemWidget
2014-09-19 09:29:00 +02:00
jailscreen.cpp
Move rng to components
2015-04-22 17:58:55 +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
Change all skins to get font colors from fallback settings (Fixes #704)
2014-09-20 10:40:09 +02:00
journalbooks.hpp
Rewrite journal GUI topic list to use MWList
2014-06-03 16:04:18 +02:00
journalviewmodel.cpp
Grey out completed quests in journal quests list
2015-02-13 16:51:34 +01: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
Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen
2015-05-03 18:16:54 +02:00
loadingscreen.hpp
Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen
2015-05-03 18:16:54 +02:00
mainmenu.cpp
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-05-04 02:41:50 +02:00
mainmenu.hpp
Main menu background videos
2015-05-02 18:15:00 +02:00
mapwindow.cpp
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
mapwindow.hpp
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
merchantrepair.cpp
fixing MSVC 2013 warning C4244: & C4305
2015-03-08 13:07:29 +13:00
merchantrepair.hpp
Reduce includes in MWGui
2015-01-10 03:56:06 +01:00
messagebox.cpp
fixing MSVC 2013 warning C4244: & C4305
2015-03-08 13:07:29 +13:00
messagebox.hpp
Move OEngine::Gui::Layout to MWGui
2015-05-01 02:22:51 +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
Move rng to components
2015-04-22 17:58:55 +02:00
pickpocketitemmodel.hpp
Open inventory when activating an unconscious actor (Fixes #1848)
2014-08-26 03:06:23 +02:00
quickkeysmenu.cpp
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +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
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
race.hpp
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
recharge.cpp
Move rng to components
2015-04-22 17:58:55 +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
fixing MSVC 2013 warning C4244: & C4305
2015-03-08 17:42:07 +13:00
repair.hpp
Refactor item icon code into ItemWidget (Fixes #1391)
2014-06-05 22:13:18 +02:00
review.cpp
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-03-27 17:30:48 +01:00
review.hpp
Reduce includes in MWGui
2015-01-10 03:56:06 +01:00
savegamedialog.cpp
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
savegamedialog.hpp
fixed warning C4099:
2015-03-06 21:36:42 +13: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
Book/scroll window refactoring
2015-03-11 20:33:55 +01:00
scrollwindow.hpp
Book/scroll window refactoring
2015-03-11 20:33:55 +01:00
settingswindow.cpp
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
2015-05-02 17:48:24 +02:00
settingswindow.hpp
Merge remote-tracking branch 'upstream/master'
2015-02-27 22:21:02 +01:00
sortfilteritemmodel.cpp
SpellModel, SortFilterItemModel: case insensitive sorting
2014-12-24 15:45:15 +01: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
fixing MSVC 2013 warning C4244: & C4305
2015-03-08 13:07:29 +13:00
spellbuyingwindow.hpp
Esc button exits all non-modal GUI windows
2014-05-26 23:13:37 -04:00
spellcreationdialog.cpp
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +02:00
spellcreationdialog.hpp
Reduce includes in MWGui
2015-01-10 03:56:06 +01:00
spellicons.cpp
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +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
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
spellview.hpp
Made LineInfo a struct, as requested by Scrawl.
2015-04-05 14:56:29 +12:00
spellwindow.cpp
provide incremental update of SpellWindow (Fixes #2411)
2015-04-03 17:59:13 +13: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
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-05-04 02:41:50 +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-05-04 02:41:50 +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
Add travel service support for creatures (Fixes #2432)
2015-03-09 03:15:11 +01:00
travelwindow.hpp
Reduce includes
2015-01-10 01:00:52 +01:00
videowidget.cpp
Port VideoWidget
2015-05-01 03:03:44 +02:00
videowidget.hpp
Port VideoWidget
2015-05-01 03:03:44 +02:00
waitdialog.cpp
Move rng to components
2015-04-22 17:58:55 +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
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +02:00
widgets.hpp
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
windowbase.cpp
Include cleanup
2015-02-05 04:18:42 +01:00
windowbase.hpp
Move OEngine::Gui::Layout to MWGui
2015-05-01 02:22:51 +02:00
windowmanagerimp.cpp
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-05-04 02:41:50 +02:00
windowmanagerimp.hpp
Create manual GUI textures
2015-05-02 18:06:54 +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