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 |
Emanuel Guevel
|
ad3478c8f2
|
Fix inverted dialogue functions (NotClass etc.)
The comparison present is useless for these functions.
|
12 years ago |
scrawl
|
6c1ff8caca
|
Merge branch 'master' into next
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
|
12 years ago |
scrawl
|
dd57eabc3e
|
Better use an enum for magic effect IDs
|
12 years ago |
scrawl
|
e8b08326dc
|
Corrected Id, Race, Class, Faction and Cell select functions to do the exact opposite as before. That is how they are displayed in the CS, anyway.
|
12 years ago |
scrawl
|
cebcbe11f8
|
Implemented service refusal
|
12 years ago |
scrawl
|
7ab236337b
|
Dialogue responses should be random only for persuasion results
|
12 years ago |
Marc Zinnschlag
|
dc3edc6024
|
Merge branch 'vartype'
|
12 years ago |
Marc Zinnschlag
|
1489570b09
|
change variant in info record to new type
|
12 years ago |
Marc Zinnschlag
|
0f4f91605a
|
some cleanup
|
12 years ago |
lazydev
|
ccb7ed93b3
|
fix for https://bugs.openmw.org/issues/593
|
12 years ago |
Emanuel Guevel
|
0bc4c3556a
|
Fix dialogue gender filter
|
12 years ago |
Emanuel Guevel
|
19dff822f4
|
Dialogue: do not filter on disposition for creatures
|
12 years ago |
Emanuel Guevel
|
ed9a9904b4
|
Dialogue filter: search script variables case-insensitively
|
12 years ago |
Emanuel Guevel
|
736e471613
|
Print a fallback text when no topic response is found
|
12 years ago |
Emanuel Guevel
|
43e85ea0c6
|
Disallow redirection to info refusal for greetings
|
12 years ago |
Emanuel Guevel
|
951eb1b236
|
Dialogue: return a response from "Info Refusal" when disposition is not satisfied
|
12 years ago |
Tom Mason
|
abe25c5f66
|
removed use of c++11 auto
|
12 years ago |
Nathan Jeffords
|
f55da17933
|
made some journal accessor methods constant
|
12 years ago |
Nathan Jeffords
|
4c7ae3d1ff
|
prevent duplicate journal entries from being recorded
|
12 years ago |
Nathan Jeffords
|
528c3da6da
|
record heard topics in journal
|
12 years ago |
Nathan Jeffords
|
d6b956cdcf
|
fixed swapped day & month fields when created a stamped journal entry
|
12 years ago |
Marc Zinnschlag
|
82b790770d
|
Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'
|
12 years ago |
Emanuel Guevel
|
4feaa66897
|
Do not open the dialogue window if no greeting is found
|
12 years ago |
Emanuel Guevel
|
9e00c6694f
|
Allow only ID filtered topics for dialogue with creatures
|
12 years ago |
Emanuel Guevel
|
f1f9173f24
|
Prevent closing dialogue window when an answer is expected
|
12 years ago |
eduard
|
2dc0064cc2
|
more string lowercase
|
12 years ago |
lazydev
|
7cd1e87fe8
|
Merge branch 'master' of git://github.com/zinnschlag/openmw
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
|
12 years ago |
greye
|
7e0713f6c4
|
fix string case update
|
12 years ago |
lazydev
|
cd5d95ed22
|
1. Dialogs in Russian version now works.
2. Destination names it travel window are now translated
|
12 years ago |
eduard
|
69d9d22579
|
comparestring
|
12 years ago |
eduard
|
fb25f407fb
|
dialoguemanager conflict
|
12 years ago |
eduard
|
c85400b809
|
Merge https://github.com/zinnschlag/openmw into comparestring
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwworld/worldimp.cpp
components/esm_store/reclists.hpp
components/misc/stringops.hpp
|
12 years ago |
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
|
d7af9fbec6
|
various fixes
|
12 years ago |
Marc Zinnschlag
|
89c7936534
|
fixed dialogue script error reporting
|
12 years ago |
Marc Zinnschlag
|
82d62eb95a
|
Merge branch 'script'
|
12 years ago |
Marc Zinnschlag
|
9669eed083
|
Issue #219: added last missing function filters
|
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 |
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 |
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
|
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 |
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
|
235397dde8
|
Issue #219: added missing implemented for isInverted function
|
12 years ago |
Marc Zinnschlag
|
f5972a3080
|
Issue #219: Support for boolean select structs
|
12 years ago |
Marc Zinnschlag
|
b412ebd0af
|
Issue #219: Supoort for inverted select structs
|
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 |
greye
|
2fa4ac177a
|
initial resolving
|
12 years ago |
greye
|
721324c1db
|
rm record inheritance, rework esmtool accordingly
|
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 |
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
12 years ago |
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
12 years ago |
Adam Hogan
|
ebf80943a9
|
Added spell buying window
|
12 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
|
484cce12a8
|
Issue #107: removed redundant getStore function from window manager
|
13 years ago |
Marc Zinnschlag
|
0231533d05
|
Issue #107: InputManager is accessed only through the interface class from now on
|
13 years ago |
Marc Zinnschlag
|
b68f9d6a28
|
Issue #107: MechanicsManager is accessed only through the interface class from now on
|
13 years ago |
Marc Zinnschlag
|
b53b27533a
|
fixes some include guards
|
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 |