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 |
|
scrawl
|
ff2c2d2b96
|
Merge branch 'master' into spellcreation
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
|
12 years ago |
Marc Zinnschlag
|
d1c4559abe
|
fixed GMST string handling in GUI
|
12 years ago |
|
scrawl
|
0c6ad13364
|
WakeUpPc instruction
|
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
|
9d7c35ae48
|
and go
|
12 years ago |
|
scrawl
|
98c1dc1151
|
ShowMap & FillMap commands, merged next
|
12 years ago |
|
scrawl
|
be44810623
|
implemented GetPCSleep
|
12 years ago |
|
scrawl
|
896428c129
|
enableRestMenu & enableLevelupMenu
|
12 years ago |
|
scrawl
|
76b494100e
|
finished?
|
12 years ago |
|
scrawl
|
2f0b47fc38
|
test
|
12 years ago |
|
scrawl
|
2b339f6c0f
|
loading screen
|
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
|
760f05c454
|
the HUD can be toggled with F12 key; useful for screenshots
|
13 years ago |
|
scrawl
|
6ad08dfd33
|
added settings for crosshair & subtitles
|
13 years ago |
|
Marc Zinnschlag
|
160b52162b
|
Merge remote-tracking branch 'scrawl/quick_keys'
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
|
13 years ago |
|
scrawl
|
9af0b48ad6
|
show/hide crosshair correctly
|
13 years ago |
|
scrawl
|
c5e55d3cac
|
fix screenshot function
|
13 years ago |
|
scrawl
|
bc6e4feedc
|
hotkey window first version
|
13 years ago |
|
Marc Zinnschlag
|
6534c2a55a
|
Issue #107: WindowManager is accessed only through the interface class from now on
|
13 years ago |