1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
openmw-tes3mp/apps/openmw/mwgui
Marc Zinnschlag 510674aa5e Merge branch 'master' into alchemy
Conflicts:
	components/esm/loadmgef.hpp
2012-10-18 14:37:05 +02:00
..
alchemywindow.cpp Issue #61: replaced 4 ingredient member variables with vector in alchemy GUI 2012-10-02 10:29:47 +02:00
alchemywindow.hpp Issue #61: replaced 4 ingredient member variables with vector in alchemy GUI 2012-10-02 10:29:47 +02:00
birth.cpp resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
birth.hpp fixed some "using namespace" in headers 2012-09-10 09:10:50 +02:00
bookwindow.cpp resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
bookwindow.hpp Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
charactercreation.cpp resolving conflicts 2012-09-21 13:13:11 +04:00
charactercreation.hpp finished? 2012-09-15 17:12:42 +02:00
class.cpp Merge branch 'master' into spellcreation 2012-10-01 17:54:45 +02:00
class.hpp change the select attribute/skill dialogs to be reusable 2012-09-24 22:09:38 +02:00
confirmationdialog.cpp replaced everything with the new method 2012-09-10 13:39:22 +02:00
confirmationdialog.hpp some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
console.cpp resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
console.hpp Issue #352: added --script-run switch 2012-07-30 12:37:46 +02:00
container.cpp initial resolving 2012-10-01 00:23:49 +04:00
container.hpp Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
countdialog.cpp Task #400 Review GMST access 2012-09-22 21:35:57 +02:00
countdialog.hpp some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
cursorreplace.cpp - added a simple main menu (with Return, Options and Exit buttons) 2012-08-10 15:15:48 +02:00
cursorreplace.hpp use the cursors from morrowind.bsa and remove mwpointer.png 2012-04-12 14:26:21 +02:00
dialogue.cpp remove a cout 2012-10-17 18:21:24 +02:00
dialogue.hpp Merge branch 'Travel_Dialogue' into training_travel 2012-10-17 18:17:53 +02:00
dialogue_history.cpp fixed some "using namespace" in headers 2012-09-10 09:10:50 +02:00
dialogue_history.hpp fixed some "using namespace" in headers 2012-09-10 09:10:50 +02:00
enchantingdialog.cpp abstracted code and use it in enchanting window as well 2012-10-03 15:36:10 +02:00
enchantingdialog.hpp abstracted code and use it in enchanting window as well 2012-10-03 15:36:10 +02:00
formatting.cpp removed unnecessary include 2012-05-10 12:44:01 +02:00
formatting.hpp removed another include 2012-05-10 12:51:40 +02:00
hud.cpp resolving conflicts 2012-09-21 13:13:11 +04:00
hud.hpp finished? 2012-09-15 17:12:42 +02:00
inventorywindow.cpp resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
inventorywindow.hpp Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview 2012-09-15 00:57:29 +02:00
itemselection.cpp replaced everything with the new method 2012-09-10 13:39:22 +02:00
itemselection.hpp some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
journalwindow.cpp Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
journalwindow.hpp fix an infinite recursion regression on several dialogs. 2012-08-27 21:29:04 +02:00
levelupdialog.cpp resolving conflicts 2012-09-21 13:13:11 +04:00
levelupdialog.hpp finished? 2012-09-15 17:12:42 +02:00
list.cpp edit effect dialog 2012-09-24 08:09:16 +02:00
list.hpp edit effect dialog 2012-09-24 08:09:16 +02:00
loadingscreen.cpp fading, greying out destinations you cant afford, warning fix 2012-10-16 20:25:50 +02:00
loadingscreen.hpp fixed the disappearing 2012-09-13 12:33:09 +02:00
mainmenu.cpp Merge remote branch 'scrawl/master' 2012-08-12 18:11:36 +02:00
mainmenu.hpp fix main menu placement after resolution changes 2012-08-11 17:26:01 +02:00
map_window.cpp small map fix 2012-09-26 23:34:35 +02:00
map_window.hpp fix the global map updating when pinned 2012-09-25 21:57:57 +02:00
messagebox.cpp Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
messagebox.hpp Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
mode.hpp Merge branch 'Travel_Dialogue' into training_travel 2012-10-17 18:17:53 +02:00
quickkeysmenu.cpp resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
quickkeysmenu.hpp fix screenshot function 2012-08-27 15:51:01 +02:00
race.cpp initial resolving 2012-10-01 00:23:49 +04:00
race.hpp fix the race selection escape crash 2012-09-25 21:49:34 +02:00
referenceinterface.cpp Fixed some windows issues and got rid of a few tiny warnings while at it. 2012-07-07 01:14:18 +02:00
referenceinterface.hpp Fixed some windows issues and got rid of a few tiny warnings while at it. 2012-07-07 01:14:18 +02:00
review.cpp resolving conflicts 2012-09-21 13:13:11 +04:00
review.hpp finished? 2012-09-15 17:12:42 +02:00
scrollwindow.cpp resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
scrollwindow.hpp Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
settingswindow.cpp gamma slider 2012-09-19 23:47:42 +02:00
settingswindow.hpp gamma slider 2012-09-19 23:47:42 +02:00
spellbuyingwindow.cpp Merge branch 'Travel_Dialogue' into training_travel 2012-10-17 18:17:53 +02:00
spellbuyingwindow.hpp and go 2012-09-23 00:36:20 +02:00
spellcreationdialog.cpp last bits of the gui 2012-10-11 18:26:29 +02:00
spellcreationdialog.hpp last bits of the gui 2012-10-11 18:26:29 +02:00
spellwindow.cpp resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
spellwindow.hpp Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
stats_window.cpp initial resolving 2012-10-01 00:23:49 +04:00
stats_window.hpp finished? 2012-09-15 17:12:42 +02:00
text_input.cpp fix character preview destruction; don't allow empty names in name dialog 2012-09-18 19:00:20 +02:00
text_input.hpp fixed some "using namespace" in headers 2012-09-10 09:10:50 +02:00
tooltips.cpp added magic effect flags from Research wiki page 2012-10-01 23:33:07 +02:00
tooltips.hpp and go 2012-09-23 00:36:20 +02:00
tradewindow.cpp Travel GUI 2012-10-06 17:52:46 +02:00
tradewindow.hpp Travel GUI 2012-10-06 17:52:46 +02:00
trainingwindow.cpp fix training limit 2012-10-17 18:48:29 +02:00
trainingwindow.hpp training window 2012-10-17 18:03:02 +02:00
travelwindow.cpp Merge branch 'Travel_Dialogue' into training_travel 2012-10-17 18:17:53 +02:00
travelwindow.hpp traveling. 2012-10-08 11:14:22 +02:00
waitdialog.cpp WakeUpPc instruction 2012-09-29 09:41:34 +02:00
waitdialog.hpp WakeUpPc instruction 2012-09-29 09:41:34 +02:00
widgets.cpp last bits of the gui 2012-10-11 18:26:29 +02:00
widgets.hpp last bits of the gui 2012-10-11 18:26:29 +02:00
window_base.cpp some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
window_base.hpp some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
window_pinnable_base.cpp Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
window_pinnable_base.hpp Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
windowmanagerimp.cpp Merge branch 'Travel_Dialogue' into training_travel 2012-10-17 18:17:53 +02:00
windowmanagerimp.hpp Merge branch 'Travel_Dialogue' into training_travel 2012-10-17 18:17:53 +02:00