Marc Zinnschlag
|
cbb0fd5792
|
Merge branch 'dialogue'
|
2012-11-13 10:04:08 +01:00 |
|
Marc Zinnschlag
|
e2ccec99f0
|
Issue #219: added another missing PC stats filter
|
2012-11-12 14:02:49 +01:00 |
|
Marc Zinnschlag
|
586ac3f5c6
|
Issue #219: added some more stats filters; fixed two filters
|
2012-11-12 13:56:51 +01:00 |
|
Marc Zinnschlag
|
77ba8c5117
|
Issue #219: implemented rank requirement filter
|
2012-11-12 13:23:25 +01:00 |
|
scrawl
|
8e847fdc6e
|
fix speechcraft skill increasing when persuade didn't succeed
|
2012-11-11 19:18:41 +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
|
6dc2214502
|
Issue #219: more DialogueManager refactoring
|
2012-11-10 14:52:44 +01:00 |
|
Marc Zinnschlag
|
79706bf60f
|
Issue #219: dialogue manager cleanup
|
2012-11-10 14:31:58 +01:00 |
|
Marc Zinnschlag
|
d24e3eec9f
|
Issue #219: added filters for various player stats
|
2012-11-10 14:02:52 +01:00 |
|
Marc Zinnschlag
|
f8fcca64b6
|
Issue #219: Proper implementation of talked to PC filter
|
2012-11-10 13:31:10 +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
|
bd2c772dae
|
Issue #219: implemented player skill and attribute filter
|
2012-11-10 12:08:04 +01:00 |
|
Marc Zinnschlag
|
d6961c0246
|
Issue #219: made all unimplemented filters return false
|
2012-11-10 11:42:03 +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
|
eb4e72aaa7
|
Issue #219: implemented disease filters
|
2012-11-10 11:08:36 +01:00 |
|
Marc Zinnschlag
|
c425b3f4a3
|
Issue #219: fixed function decoding and moved choice function from DialogueManager to Filter
|
2012-11-10 09:48:20 +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
|
94aeb15220
|
bartering disposition change
|
2012-11-10 00:38:45 +01:00 |
|
scrawl
|
33b4b29fbc
|
persuasion mechanics, added reputation
|
2012-11-10 00:29:36 +01:00 |
|
Marc Zinnschlag
|
4994a253da
|
Merge branch 'bountydisease' into dialogue
|
2012-11-09 18:17:14 +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
|
bf4e855260
|
fixed creatures
|
2012-11-08 22:31:08 +01:00 |
|
Marc Zinnschlag
|
e6021a3fe3
|
Issue #219: moved checks for local and global variables from DialogueManager to Filter
|
2012-11-08 22:11:50 +01:00 |
|
Marc Zinnschlag
|
e68bb3481e
|
Issue #219: moved over the second batch of functions (boolean and one integer I forgot last time)
|
2012-11-08 21:48:17 +01:00 |
|
Marc Zinnschlag
|
91afef140b
|
Issue #219: moved first batch of integer type functions from DialogueManager to Filter
|
2012-11-08 21:16:49 +01:00 |
|
Marc Zinnschlag
|
235397dde8
|
Issue #219: added missing implemented for isInverted function
|
2012-11-08 17:29:10 +01:00 |
|
Marc Zinnschlag
|
f5972a3080
|
Issue #219: Support for boolean select structs
|
2012-11-08 17:04:44 +01:00 |
|
Marc Zinnschlag
|
b412ebd0af
|
Issue #219: Supoort for inverted select structs
|
2012-11-08 17:01:26 +01:00 |
|
Marc Zinnschlag
|
4614d2bc8e
|
Issue #219: added basic select struct analysis and type checking
|
2012-11-08 16:49:38 +01:00 |
|
Marc Zinnschlag
|
662054acf4
|
Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter
|
2012-11-08 14:55:31 +01:00 |
|
Marc Zinnschlag
|
1502b3f6f8
|
Issue #219: Begin of refactoring; added filter class (doesn't do anything yet)
|
2012-11-08 14:09:40 +01:00 |
|
Marc Zinnschlag
|
6c6c0dd1e3
|
Merge branch 'next' into dialogue
|
2012-11-08 13:45:20 +01:00 |
|
greye
|
b3ad872845
|
new interface in manualref, fix various typos
|
2012-11-06 13:43:48 +04:00 |
|
greye
|
e628b23da6
|
applying new interface vol.3, inconsistent
|
2012-11-05 21:45:35 +04:00 |
|
greye
|
d205723a17
|
resolving m prefix/ESMStore movement
|
2012-11-05 18:02:47 +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 |
|
Marc Zinnschlag
|
aabb1b8f3f
|
Issue #219: implemented death count filter
|
2012-11-04 13:26:04 +01:00 |
|
scrawl
|
c64eb96952
|
Merge branch 'Travel_Dialogue' into training_travel
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
|
2012-10-17 18:17:53 +02:00 |
|
scrawl
|
1a2034b4dd
|
training window
|
2012-10-17 18:03:02 +02:00 |
|
scrawl
|
ff2c2d2b96
|
Merge branch 'master' into spellcreation
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
|
2012-10-01 17:54:45 +02:00 |
|
greye
|
2fa4ac177a
|
initial resolving
|
2012-10-01 00:23:49 +04:00 |
|
greye
|
721324c1db
|
rm record inheritance, rework esmtool accordingly
|
2012-09-30 23:34:53 +04:00 |
|
gugus
|
4f5c4bf89a
|
Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwgui/dialogue.hpp
apps/openmw/mwgui/mode.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
|
2012-09-28 17:09:15 +02:00 |
|
scrawl
|
ac0c1ea986
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
Conflicts:
apps/openmw/mwgui/dialogue.cpp
|
2012-09-27 08:47:47 +02:00 |
|
gugus
|
3060fbee60
|
TravelGUI, not completly finished.
|
2012-09-26 18:30:47 +02:00 |
|
scrawl
|
9d7c35ae48
|
and go
|
2012-09-23 00:36:20 +02:00 |
|
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
2012-09-22 21:35:57 +02:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|