162 commits

Author	SHA1	Message	Date
scrawl	e2400ca7b2	only show items in the trade window that the NPC actually trades (services enum)	2012-05-18 15:51:33 +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	6ae642aa06	complete trade window layout	2012-05-17 21:15:48 +02:00
scrawl	4213b4370f	trade window shows up and shows the vendor's inventory items.	2012-05-17 19:53:04 +02:00
scrawl	66abfd17ab	check the container's "Organic" flag before trying to place items inside.	2012-05-17 14:13:35 +02:00
scrawl	c5185cf2e4	drop item on avatar from external container bugfix	2012-05-17 12:09:53 +02:00
scrawl	9c4243782e	sorting items	2012-05-16 15:17:55 +02:00
scrawl	398a7dc65c	crash fix (hopefully)	2012-05-16 14:32:48 +02:00
scrawl	6a0cb32b7e	removed unnecessary code	2012-05-16 14:30:02 +02:00
scrawl	c5d685c780	added an assert	2012-05-16 14:28:57 +02:00
scrawl	f8c20ef77f	don't allow putting items into a container if the weight is exceeded.	2012-05-16 00:20:24 +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	175623bf22	change the drag&drop to not use a seperate containerstore	2012-05-15 21:44:57 +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	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	b18ee198b4	use a raycast to determine where to place object, if distance is too far ... drop it on the ground	2012-05-15 16:47:23 +02:00
scrawl	7fbee0d488	use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift	2012-05-15 13:00:26 +02:00
scrawl	24a0fecd37	implemented item count selection dialog	2012-05-15 12:51:51 +02:00
scrawl	320cc7d020	implemented ctrl and shift-keys for item drag&drop (take all, take 1)	2012-05-15 11:02:50 +02:00
scrawl	d3e162ec83	dropping items works	2012-05-14 17:41:17 +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	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	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	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	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	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	e9134717d6	the GUI part of drag and drop is working	2012-05-08 12:59:47 +02:00
gugus	60ad6f01d4	another step towards drand and drop.	2012-05-06 11:04: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
gugus	a6419c3596	Clicking on an item is now detected. ... Trying to have items follow the mouse position, but it doesn't work yet.	2012-04-26 19:35:45 +02:00
scrawl	1b02b503a2	gcc compile fix	2012-04-22 21:06:08 +02:00
gugus	25432d97d2	trying to get selected item. Doesn't work.	2012-04-21 20:35:45 +02:00
gugus	93ba773d2e	Merge branch 'inventoryGUI' of https://github.com/pchan3/openmw.git into inventoryGUI ... Conflicts: apps/openmw/mwgui/container.cpp	2012-04-21 11:08:10 +02:00
gugus	1e8d894e1c	Starting inventory window	2012-04-21 10:51:01 +02:00
pchan3	215d4e1739	Made adjustments to keep container window within the viewscreen.	2012-04-18 23:09:13 +10:00
pchan3	f902c8fa6f	Fixes on Namespace issue & more.	2012-04-18 22:35:35 +10:00
gugus	489261a6ae	Close button works.	2012-04-15 21:02:54 +02:00
gugus	58d05fa503	more clean-up. Container window shows up! But there is no working close button.	2012-04-15 20:56:45 +02:00
gugus	78c8a22cd1	more clean up. The container GUI shows up now	2012-04-15 19:32:41 +02:00
gugus	b309d245c5	cleaning up hircine work	2012-04-15 17:52:39 +02:00