133 commits

Author	SHA1	Message	Date
scrawl	fb47681fbd	fix a bug, some cleanup	2012-05-18 17:58:33 +02:00
scrawl	342a244e31	NPC now doesn't buy items of types that he shouldn't accept.	2012-05-18 17:36:20 +02:00
scrawl	50a8eb05d9	transfering items between player and merchant works and shows a red frame for bought/sold items.	2012-05-18 17:27:55 +02:00
scrawl	41efea4c1d	in the trade window, don't show items that the merchant has equipped.	2012-05-17 21:56:16 +02:00
scrawl	4213b4370f	trade window shows up and shows the vendor's inventory items.	2012-05-17 19:53:04 +02:00
scrawl	c5185cf2e4	drop item on avatar from external container bugfix	2012-05-17 12:09:53 +02:00
scrawl	0f1e09d2c1	make Class::use method return an equip action for equippable items, add sound for equipping	2012-05-16 16:08:55 +02:00
scrawl	c5d685c780	added an assert	2012-05-16 14:28:57 +02:00
scrawl	2fa7ce0c19	equipping works also when the item wasn't in player inventory before.	2012-05-16 00:02:05 +02:00
scrawl	477f1b42ab	fixed another item dropping bug	2012-05-15 23:28:04 +02:00
scrawl	5a43fe3e5f	remove debug prints	2012-05-15 22:48:14 +02:00
scrawl	3f4ce32727	implemented player encumbrance bar	2012-05-15 22:45:46 +02:00
scrawl	d3a53ae0b8	removed the _freeSlot method which is now unneeded	2012-05-15 22:01:09 +02:00
scrawl	175623bf22	change the drag&drop to not use a seperate containerstore	2012-05-15 21:44:57 +02:00
scrawl	ca4fa21d64	removed the attempt to unify activation and use scripts which was incorrect	2012-05-15 20:51:19 +02:00
scrawl	71de10cb7e	equipping items works, but only if you have more than one of the item that you're equipping	2012-05-15 20:33:34 +02:00
scrawl	765881a61d	equipping items in the inventorywindow (there is no visual indication yet)	2012-05-15 18:20:32 +02:00
scrawl	ab6336b745	using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now)	2012-05-15 18:05:53 +02:00
scrawl	a47d29c184	fix the inventory window overlapping with over windows in default layout	2012-05-13 16:41:00 +02:00
scrawl	3a93df8db4	dynamic inventory layout like morrowind	2012-05-13 11:25:35 +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	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	ed6ff0a94a	cleanup 3	2012-05-12 13:12:37 +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	9dd65dce30	Finished merging.	2012-05-11 11:52:07 +02:00
gugus	5f8c08b18b	some work for dropping objects.	2012-04-30 13:01:18 +02:00
gugus	5603cb312c	Objects can now be selected and follow mouse movements.	2012-04-27 20:54:39 +02:00
scrawl	1b02b503a2	gcc compile fix	2012-04-22 21:06:08 +02:00
gugus	33654535c1	The inventory window now display the inventory of the player	2012-04-21 11:05:30 +02:00
gugus	1e8d894e1c	Starting inventory window	2012-04-21 10:51:01 +02:00