scrawl
|
ff2c2d2b96
|
Merge branch 'master' into spellcreation
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
|
2012-10-01 17:54:45 +02:00 |
|
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 |
|
scrawl
|
ac0c1ea986
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
Conflicts:
apps/openmw/mwgui/dialogue.cpp
|
2012-09-27 08:47:47 +02:00 |
|
gugus
|
3060fbee60
|
TravelGUI, not completly finished.
|
2012-09-26 18:30:47 +02:00 |
|
scrawl
|
9d7c35ae48
|
and go
|
2012-09-23 00:36:20 +02:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
Adam Hogan
|
ebf80943a9
|
Added spell buying window
|
2012-09-08 18:17:03 -04:00 |
|
greye
|
a90547bbbe
|
code formatting
|
2012-08-29 21:35:06 +04:00 |
|
Marc Zinnschlag
|
6534c2a55a
|
Issue #107: WindowManager is accessed only through the interface class from now on
|
2012-08-12 18:11:09 +02:00 |
|
Marc Zinnschlag
|
0231533d05
|
Issue #107: InputManager is accessed only through the interface class from now on
|
2012-08-11 17:53:39 +02:00 |
|
Marc Zinnschlag
|
d00d40cc3f
|
Issue #107: Journal is accessed only through the interface class from now on
|
2012-08-09 12:56:03 +02:00 |
|
Marc Zinnschlag
|
923109b260
|
Issue #107: DialogueManager is accessed only through the interface class from now on
|
2012-08-09 10:35:53 +02:00 |
|