12 commits

Author	SHA1	Message	Date
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	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	d53a7ade1e	method names, disposition uint->int	2012-11-09 14:42:09 +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
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	453f347ee8	Issue #68: added getdeadcount script function	2012-10-27 11:33:18 +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
scrawl	872fcf3e3d	sleeping restoration of health, magicka, and fatigue	2012-09-21 17:53:16 +02:00
Marc Zinnschlag	b68f9d6a28	Issue #107: MechanicsManager is accessed only through the interface class from now on	2012-08-11 17:30:55 +02:00

Renamed from apps/openmw/mwmechanics/mechanicsmanager.hpp (Browse further)