1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-12-12 18:53:08 +00:00
openmw-tes3mp/apps/openmw/mwgui
gugus 4f5c4bf89a Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwgui/dialogue.hpp
	apps/openmw/mwgui/mode.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
2012-09-28 17:09:15 +02:00
..
alchemywindow.cpp
alchemywindow.hpp
birth.cpp
birth.hpp
bookwindow.cpp
bookwindow.hpp
charactercreation.cpp
charactercreation.hpp
class.cpp change the select attribute/skill dialogs to be reusable 2012-09-24 22:09:38 +02:00
class.hpp change the select attribute/skill dialogs to be reusable 2012-09-24 22:09:38 +02:00
confirmationdialog.cpp
confirmationdialog.hpp
console.cpp
console.hpp
container.cpp fixing some unrelated warnings 2012-09-23 19:36:37 +02:00
container.hpp
countdialog.cpp Task #400 Review GMST access 2012-09-22 21:35:57 +02:00
countdialog.hpp
cursorreplace.cpp
cursorreplace.hpp
dialogue.cpp Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue 2012-09-28 17:09:15 +02:00
dialogue.hpp Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue 2012-09-28 17:09:15 +02:00
dialogue_history.cpp
dialogue_history.hpp
enchantingdialog.cpp Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation 2012-09-27 08:47:47 +02:00
enchantingdialog.hpp Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation 2012-09-27 08:47:47 +02:00
formatting.cpp
formatting.hpp
hud.cpp
hud.hpp
inventorywindow.cpp
inventorywindow.hpp
itemselection.cpp
itemselection.hpp
journalwindow.cpp
journalwindow.hpp
levelupdialog.cpp everything done except health/mana restore 2012-09-19 02:53:06 +02:00
levelupdialog.hpp
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 don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore. 2012-09-21 15:24:26 +02:00
loadingscreen.hpp
mainmenu.cpp
mainmenu.hpp
map_window.cpp fix the global map updating when pinned 2012-09-25 21:57:57 +02:00
map_window.hpp fix the global map updating when pinned 2012-09-25 21:57:57 +02:00
messagebox.cpp
messagebox.hpp
mode.hpp Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue 2012-09-28 17:09:15 +02:00
quickkeysmenu.cpp
quickkeysmenu.hpp
race.cpp fix the race selection escape crash 2012-09-25 21:49:34 +02:00
race.hpp fix the race selection escape crash 2012-09-25 21:49:34 +02:00
referenceinterface.cpp
referenceinterface.hpp
review.cpp
review.hpp
scrollwindow.cpp
scrollwindow.hpp
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 'next' of https://github.com/zinnschlag/openmw into spellcreation 2012-09-27 08:47:47 +02:00
spellbuyingwindow.hpp and go 2012-09-23 00:36:20 +02:00
spellcreationdialog.cpp change the select attribute/skill dialogs to be reusable 2012-09-24 22:09:38 +02:00
spellcreationdialog.hpp change the select attribute/skill dialogs to be reusable 2012-09-24 22:09:38 +02:00
spellwindow.cpp
spellwindow.hpp
stats_window.cpp fixing some unrelated warnings 2012-09-23 19:36:37 +02:00
stats_window.hpp
text_input.cpp
text_input.hpp
tooltips.cpp Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation 2012-09-27 08:47:47 +02:00
tooltips.hpp and go 2012-09-23 00:36:20 +02:00
tradewindow.cpp correction1 2012-09-28 17:02:27 +02:00
tradewindow.hpp correction1 2012-09-28 17:02:27 +02:00
travelwindow.cpp correction1 2012-09-28 17:02:27 +02:00
travelwindow.hpp TravelGUI, not completly finished. 2012-09-26 18:30:47 +02:00
waitdialog.cpp sleeping restoration of health, magicka, and fatigue 2012-09-21 17:53:16 +02:00
waitdialog.hpp implemented GetPCSleep 2012-09-19 03:11:23 +02:00
widgets.cpp everything done except health/mana restore 2012-09-19 02:53:06 +02:00
widgets.hpp change the select attribute/skill dialogs to be reusable 2012-09-24 22:09:38 +02:00
window_base.cpp
window_base.hpp
window_pinnable_base.cpp
window_pinnable_base.hpp
windowmanagerimp.cpp Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue 2012-09-28 17:09:15 +02:00
windowmanagerimp.hpp Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue 2012-09-28 17:09:15 +02:00