Commit Graph

32 Commits (0.7.1-build-fixes)

Author SHA1 Message Date
Andrei Kortunov 1ce370e7fa Make console to do not hide other GUI windows (bug #1515) 6 years ago
scrawl 32f9c8058a Remove redundant RestBed gui mode 7 years ago
MiroslavR 1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 10 years ago
scrawl 5906d795c0 Refactored video player (now a MyGUI widget) 11 years ago
scrawl cab535dd69 Implement magic item recharging via soulgem use 11 years ago
scrawl b0199c703c Companion UI 12 years ago
scrawl 51204f098e Added soulgem dialog; made interactive message boxes not close the previous UI 12 years ago
scrawl 20774f8f81 Added merchant repair feature 12 years ago
scrawl c4facc233e Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
12 years ago
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 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
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
gugus 3060fbee60 TravelGUI, not completly finished. 12 years ago
scrawl 73c69e8eda video playback 12 years ago
scrawl 9d7c35ae48 and go 12 years ago
scrawl bf5e30b24f everything done except health/mana restore 12 years ago
scrawl b76a28f69c beginnings of the gui 12 years ago
scrawl a96ed6ac61 splash screens on startup 12 years ago
Adam Hogan 08410b9062 Renamed SpellBuyingWindow, took some suggestions from scrawl 12 years ago
Adam Hogan ebf80943a9 Added spell buying window 12 years ago
scrawl fab4cfecb1 some unfinished work on quick keys window 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 7ebbc099b3 allow stacking gui modes 13 years ago
scrawl 313294c522 settings window (hotkey F2) which does nothing. Yay! 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
scrawl 9fc1138a87 opening, closing and taking books/scrolls works 13 years ago
gugus 78c8a22cd1 more clean up. The container GUI shows up now 13 years ago
gugus bc51ba5a38 Add the journal window (J key). It's still not in the right position. 13 years ago
Sebastian Wick 5db8e8c449 InterMessageBox game mode 14 years ago
Jan Borsodi b364d47b0b Implemented the Class Choice dialog which allows the player to choose between three ways to define a class.
Added a generic infobox dialog which displays some text and a set of buttons (vertical only for now), this is used for the Class Choice dialogs and the dialogs which shows various questions the player must choose from. The questions are currently hardcoded.
Added more gui states to handle the extra class dialogs (Generate, Pick or Create).
14 years ago
Jan Borsodi 1907aeb6c6 The game mode is now properly restored once a dialog is finished. Previously the game mode was only set in the window manager but it has to go through the input manager firs to get correct input state. Also updated the gui script commands to also use the input manager and not the window manager.
At some point the gui mode code should be moved to a class that handles all game mode (engine?).
15 years ago