Commit Graph

206 Commits (master)

Author SHA1 Message Date
eduard 8545667bbd string compare and tolower 12 years ago
Tom Mason f2c6907244 Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work 12 years ago
Marc Zinnschlag caaffd1ec2 handle persuasion records properly 12 years ago
Marc Zinnschlag 386eec51c1 some skill usage fixes 12 years ago
eduard e50b9aca86 tradding skill use, spechcraft use 12 years ago
eduard 2d62649dc9 tradding skill use, spechcraft use 12 years ago
eduard b2a0e4b1fd tradding skill use, spechcraft use 12 years ago
scrawl 1d7e92b6b3 dialogue fixes 12 years ago
Marc Zinnschlag 89c7936534 fixed dialogue script error reporting 12 years ago
Marc Zinnschlag 2a1727d4c5 improved error reporting for dialogue scripts (enabled via --script-verbose) 12 years ago
Marc Zinnschlag cbb0fd5792 Merge branch 'dialogue' 12 years ago
scrawl 8e847fdc6e fix speechcraft skill increasing when persuade didn't succeed 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 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
Marc Zinnschlag e97f3003ab Issue #219: added expelled status tracking; implemented expelled 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
scrawl 94aeb15220 bartering disposition change 12 years ago
scrawl 33b4b29fbc persuasion mechanics, added reputation 12 years ago
Marc Zinnschlag 4994a253da Merge branch 'bountydisease' into dialogue 12 years ago
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
12 years ago
scrawl bf4e855260 fixed creatures 12 years ago
Marc Zinnschlag e6021a3fe3 Issue #219: moved checks for local and global variables from DialogueManager to Filter 12 years ago
Marc Zinnschlag e68bb3481e Issue #219: moved over the second batch of functions (boolean and one integer I forgot last time) 12 years ago
Marc Zinnschlag 91afef140b Issue #219: moved first batch of integer type functions from DialogueManager to Filter 12 years ago
Marc Zinnschlag 4614d2bc8e Issue #219: added basic select struct analysis and type checking 12 years ago
Marc Zinnschlag 662054acf4 Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter 12 years ago
Marc Zinnschlag 1502b3f6f8 Issue #219: Begin of refactoring; added filter class (doesn't do anything yet) 12 years ago
Marc Zinnschlag 6c6c0dd1e3 Merge branch 'next' into dialogue 12 years ago
greye b3ad872845 new interface in manualref, fix various typos 12 years ago
greye e628b23da6 applying new interface vol.3, inconsistent 12 years ago
greye d205723a17 resolving m prefix/ESMStore movement 12 years ago
greye 2057f5619e move ESMStore to MWWorld 12 years ago
greye 3c2ce25f5f m prefix for mwworld/cellstore.hpp 12 years ago
Marc Zinnschlag aabb1b8f3f Issue #219: implemented death count filter 12 years ago
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
12 years ago
scrawl 1a2034b4dd training window 12 years ago
scrawl ff2c2d2b96 Merge branch 'master' into spellcreation
Conflicts:
	apps/openmw/mwbase/windowmanager.hpp
12 years ago
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
12 years ago
scrawl ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
Conflicts:
	apps/openmw/mwgui/dialogue.cpp
12 years ago
gugus 3060fbee60 TravelGUI, not completly finished. 12 years ago
scrawl 9d7c35ae48 and go 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
Adam Hogan ebf80943a9 Added spell buying window 13 years ago
greye a90547bbbe code formatting 13 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 13 years ago