3141 commits

Author	SHA1	Message	Date
marcin	698afbec3e	Feature #391 Dummy AI package classes	2012-11-14 18:40:32 +01:00
scrawl	8e847fdc6e	fix speechcraft skill increasing when persuade didn't succeed	2012-11-11 19:18:41 +01:00
Marc Zinnschlag	7b1788b03b	minor fix	2012-11-10 15:11:21 +01:00
Marc Zinnschlag	0ab4068fbd	Merge remote-tracking branch 'scrawl/persuasion' into next	2012-11-10 14:59:52 +01:00
Marc Zinnschlag	d15eb6cd17	Merge remote-tracking branch 'greye/player-model' into next	2012-11-10 12:36:01 +01:00
greye	235b565bb7	update main character model	2012-11-10 11:51:48 +04:00
greye	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
scrawl	92bba18218	removed useless member	2012-11-10 00:47:24 +01:00
scrawl	553ea08eae	consider temporary disposition change when trading	2012-11-10 00:42:31 +01:00
scrawl	94aeb15220	bartering disposition change	2012-11-10 00:38:45 +01:00
scrawl	33b4b29fbc	persuasion mechanics, added reputation	2012-11-10 00:29:36 +01:00
scrawl	ace9ee9c83	persuasion dialog	2012-11-09 20:18:38 +01:00
scrawl	f6a9029c4b	bounty & disease disposition effect	2012-11-09 18:33:11 +01:00
Marc Zinnschlag	be1334b202	disease tests	2012-11-09 18:16:29 +01:00
Marc Zinnschlag	0727d943b1	Merge branch 'next' into bountydisease ... Conflicts: apps/openmw/mwmechanics/npcstats.cpp	2012-11-09 18:04:44 +01:00
scrawl	d53a7ade1e	method names, disposition uint->int	2012-11-09 14:42:09 +01:00
Marc Zinnschlag	39ff2f06ce	added bounty to NpcStats	2012-11-09 14:31:38 +01:00
scrawl	ae78eaeb28	fixed training, fixed todo comments	2012-11-08 23:21:03 +01:00
scrawl	b2afb1fd5c	Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/spellbuyingwindow.cpp apps/openmw/mwgui/trainingwindow.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2012-11-08 23:16:40 +01:00
scrawl	322faf13e4	cleanup	2012-11-08 22:37:59 +01:00
scrawl	bf4e855260	fixed creatures	2012-11-08 22:31:08 +01:00
gugus	4634227f1c	notify the user when the merchant doesn't accept the offer	2012-11-08 21:50:56 +01:00
greye	c3f0dc0dfb	m prefix for NpcAnimation members	2012-11-08 23:11:43 +04:00
scrawl	3d7146cd50	don't allow opening a window multiple times, primarily the console	2012-11-08 19:34:54 +01:00
Marc Zinnschlag	2be60041f3	Merge remote-tracking branch 'greye/player-dynamics' into next	2012-11-08 18:32:25 +01:00
greye	af5fb7916f	fix searching in store	2012-11-08 21:07:14 +04:00
greye	b5a59c3a07	minor doxygen comments update	2012-11-08 19:01:42 +04:00
greye	2a86432887	store birthsign in MWWorld::Player	2012-11-08 18:50:23 +04:00
gugus	0a883f4492	The player can now barter with merchants	2012-11-08 13:38:20 +01:00
greye	83e758ee50	clean up interfaces	2012-11-08 16:37:57 +04:00
greye	2a06d72e32	remove unused custom character classes	2012-11-08 02:27:01 +04:00
greye	9dc9098fa7	update MWBase::World interface since records contains own id	2012-11-08 01:52:34 +04:00
greye	f818fa1ebf	minor update since records contains own id	2012-11-08 01:39:24 +04:00
greye	5b9621bca5	store player record data in ESMStore	2012-11-08 01:36:43 +04:00
greye	9ab2c16055	store created character classes as dynamic records	2012-11-08 01:22:44 +04:00
greye	78740306db	non-const access to Store<T> from ESMStore	2012-11-08 01:21:54 +04:00
Marc Zinnschlag	c5a6171aab	cleanup	2012-11-07 19:43:42 +01:00
Marc Zinnschlag	918316168f	Merge remote-tracking branch 'greye/store' into next ... Conflicts: apps/openmw/mwclass/light.cpp apps/openmw/mwworld/worldimp.cpp	2012-11-07 19:34:28 +01:00
greye	11c0e6382f	make ESMStore setting up itself after loading	2012-11-07 15:41:59 +04:00
greye	bc218759e9	forgotten module	2012-11-07 15:38:25 +04:00
Marc Zinnschlag	0805301922	Merge remote-tracking branch 'bwrsandman/master' into next	2012-11-07 10:40:40 +01:00
bwrsandman	7911f08c53	Issue #438: set 0 a.m. to be 12 a.m.	2012-11-06 13:19:35 -05:00
Marc Zinnschlag	81a2c629d8	Merge remote-tracking branch 'scrawl/master' into next	2012-11-06 18:21:24 +01:00
scrawl	21e0cde914	changed OIS includes since OIS_INCLUDE_DIR is already an include directory	2012-11-06 15:26:51 +01:00
greye	58b7927a36	move 'player' record to dynamic	2012-11-06 18:17:32 +04:00
greye	83f5b1df81	change to static --> dynamic search order	2012-11-06 17:58:49 +04:00
greye	9f1733a415	move record insertion to ESMStore	2012-11-06 17:51:38 +04:00
gugus	bf98b95955	bugfix	2012-11-06 13:10:54 +01:00
Marc Zinnschlag	6d5333be05	some code cleanup	2012-11-06 13:08:25 +01:00
Marc Zinnschlag	d661d4f6d6	Merge remote-tracking branch 'emoose/bug-368' into next	2012-11-06 13:04:38 +01:00