Marc Zinnschlag
|
654cd3ab9b
|
Issue #479: Use magnitude specified when adding disease
|
2013-01-13 14:52:55 +01:00 |
|
Marc Zinnschlag
|
f4ee8e2642
|
Issue #479: Added additional magnitude parameter to known spells
|
2013-01-12 13:10:20 +01:00 |
|
eduard
|
2dc0064cc2
|
more string lowercase
|
2013-01-09 20:51:52 +01:00 |
|
scrawl
|
a5ef669eb6
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD
Conflicts:
apps/openmw/mwscript/aiextensions.cpp
apps/openmw/mwscript/docs/vmformat.txt
|
2013-01-03 02:34:31 +01:00 |
|
Marc Zinnschlag
|
de4a03081c
|
fixed skill level type in skill level up message
|
2012-12-10 11:04:21 +01:00 |
|
Marc Zinnschlag
|
5f5addf052
|
fixed an enum
|
2012-12-09 00:12:24 +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 |
|
greye
|
682fd23aea
|
fix wrong increment
|
2012-12-02 21:18:59 +04:00 |
|
rpopovici
|
7079b9062f
|
add AI script functions
|
2012-11-30 02:16:16 +02:00 |
|
scrawl
|
1def60dbe1
|
PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank
|
2012-11-28 02:15:34 +01:00 |
|
scrawl
|
0db48b29c7
|
GetSpellEffects, GetRace
|
2012-11-25 01:26:29 +01:00 |
|
Marc Zinnschlag
|
a092deaee8
|
various fixes
|
2012-11-16 20:28:20 +01:00 |
|
Marc Zinnschlag
|
3dc013ceae
|
Merge remote-tracking branch 'gohan/Gohan'
|
2012-11-16 20:15:58 +01:00 |
|
marcin
|
51027c541e
|
Feature #391 Dummy AI package classes
|
2012-11-16 18:38:15 +01:00 |
|
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 |
|
Marc Zinnschlag
|
9669eed083
|
Issue #219: added last missing function filters
|
2012-11-15 20:00:27 +01:00 |
|
marcin
|
e6c8e1f0d7
|
Feature #391 Dummy AI package classes
|
2012-11-14 18:42:04 +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
|
0ab4068fbd
|
Merge remote-tracking branch 'scrawl/persuasion' into next
|
2012-11-10 14:59:52 +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
|
d15eb6cd17
|
Merge remote-tracking branch 'greye/player-model' into next
|
2012-11-10 12:36:01 +01:00 |
|
Marc Zinnschlag
|
e97f3003ab
|
Issue #219: added expelled status tracking; implemented expelled filter
|
2012-11-10 12:28:40 +01:00 |
|
Marc Zinnschlag
|
ceaf1677ce
|
Issue #219: rewrote AI settings and implemented AI settings filters
|
2012-11-10 11:38:37 +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 |
|
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 |
|