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
|
845dddbab8
|
fix a weird problem with the fading overlay
|
2012-09-21 18:09:07 +02:00 |
|
scrawl
|
bf5e30b24f
|
everything done except health/mana restore
|
2012-09-19 02:53:06 +02:00 |
|
scrawl
|
4829f47a4f
|
rewrote the fader to use Rectangle2d instead of overlay, in order to not cover the UI
|
2012-09-18 21:04:43 +02:00 |
|
guidoj
|
0549e949ba
|
Mostly removal of unnecessary #include's and a little clean up
|
2012-07-17 09:27:12 +02:00 |
|
Nikolay Kasyanov
|
b4343431c6
|
Merged openengine into openmw
|
2012-03-11 18:16:29 +04:00 |
|