gugus
|
8e8f80807e
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/armor.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/clothing.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/light.cpp
apps/openmw/mwclass/lockpick.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/probe.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwclass/weapon.cpp
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
apps/openmw/mwworld/class.cpp
|
2012-05-11 10:40:40 +02:00 |
|
gugus
|
a38db39e88
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
apps/openmw/CMakeLists.txt
|
2012-04-15 17:54:13 +02:00 |
|
gugus
|
b309d245c5
|
cleaning up hircine work
|
2012-04-15 17:52:39 +02:00 |
|
scrawl
|
cac662ca98
|
basic tooltips
|
2012-04-14 17:47:44 +02:00 |
|
scrawl
|
800df7376c
|
use the cursors from morrowind.bsa and remove mwpointer.png
|
2012-04-12 14:26:21 +02:00 |
|
Pieter van der Kloet
|
155cd76f37
|
Changed Launcher font to EB Garamond and added license info
|
2012-03-24 20:43:35 +01:00 |
|
scrawl
|
cc9f20a04f
|
MW_MapView skin
|
2012-03-22 20:25:41 +01:00 |
|
scrawl
|
250fcab7c2
|
moved the mygui resources to a more suitable location
|
2012-03-22 17:11:24 +01:00 |
|