2220 Commits

Author	SHA1	Message	Date
Marc Zinnschlag	7938566004	Merge remote branch 'scrawl/graphics' ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-05-21 11:24:36 +02:00
Marc Zinnschlag	76d733d2b3	Merge remote branch 'scrawl/inventoryGUI'	2012-05-21 11:17:11 +02:00
scrawl	bda90b77bc	oops, forgot something	2012-05-21 10:59:06 +02:00
scrawl	157dd81524	removed script instruction, will be in the settings window later	2012-05-21 10:57:49 +02:00
scrawl	5f6e8224f4	skill progress	2012-05-21 10:48:25 +02:00
Marc Zinnschlag	3e85151c9d	Merge remote branch 'scrawl/inventoryGUI' ... Conflicts: apps/openmw/CMakeLists.txt	2012-05-21 10:13:27 +02:00
scrawl	8f2c8bbea4	Merge branch 'master' into graphics	2012-05-21 09:50:46 +02:00
scrawl	789dfe1c88	fix a bug with water reflection plane height	2012-05-21 09:50:02 +02:00
scrawl	40c52c5d09	max faction rank crashfix	2012-05-21 05:19:20 +02:00
scrawl	1079bb2677	finished tooltips for everything in the stats window, some gui refactoring	2012-05-21 05:14:07 +02:00
scrawl	76d71f86bc	fixed a faction case folding issue	2012-05-21 03:10:55 +02:00
scrawl	4a009fc2bb	faction tooltip (doesn't handle player having max. rank)	2012-05-21 02:58:06 +02:00
scrawl	8ce4727424	skill tooltips	2012-05-21 01:58:11 +02:00
scrawl	6518eb7794	some cleanup	2012-05-20 22:55:14 +02:00
scrawl	1c7110fbf5	birthsign tooltip	2012-05-20 22:45:30 +02:00
scrawl	8d52ee27dc	attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files	2012-05-20 22:06:54 +02:00
Marc Zinnschlag	420cd53be0	Merge branch 'effects'	2012-05-19 17:41:47 +02:00
Marc Zinnschlag	be46f5a59c	various fixes	2012-05-19 17:39:24 +02:00
scrawl	876b369ca5	minor tooltip fix	2012-05-19 16:28:10 +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	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
Marc Zinnschlag	0dc412d44c	Merge remote branch 'scrawl/refid_case'	2012-05-19 15:07:12 +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