krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
3154 commits 35 branches 0 tags 65 MiB
Commit graph

3154 commits

This branch
This branch
All branches
Author SHA1 Message Date
scrawl
3a93df8db4 dynamic inventory layout like morrowind 2012-05-13 11:25:35 +02:00
scrawl
d266b4fe87 hide the cursor during drag&drop and don't allow hotkeys that change guimode 2012-05-13 10:18:17 +02:00
scrawl
f31853d30b mouse wheel works when mouse is over an item 2012-05-13 01:27:17 +02:00
scrawl
78b06d0ebf inventory window pinning 2012-05-12 22:44:12 +02:00
scrawl
822e5fbe1e add indication which filter is selected 2012-05-12 22:00:15 +02:00
scrawl
902309a554 working filters 2012-05-12 21:44:33 +02:00
scrawl
0114bf948c revised filters 2012-05-12 21:28:04 +02:00
scrawl
8e6c943400 "take all"-button sound (first item) 2012-05-12 20:39:21 +02:00
scrawl
fd18c95c5f implemented filters (no gui yet) 2012-05-12 20:35:50 +02:00
scrawl
24e54a81bd don't show icons in the inventory tooltips, exactly like MW does 2012-05-12 20:28:12 +02:00
scrawl
e6e50f4ad4 fix items getting cut off 2012-05-12 20:14:19 +02:00
scrawl
f3c88adc0b items can now also be dropped on another item (and will be placed in 
container)
 2012-05-12 20:06:44 +02:00
scrawl
54c23c7422 show the background texture for enchanted items in inventory/container 2012-05-12 19:48:01 +02:00
scrawl
19e8e84f9a more cleanup, removed the redundant ItemWidget and use widget userdata 2012-05-12 18:50:19 +02:00
scrawl
6ee4e8fb5a Merge branch 'itemstacking' into inventoryGUI 
Conflicts:
	apps/openmw/mwclass/armor.hpp
	apps/openmw/mwclass/clothing.hpp
	apps/openmw/mwclass/weapon.hpp
	apps/openmw/mwworld/class.hpp
 2012-05-12 18:32:06 +02:00
scrawl
e714b77df8 small fix 2012-05-12 18:28:14 +02:00
scrawl
1abf70692c added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug 2012-05-12 18:24:47 +02:00
scrawl
9f2595183b type 2012-05-12 16:30:27 +02:00
scrawl
5b0251b09f item stacking 2012-05-12 16:17:03 +02:00
scrawl
a31a9e51d3 add the sound for item drag&drop 2012-05-12 14:29:49 +02:00
scrawl
722af60337 implemented the "Take all" button 2012-05-12 14:01:59 +02:00
scrawl
d64fccec6f display the item count in the tooltip 2012-05-12 13:46:03 +02:00
scrawl
7723044df0 added the item tooltips 2012-05-12 13:30:34 +02:00
scrawl
ed6ff0a94a cleanup 3 2012-05-12 13:12:37 +02:00
scrawl
3a6fde5039 cleanup 2 2012-05-11 16:58:07 +02:00
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
 2012-05-11 16:41:27 +02:00
scrawl
007a202deb cleanup 1 2012-05-11 16:34:36 +02:00
scrawl
2d3cc014c9 Merge branch 'inventoryGUI' of https://github.com/gugus/openmw into inventoryGUI 
Conflicts:
	apps/openmw/mwgui/container.cpp
	apps/openmw/mwgui/container.hpp
 2012-05-11 16:27:24 +02:00
gugus
cfb7aa4343 Drag and drop works. There is a bug with item count when doing d&d. Clean-up time :p 2012-05-11 12:50:30 +02:00
gugus
9dd65dce30 Finished merging. 2012-05-11 11:52:07 +02:00
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
Marc Zinnschlag
37095b62c6 removed another include 2012-05-10 12:51:40 +02:00
Marc Zinnschlag
e906614170 Merge remote branch 'scrawl/gui' 2012-05-10 12:46:11 +02:00
scrawl
3d9e89c837 removed unnecessary include 2012-05-10 12:44:01 +02:00
Marc Zinnschlag
bee03b5180 Merge remote branch 'scrawl/gui' 2012-05-10 12:08:49 +02:00
scrawl
4ce50c503b a few tweaks 2012-05-10 11:29:28 +02:00
scrawl
de995e3a69 adjust topic list on window resize 2012-05-10 11:19:22 +02:00
scrawl
8a9e05a96b display text on the book window 2012-05-10 11:03:27 +02:00
scrawl
d69501b061 change daedric font to .zip resource 2012-05-09 02:16:10 +02:00
scrawl
e5e8663bb4 parse <div> <font> and <p> 2012-05-09 02:11:44 +02:00
scrawl
8e7ab09a25 scroll window image tags working 2012-05-09 01:34:32 +02:00
gugus
e9134717d6 the GUI part of drag and drop is working 2012-05-08 12:59:47 +02:00
scrawl
cd351ba3af simple scroll text parsing (tags are ignored until now) 2012-05-08 00:39:52 +02:00
scrawl
2b584300d6 throw an exception when no default settings file is found, which indicates a packaging error 2012-05-07 23:16:29 +02:00
scrawl
3c69d26571 journal close sound 2012-05-07 19:42:04 +02:00
scrawl
9dd53b32b8 added daedric font for magic scrolls 2012-05-07 02:00:31 +02:00
gugus
60ad6f01d4 another step towards drand and drop. 2012-05-06 11:04:07 +02:00
scrawl
f20d4eeb41 Bug #281 , openmw.font.xml update 2012-05-05 01:44:51 +02:00
scrawl
d91129ed49 Merge branch 'master' into gui 2012-05-04 23:54:37 +02:00
scrawl
499dd26398 dialogue window topic list word-wrapping 2012-05-04 23:53:50 +02:00