greye
|
4637503680
|
applying new interface vol.6, inconsistent
|
2012-11-06 00:34:11 +04:00 |
|
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
|
2012-10-17 18:17:53 +02:00 |
|
scrawl
|
ff2c2d2b96
|
Merge branch 'master' into spellcreation
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
|
2012-10-01 17:54:45 +02:00 |
|
greye
|
2fa4ac177a
|
initial resolving
|
2012-10-01 00:23:49 +04: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 |
|
scrawl
|
9d7c35ae48
|
and go
|
2012-09-23 00:36:20 +02:00 |
|
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
2012-09-22 21:35:57 +02:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
scrawl
|
996e6280d8
|
more spell buying window cleanup
|
2012-09-10 14:10:01 +02:00 |
|
scrawl
|
ba0acd4056
|
changed some text colors
|
2012-09-10 13:52:37 +02:00 |
|
Marc Zinnschlag
|
61c8a627aa
|
added a missing include
|
2012-09-10 13:19:15 +02:00 |
|
Marc Zinnschlag
|
f17756712a
|
fixed spell list handling
|
2012-09-10 13:15:55 +02:00 |
|
Marc Zinnschlag
|
bcf3a81a6c
|
and a tiny bit more of cleanup
|
2012-09-09 21:18:47 +02:00 |
|
Marc Zinnschlag
|
9c49ca1468
|
a bit more random cleanup
|
2012-09-09 21:08:57 +02:00 |
|
Marc Zinnschlag
|
06677a0fc8
|
fixed ID handling and some misc cleanup
|
2012-09-09 21:03:39 +02:00 |
|
Marc Zinnschlag
|
3fad1c0786
|
fixed a crash
|
2012-09-09 20:43:21 +02:00 |
|
Adam Hogan
|
08410b9062
|
Renamed SpellBuyingWindow, took some suggestions from scrawl
|
2012-09-09 14:10:07 -04:00 |
|