Commit Graph

259 Commits (ae5f783a1650b8d65a2b65eeae149ab5729ef473)

Author SHA1 Message Date
Marc Zinnschlag 367919200f moved CellRefList into a separate file 11 years ago
Marc Zinnschlag 7693f712bc started making CellStore into a proper class; encapsulated mCell member 11 years ago
Marc Zinnschlag 9f721fd144 store list of known topics in saved game files 11 years ago
scrawl f89b3cac02 Feature #764: Store the actor that gave the dialog response 11 years ago
scrawl a988a0d6dc Don't add duplicate topic responses to the journal 11 years ago
Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
11 years ago
scrawl 434fd21584 Don't set journal index if a higher index is currently set
This is vanilla behaviour, and required for the Mehra Milo vivec informants quest.
11 years ago
scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
11 years ago
scrawl 70264eae3b Feature #764: Quest completetion status in quest book 11 years ago
scrawl ea21d8fec3 Fix CreatureTargetted function 11 years ago
scrawl 4c94289b1f Fix PC Health Percent function 11 years ago
scrawl f89c400305 Don't complain about greetings with no sound 11 years ago
scrawl 589fbbd871 Issue #777: Create InventoryStore for creatures with weapons/shields 11 years ago
greye 15d946415e minor cleanup
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
11 years ago
scrawl 3a1b6dd354 Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected. 11 years ago
scrawl 9bf7bf529c Implement crime-related dialogue globals as they are described in MSFD 11 years ago
scrawl 19d63f392f Clean up the NpcStats expelled interface. Show message box when expelled. 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl c85c2cff4e Fix disposition changes from trades not applying properly 11 years ago
scrawl 62774fcc4a Merge branch 'master' into HEAD
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
11 years ago
scrawl 14b70a3ce6 Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead) 11 years ago
scrawl f4517c8221 For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire 11 years ago
scrawl 12691040d1 Fix incorrect disposition testing and get rid of of a related hack that is no longer needed. 11 years ago
scrawl a0d38dfb63 Fix highlighted topics being selectable when in a choice 11 years ago
Marc Zinnschlag 34cdd2bb1f deal with dialogue/info records that don't exist anymore 11 years ago
Marc Zinnschlag 2293b92efe storing and loading the journal 11 years ago
Marc Zinnschlag 0f971163f7 use Entry instead of plain string for topic and quest entries 11 years ago
Marc Zinnschlag b273f9e387 splitting JournalEntry into Entry and JournalEntry 11 years ago
Marc Zinnschlag 177aab536d storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1) 11 years ago
Marc Zinnschlag eed46960fe some spelling fixes 11 years ago
Marc Zinnschlag 9d64c92d33 store text in journal entries 11 years ago
Marc Zinnschlag 71436b1160 changed interface for global variable access 11 years ago
Marc Zinnschlag 9d7695ea88 added missing columns to topic info table 11 years ago
Chris Robinson e3d5a1b38d Dialog function 72 is not player-specific
It's used to force any NPC in werewolf form to play the appropriate
growls for combat.
12 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
Chris Robinson d8ec813939 Say something from the "hit" dialog topic when losing health 12 years ago
scrawl c41f119ba6 Added new game button 12 years ago
scrawl 78e6dab9d2 Dialogue history rewrite WIP 12 years ago
Marc Zinnschlag 247a76766d fixed a typo in a doxygen comment 12 years ago
scrawl baa7a9160c Rank condition should always fail if NPC is not in a faction 12 years ago
scrawl 51580ead4f Fix consecutive dialogue choices 12 years ago
Marc Zinnschlag 7136ac0079 added missing attribute columns to faction table 12 years ago
Marc Zinnschlag f9f520df34 adjusted faction record to increase consistency with other records 12 years ago
scrawl b0199c703c Companion UI 12 years ago
lazydev 38d19d33d8 fix for #634 12 years ago
scrawl 20774f8f81 Added merchant repair feature 12 years ago
Marc Zinnschlag cd84b68e4b silencing some warnings 12 years ago
Marc Zinnschlag 775f9e8402 Merge remote-tracking branch 'potatoesmaster/dialogue' into next 12 years ago
Emanuel Guevel 8de93db488 Coding style consistence 12 years ago
Emanuel Guevel f25b56ac88 Add dialogue function: NotLocal 12 years ago