3201 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	9a01e18b29	fix some MessageBox code that was using deleted pointers sometimes	2012-05-16 15:00:20 +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	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	0f811edb47	fixed a bug with dropping items on the ground	2012-05-15 22:54:28 +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	e9ea1fba4e	fixed typo getCapacity method	2012-05-15 22:31:52 +02:00
scrawl	d3a53ae0b8	removed the _freeSlot method which is now unneeded	2012-05-15 22:01:09 +02:00
scrawl	0063387979	Merge branch 'master' into inventoryGUI	2012-05-15 21:48:05 +02:00
scrawl	175623bf22	change the drag&drop to not use a seperate containerstore	2012-05-15 21:44:57 +02:00
Marc Zinnschlag	fdfddc8be7	some todo comment cleanup	2012-05-15 21:34:32 +02:00
Marc Zinnschlag	7e00fea18b	added getEncumbrance function	2012-05-15 21:34:00 +02:00
Marc Zinnschlag	c6493fb133	added getCapacity function	2012-05-15 21:17:00 +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	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	933a40de14	better floating object label positioning.	2012-05-14 21:37:43 +02:00
scrawl	d3e162ec83	dropping items works	2012-05-14 17:41:17 +02:00
scrawl	6c9f75b322	some unfinished work for dropping objects into the gameworld	2012-05-13 18:35:56 +02:00
scrawl	967fb13fca	remove the old inventory code, split HUD, map and mainmenu into seperate implementation files	2012-05-13 18:14:03 +02:00
scrawl	f300a5621c	Merge branch 'master' into inventoryGUI	2012-05-13 17:45:57 +02:00
Marc Zinnschlag	2bf12a4839	Merge remote branch 'scrawl/itemstacking'	2012-05-13 17:22:18 +02:00
scrawl	82b9f835b1	make sure iterator is not end() before trying to get the equipped item	2012-05-13 16:54:18 +02:00
scrawl	a47d29c184	fix the inventory window overlapping with over windows in default layout	2012-05-13 16:41:00 +02:00
scrawl	8c458fc5ce	Merge branch 'master' into gui	2012-05-13 16:20:35 +02:00
scrawl	e9a1ef4269	Merge branch 'master' into inventoryGUI	2012-05-13 16:16:54 +02:00
Marc Zinnschlag	73d19f9185	Merge remote branch 'scrawl/itemstacking'	2012-05-13 16:06:30 +02:00
scrawl	d341d2113c	fixed some issues	2012-05-13 14:58:38 +02:00
scrawl	ee7e482cba	implemented un-stacking	2012-05-13 11:52:17 +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	16522ddc59	InventoryStore re-stacking unequipped items	2012-05-12 23:09:03 +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