Commit Graph

40 Commits (00a2de432ab6904e993eb7f86be2cb4848cb10d6)

Author SHA1 Message Date
scrawl c64eb96952 Merge branch 'Travel_Dialogue' into training_travel
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt
12 years ago
scrawl 1a2034b4dd training window 12 years ago
gugus 85d9357e3a Travel GUI 12 years ago
scrawl ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
Conflicts:
	apps/openmw/mwgui/dialogue.cpp
12 years ago
scrawl d393f551ed edit effect dialog 12 years ago
scrawl 9d7c35ae48 and go 12 years ago
scrawl bf5e30b24f everything done except health/mana restore 12 years ago
scrawl 0ba996f290 dialog layout 12 years ago
scrawl b76a28f69c beginnings of the gui 12 years ago
scrawl 2b339f6c0f loading screen 12 years ago
Marc Zinnschlag 3fad1c0786 fixed a crash 12 years ago
Adam Hogan 08410b9062 Renamed SpellBuyingWindow, took some suggestions from scrawl 12 years ago
Adam Hogan ebf80943a9 Added spell buying window 13 years ago
scrawl 7eaf5e7f0f changed the markers to look more like morrowind's (hover effect) 13 years ago
scrawl fab4cfecb1 some unfinished work on quick keys window 13 years ago
scrawl f72956b918 - added a simple main menu (with Return, Options and Exit buttons)
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
13 years ago
scrawl 17a5c22c8f don't use globbing 13 years ago
scrawl 4ea6530772 hello world. 13 years ago
scrawl d27863bf8e rename layout files to .layout to get them recognized by layout editor 13 years ago
scrawl c7268233df spell window layout & opening/closing/pinning logic 13 years ago
scrawl 51b8a76a68 merged by branches together, starting with alchemy window
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
13 years ago
scrawl 689cf7ce05 ConfirmationDialog 13 years ago
scrawl 656a8f1be9 working menu transparency slider 13 years ago
scrawl 313294c522 settings window (hotkey F2) which does nothing. Yay! 13 years ago
scrawl 5da4da820e beginnings of trade window layout. 13 years ago
scrawl 24a0fecd37 implemented item count selection dialog 13 years ago
scrawl a1b86acc38 Merge branch 'master' into inventoryGUI
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	files/mygui/core.xml
13 years ago
gugus 8e8f80807e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/armor.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/clothing.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwclass/lockpick.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/probe.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwclass/weapon.cpp
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	apps/openmw/mwworld/class.cpp
13 years ago
scrawl d69501b061 change daedric font to .zip resource 13 years ago
scrawl 9dd53b32b8 added daedric font for magic scrolls 13 years ago
scrawl c125fba9d2 button mouse-over image change working 13 years ago
scrawl a4d6d1baff added a utility for creating texture atlas at runtime 13 years ago
scrawl 0e6b82284f book & scroll windows 13 years ago
gugus a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
	apps/openmw/CMakeLists.txt
13 years ago
gugus b309d245c5 cleaning up hircine work 13 years ago
scrawl cac662ca98 basic tooltips 13 years ago
scrawl 800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 13 years ago
Pieter van der Kloet 155cd76f37 Changed Launcher font to EB Garamond and added license info 13 years ago
scrawl cc9f20a04f MW_MapView skin 13 years ago
scrawl 250fcab7c2 moved the mygui resources to a more suitable location 13 years ago