195 Commits

Author	SHA1	Message	Date
marcin	bed0280ba1	Feature #391 Dummy AI package classes	2012-11-15 22:33:50 +01:00
marcin	99ddc63e2c	Feature #391 Dummy AI package classes	2012-11-15 22:32:15 +01:00
marcin	515419ae0b	Feature #391 Dummy AI package classes	2012-11-15 22:22:44 +01:00
marcin	4b939c7521	Feature #391 Dummy AI package classes	2012-11-15 22:15:20 +01:00
marcin	e6c8e1f0d7	Feature #391 Dummy AI package classes	2012-11-14 18:42:04 +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	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
scrawl	553ea08eae	consider temporary disposition change when trading	2012-11-10 00:42:31 +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	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
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	9dc9098fa7	update MWBase::World interface since records contains own id	2012-11-08 01:52:34 +04:00
greye	5b9621bca5	store player record data in ESMStore	2012-11-08 01:36:43 +04:00
gugus	bf98b95955	bugfix	2012-11-06 13:10:54 +01:00
greye	620184a009	fix typos	2012-11-06 14:44:56 +04:00
greye	b3ad872845	new interface in manualref, fix various typos	2012-11-06 13:43:48 +04:00
gugus	2841d831a6	Disposition is now updated everyframe	2012-11-05 23:16:37 +01:00
gugus	9ebe9cb40c	Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes	2012-11-05 19:55:06 +01:00
greye	86ad7a96f4	applying new interface vol.2, inconsistent	2012-11-05 21:19:22 +04:00
greye	bd1bb2e55d	applying new interface vol.1, inconsistent	2012-11-05 18:39:42 +04:00
greye	d205723a17	resolving m prefix/ESMStore movement	2012-11-05 18:02:47 +04:00
greye	8691eac557	resolve Script::mData.mName -> mId, resolve moving ESMStore	2012-11-05 17:41:36 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
greye	3c2ce25f5f	m prefix for mwworld/cellstore.hpp	2012-11-05 16:07:59 +04:00
gugus	f72f898bd9	implement barterOffer. It's used for travel only. ... I've started to implement disposition, but it's very basic for now.	2012-11-05 11:07:43 +01:00
Marc Zinnschlag	d7add0b9e6	Issue #61: fixed alchemy skill	2012-10-28 14:07:36 +01:00
Marc Zinnschlag	c635447cea	Merge branch 'death'	2012-10-27 13:34:20 +02:00
Marc Zinnschlag	ed3641b214	Issue #68: check for essential actors	2012-10-27 13:33:54 +02:00
Marc Zinnschlag	2e63ca5e0a	Merge branch 'death'	2012-10-27 11:33:26 +02:00
Marc Zinnschlag	453f347ee8	Issue #68: added getdeadcount script function	2012-10-27 11:33:18 +02:00
Marc Zinnschlag	f72c35fc17	Issue #68: tally deaths	2012-10-27 11:15:52 +02:00
Marc Zinnschlag	6b09b3ad61	Issue #68: Play death animations	2012-10-27 10:36:42 +02:00
Marc Zinnschlag	21c24dedb6	Issue #68: Stop player from dying (temporary workaround)	2012-10-25 12:28:45 +02:00
Marc Zinnschlag	0ab432b074	Issue #68: fixed death detection	2012-10-25 12:22:48 +02:00
Marc Zinnschlag	9172c3ec4d	Issue #68: stop NPCs from instantly dropping dead	2012-10-23 13:54:36 +02:00
scrawl	234716daa6	finished spell creation	2012-10-23 11:42:38 +02:00
Marc Zinnschlag	0547f11564	Issue #68: Remove dead actors from actor list	2012-10-20 10:54:51 +02:00
Marc Zinnschlag	f2e25b8a47	Issue #68: Keep dead actors out of the actor list for the current scene	2012-10-20 10:49:48 +02:00
Marc Zinnschlag	3f6afb13f1	Merge remote-tracking branch 'scrawl/alchemy'	2012-10-19 20:09:45 +02:00