3426 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	2a4c55f1ab	use Class::getInventoryStore instead of casting ContainerStore.	2012-05-19 16:04:34 +02:00
scrawl	4fb30544d4	more gui files cleanup	2012-05-19 16:00:00 +02:00
scrawl	7a4de0ed1d	changed more gui stuff to use the new tag system	2012-05-19 15:32:32 +02:00
scrawl	a284bfb4d0	Merge branch 'master' into inventoryGUI	2012-05-19 15:07:37 +02:00
Marc Zinnschlag	0dc412d44c	Merge remote branch 'scrawl/refid_case'	2012-05-19 15:07:12 +02:00
Marc Zinnschlag	ada86cbf32	Merge remote branch 'gus/collisionbug'	2012-05-19 15:02:26 +02:00
Marc Zinnschlag	9f1919a230	Issue #256: added active spell management (completely untested)	2012-05-19 15:01:07 +02:00
scrawl	7ef0ad4e39	show faction & birthsign in the stats window	2012-05-19 14:55:09 +02:00
Marc Zinnschlag	635a89c35c	Issue #256: RNG fix	2012-05-19 14:43:02 +02:00
scrawl	24ce88de2a	working mygui tag replacement system for GMST strings	2012-05-19 14:19:21 +02:00
scrawl	ee884634b9	fixed item refID handling in the dialogue manager and container script extensions.	2012-05-19 13:19:26 +02:00
Marc Zinnschlag	74ae3605e0	Issue #256: added getTimeStamp function to World	2012-05-19 09:31:45 +02:00
scrawl	9ca579ba63	slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly	2012-05-19 00:36:01 +02:00
scrawl	1006411c02	small fix for mygui log being spammed with errors	2012-05-19 00:06:11 +02:00
scrawl	41466fc5fc	gold label fix, and don't allow selling gold	2012-05-18 23:00:31 +02:00
scrawl	656b08f620	removed the workaround for the ContainerStore bug.	2012-05-18 22:32:06 +02:00
scrawl	8a0c859c16	Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI	2012-05-18 22:27:48 +02:00
scrawl	f28f36f262	added sounds to trade window	2012-05-18 22:27:27 +02:00
Marc Zinnschlag	498530fad7	container iterator fix	2012-05-18 22:24:19 +02:00
scrawl	c30b9e4bb9	add/remove gold from the player at the end of the transaction.	2012-05-18 22:21:44 +02:00
scrawl	c004f5d570	adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications	2012-05-18 22:06:25 +02:00
Marc Zinnschlag	a4343bfa18	Issue #256: added TimeStamp class	2012-05-18 22:04:22 +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	e2400ca7b2	only show items in the trade window that the NPC actually trades (services enum)	2012-05-18 15:51:33 +02:00
Marc Zinnschlag	124ea77612	Issue #256: consider equipped items when calculating magic effects	2012-05-18 15:48:55 +02:00
Marc Zinnschlag	372efaafd7	Issue #256: changed implementation of MagicEffects::operator+=	2012-05-18 15:27:41 +02:00
Marc Zinnschlag	40c58c1bb7	Issue #256: fixed a capitalisation mistake	2012-05-18 15:26:08 +02:00
Marc Zinnschlag	5236bcb557	Issue #256: added operator+= for MagicEffects	2012-05-18 15:12:11 +02:00
Marc Zinnschlag	79055e281d	Issue #256: Force update after building the player character	2012-05-18 13:54:07 +02:00
Marc Zinnschlag	e1997b7f04	Issue #256: added MagicEffects::add overload for EffectLists	2012-05-18 13:17:35 +02:00
scrawl	adf0550292	fixed a wrong label.	2012-05-18 00:14:31 +02:00
scrawl	52e5e14654	use GMST sDefaultCellname for the map window when cell has no region or name.	2012-05-17 23:42:09 +02:00
scrawl	3cacc8feec	add re-stocking items to containers (though restocking isn't implemented)	2012-05-17 23:22:41 +02:00
scrawl	9a3fd96a0c	display the merchant gold.	2012-05-17 22:24:47 +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	c9aa0ca1f4	don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region	2012-05-17 19:54:09 +02:00
scrawl	4213b4370f	trade window shows up and shows the vendor's inventory items.	2012-05-17 19:53:04 +02:00
scrawl	1f85475536	Merge branch 'master' into inventoryGUI	2012-05-17 19:03:41 +02:00
scrawl	375c198ebd	WeatherManager: fix for cells that have no region.	2012-05-17 18:21:05 +02:00
scrawl	0afda15ce9	fix for cells that have no region.	2012-05-17 18:14:33 +02:00
scrawl	ae77e7b0d8	don't try to retrieve land data from non-predefined cells.	2012-05-17 18:11:34 +02:00
scrawl	5da4da820e	beginnings of trade window layout.	2012-05-17 17:15:44 +02:00
Marc Zinnschlag	6b74fec8ed	don't do a half finished cell change, when trying to switch to an interior cell that does not exist	2012-05-17 17:13:41 +02:00
gugus	09ec1da0f6	fix the latest commit: objects activation works again.	2012-05-17 16:12:55 +02:00
gugus	6f87493df6	fix collision bug i think. It disable collision for quiet a lot of objects (maybe a little to much)	2012-05-17 15:46:38 +02:00
scrawl	0dc5e5919b	show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works.	2012-05-17 14:54:03 +02:00