90 commits

Author	SHA1	Message	Date
Chris Robinson	cc8e8c1272	Use the attack strength as determined by how long the attack was held	2013-07-24 03:18:53 -07:00
scrawl	07891fa213	Athletics skill increase	2013-04-28 07:53:04 +02:00
Marc Zinnschlag	f9f520df34	adjusted faction record to increase consistency with other records	2013-04-02 13:59:45 +02:00
scrawl	b0199c703c	Companion UI	2013-03-31 13:13:46 +02:00
scrawl	e7af718b55	Remove unnecessary WindowManager::messageBox arguments	2013-03-30 12:56:37 +01:00
Marc Zinnschlag	de4a03081c	fixed skill level type in skill level up message	2012-12-10 11:04:21 +01:00
Marc Zinnschlag	0e7ba008ad	another skill gain fix	2012-12-08 14:28:56 +01:00
Marc Zinnschlag	a70a5282f4	fixed an overzealous skill gain error check	2012-12-08 13:37:43 +01:00
scrawl	1def60dbe1	PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank	2012-11-28 02:15:34 +01:00
Marc Zinnschlag	9669eed083	Issue #219: added last missing function filters	2012-11-15 20:00:27 +01:00
Marc Zinnschlag	77ba8c5117	Issue #219: implemented rank requirement filter	2012-11-12 13:23:25 +01:00
Marc Zinnschlag	75f64aa38b	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp	2012-11-10 15:44:44 +01:00
Marc Zinnschlag	7e8d4bb3c9	Issue #219: added various creature and NPC stats; implemented respective filters	2012-11-10 13:21:38 +01:00
Marc Zinnschlag	e97f3003ab	Issue #219: added expelled status tracking; implemented expelled filter	2012-11-10 12:28:40 +01:00
Marc Zinnschlag	a752536cea	Issue #219: added function decoding and moved same faction function from DialogueManager to Filter	2012-11-10 09:35:50 +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
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
greye	86ad7a96f4	applying new interface vol.2, inconsistent	2012-11-05 21:19:22 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +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
greye	2fa4ac177a	initial resolving	2012-10-01 00:23:49 +04:00
Marc Zinnschlag	a34bdb9623	per NPC ID interaction tracking	2012-09-25 10:48:57 +02:00
scrawl	9f2668b45b	Task #400 Review GMST access	2012-09-22 21:35:57 +02:00
greye	18cc435aa1	resolving conflicts	2012-09-21 13:13:11 +04:00
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
scrawl	cf358fa79d	>= instead of ==	2012-09-15 19:20:13 +02:00
scrawl	0dc242c603	don't increase skill beyond 100	2012-09-15 19:10:48 +02:00
scrawl	f5237ff1a6	skill gain from books	2012-09-15 19:06:56 +02:00
scrawl	234f8fa5d5	added the missing sound & notification for skill increase	2012-09-15 18:35:59 +02:00
scrawl	b34b894d6a	removed some debug stuff	2012-09-15 17:20:47 +02:00
scrawl	76b494100e	finished?	2012-09-15 17:12:42 +02:00
Marc Zinnschlag	0d8150f4bd	Issue #324: added useSkill function to NpcStats (adjust skill level according to use)	2012-07-09 21:15:52 +02:00
Marc Zinnschlag	fe86ce5a2c	DrawState workaround	2012-07-07 20:53:19 +02:00
Marc Zinnschlag	0f41cc499d	Issue #324: Added skill gain calculation function	2012-07-06 21:07:04 +02:00
Marc Zinnschlag	d30ba14a17	Issue #324: Finished turning NpcStats into a proper class	2012-07-06 18:23:48 +02:00
Marc Zinnschlag	771863e73b	Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue	2012-07-06 15:50:26 +02:00