Commit Graph

66 Commits (8c7e06293fbe6d0ed1dd7dd0f424b9f1b6f92162)

Author SHA1 Message Date
scrawl 3a6fde5039 cleanup 2 13 years ago
scrawl a1b86acc38 Merge branch 'master' into inventoryGUI
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	files/mygui/core.xml
13 years ago
scrawl 007a202deb cleanup 1 13 years ago
scrawl 2d3cc014c9 Merge branch 'inventoryGUI' of https://github.com/gugus/openmw into inventoryGUI
Conflicts:
	apps/openmw/mwgui/container.cpp
	apps/openmw/mwgui/container.hpp
13 years ago
gugus cfb7aa4343 Drag and drop works. There is a bug with item count when doing d&d. Clean-up time :p 13 years ago
gugus 9dd65dce30 Finished merging. 13 years ago
gugus 60ad6f01d4 another step towards drand and drop. 13 years ago
gugus 5f8c08b18b some work for dropping objects. 13 years ago
gugus 5603cb312c Objects can now be selected and follow mouse movements. 13 years ago
gugus a6419c3596 Clicking on an item is now detected.
Trying to have items follow the mouse position, but it doesn't work yet.
13 years ago
scrawl 1b02b503a2 gcc compile fix 13 years ago
gugus 25432d97d2 trying to get selected item. Doesn't work. 13 years ago
gugus 33654535c1 The inventory window now display the inventory of the player 13 years ago
gugus 1e8d894e1c Starting inventory window 13 years ago
gugus 489261a6ae Close button works. 13 years ago
gugus b309d245c5 cleaning up hircine work 13 years ago