63 commits

Author	SHA1	Message	Date
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
scrawl	2793096b50	Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/world.hpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp	2012-09-15 00:57:29 +02:00
scrawl	35f7216f2f	fixed some things	2012-09-14 17:25:32 +02:00
scrawl	7c59b83419	performance optimization	2012-09-14 17:10:10 +02:00
scrawl	1f7e044fad	removed some debug stuff	2012-09-14 14:41:19 +02:00
scrawl	6ac2a12296	item selection working on the preview	2012-09-14 14:34:18 +02:00
scrawl	eef750e6b0	race selection preview	2012-09-13 19:03:31 +02:00
scrawl	5155339cb6	character preview working	2012-09-13 14:56:50 +02:00
scrawl	4f3eb3c34a	character preview WIP	2012-09-13 00:54:32 +02:00
scrawl	b66c8099eb	new system for dynamic sizing of buttons & text boxes	2012-09-10 11:20:27 +02:00
scrawl	35dd49f948	fixed some "using namespace" in headers	2012-09-10 09:10:50 +02:00
Marc Zinnschlag	6534c2a55a	Issue #107: WindowManager is accessed only through the interface class from now on	2012-08-12 18:11:09 +02:00
Marc Zinnschlag	6bd48d12af	Issue #107: SoundManager is accessed only through the interface class from now on	2012-08-09 14:33:21 +02:00
Marc Zinnschlag	78fe6fdce5	Issue #351: Refactoring Action class	2012-07-27 12:00:10 +02:00
scrawl	1a5203749f	fix "error in framelistener" when trying to pick up lights that can't be picked up	2012-07-05 17:13:23 +02:00
Marc Zinnschlag	cc7c6aa0ad	Merge branch 'decouple'	2012-07-03 15:47:57 +02:00
Marc Zinnschlag	4c39fefd1e	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00
scrawl	d27863bf8e	rename layout files to .layout to get them recognized by layout editor	2012-07-03 11:34:20 +02:00
scrawl	dfac5f26c3	fixed some issues: ... - probes were not showing up in inventory category "misc" - lights, probes, lockpicks were not equippable - weapons could not be picked up	2012-06-04 21:48:20 +02:00
scrawl	ea8e3ca1c8	fix item duplication bug when picking up object with the mouse and immediately dropping again	2012-06-04 21:09:51 +02:00
scrawl	b8464d4ce5	allow picking up objects from the gameworld with the mouse in inventory mode	2012-06-02 14:19:02 +02:00
scrawl	298ae4f7f8	HUD icons for selected weapon / selected spell / selected enchanted item	2012-05-29 18:33:01 +02:00
scrawl	30461438f6	still left: spell success formula	2012-05-29 12:35:03 +02:00
scrawl	c7268233df	spell window layout & opening/closing/pinning logic	2012-05-29 09:02:22 +02:00
scrawl	f1d3978897	Issue #290: Auto-Close MW-reference related GUI windows	2012-05-27 01:14:33 +02:00
scrawl	6eb15f7680	auto-select the alchemy tools with highest quality	2012-05-25 15:24:33 +02:00
scrawl	92d9e070fb	small tweak to getPlayerGold() method	2012-05-19 16:10:13 +02:00
scrawl	2a4c55f1ab	use Class::getInventoryStore instead of casting ContainerStore.	2012-05-19 16:04:34 +02:00
scrawl	7ef0ad4e39	show faction & birthsign in the stats window	2012-05-19 14:55:09 +02:00
scrawl	db49e2c046	bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things	2012-05-18 20:53:24 +02:00
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