scrawl
|
5f7d349126
|
several missing includes
|
12 years ago |
Marc Zinnschlag
|
b046687f46
|
added PCFacRep script instructions
|
12 years ago |
|
Marc Zinnschlag
|
2a1727d4c5
|
improved error reporting for dialogue scripts (enabled via --script-verbose)
|
12 years ago |
|
Marc Zinnschlag
|
c621a9f7e4
|
added missing disposition script instructions
|
12 years ago |
|
Marc Zinnschlag
|
8aa1fd921b
|
fixed some stats related script instructions
|
12 years ago |
|
Marc Zinnschlag
|
3f20206f8e
|
Merge remote-tracking branch 'scrawl/no_submodule'
|
12 years ago |
|
Marc Zinnschlag
|
cbb0fd5792
|
Merge branch 'dialogue'
|
12 years ago |
|
scrawl
|
32bf40e407
|
Merge branch 'master' into no_submodule
|
12 years ago |
|
Marc Zinnschlag
|
409d15576b
|
Merge remote-tracking branch 'greye/player-model'
|
12 years ago |
|
Marc Zinnschlag
|
e2ccec99f0
|
Issue #219: added another missing PC stats filter
|
12 years ago |
|
Marc Zinnschlag
|
586ac3f5c6
|
Issue #219: added some more stats filters; fixed two filters
|
12 years ago |
|
Marc Zinnschlag
|
77ba8c5117
|
Issue #219: implemented rank requirement filter
|
12 years ago |
|
scrawl
|
8e847fdc6e
|
fix speechcraft skill increasing when persuade didn't succeed
|
12 years ago |
|
scrawl
|
11a8d5d70a
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap
|
12 years ago |
|
scrawl
|
7c22690116
|
Merge branch 'next' into globalmap
|
12 years ago |
greye
|
623e00531d
|
fix reentering race selection
|
12 years ago |
|
greye
|
0d33d005a5
|
head/hair selection
|
12 years ago |
|
greye
|
50867e8d87
|
fix gender selection update, main model visibility and couple of crashes
|
12 years ago |
|
Marc Zinnschlag
|
75f64aa38b
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.hpp
apps/openmw/mwmechanics/npcstats.cpp
apps/openmw/mwmechanics/npcstats.hpp
|
12 years ago |
|
Marc Zinnschlag
|
dc8f74138b
|
Merge branch 'next'
|
12 years ago |
|
Marc Zinnschlag
|
7b1788b03b
|
minor fix
|
12 years ago |
|
Marc Zinnschlag
|
0ab4068fbd
|
Merge remote-tracking branch 'scrawl/persuasion' into next
|
12 years ago |
|
Marc Zinnschlag
|
6dc2214502
|
Issue #219: more DialogueManager refactoring
|
12 years ago |
|
Marc Zinnschlag
|
79706bf60f
|
Issue #219: dialogue manager cleanup
|
12 years ago |
|
Marc Zinnschlag
|
d24e3eec9f
|
Issue #219: added filters for various player stats
|
12 years ago |
|
Marc Zinnschlag
|
f8fcca64b6
|
Issue #219: Proper implementation of talked to PC filter
|
12 years ago |
|
Marc Zinnschlag
|
7e8d4bb3c9
|
Issue #219: added various creature and NPC stats; implemented respective filters
|
12 years ago |
|
scrawl
|
5fdc7ad809
|
forgot to add file
|
12 years ago |
|
Marc Zinnschlag
|
d15eb6cd17
|
Merge remote-tracking branch 'greye/player-model' into next
|
12 years ago |
|
Marc Zinnschlag
|
e97f3003ab
|
Issue #219: added expelled status tracking; implemented expelled filter
|
12 years ago |
|
Marc Zinnschlag
|
bd2c772dae
|
Issue #219: implemented player skill and attribute filter
|
12 years ago |
|
Marc Zinnschlag
|
d6961c0246
|
Issue #219: made all unimplemented filters return false
|
12 years ago |
|
Marc Zinnschlag
|
ceaf1677ce
|
Issue #219: rewrote AI settings and implemented AI settings filters
|
12 years ago |
|
Marc Zinnschlag
|
eb4e72aaa7
|
Issue #219: implemented disease filters
|
12 years ago |
|
Marc Zinnschlag
|
c425b3f4a3
|
Issue #219: fixed function decoding and moved choice function from DialogueManager to Filter
|
12 years ago |
|
Marc Zinnschlag
|
a752536cea
|
Issue #219: added function decoding and moved same faction function from DialogueManager to Filter
|
12 years ago |
|
greye
|
235b565bb7
|
update main character model
|
12 years ago |
|
greye
|
b1ef0026a9
|
race selection/inventory preview character model update
|
12 years ago |
|
scrawl
|
92bba18218
|
removed useless member
|
12 years ago |
|
scrawl
|
553ea08eae
|
consider temporary disposition change when trading
|
12 years ago |
|
scrawl
|
94aeb15220
|
bartering disposition change
|
12 years ago |
|
scrawl
|
33b4b29fbc
|
persuasion mechanics, added reputation
|
12 years ago |
|
scrawl
|
ace9ee9c83
|
persuasion dialog
|
12 years ago |
|
scrawl
|
f6a9029c4b
|
bounty & disease disposition effect
|
12 years ago |
|
Marc Zinnschlag
|
4994a253da
|
Merge branch 'bountydisease' into dialogue
|
12 years ago |
|
Marc Zinnschlag
|
be1334b202
|
disease tests
|
12 years ago |
|
Marc Zinnschlag
|
0727d943b1
|
Merge branch 'next' into bountydisease
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
|
12 years ago |
|
scrawl
|
d53a7ade1e
|
method names, disposition uint->int
|
12 years ago |
|
Marc Zinnschlag
|
39ff2f06ce
|
added bounty to NpcStats
|
12 years ago |
|
scrawl
|
ae78eaeb28
|
fixed training, fixed todo comments
|
12 years ago |