mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 02:49:55 +00:00
Code Issues Releases Wiki Activity
17013 commits 38 branches 54 tags 122 MiB
Commit graph

347 commits

Author SHA1 Message Date
Marc Zinnschlag
a6d30bc2e3 consider --script-warn when running with --script-all-dialogue 2014-12-18 10:20:15 +01:00
Marc Zinnschlag
1f74d8cca5 Merge remote-tracking branch 'scrawl/scripttest' 2014-12-13 12:49:33 +01:00
scrawl
ba65c6cc7f Add --script-all-dialogue switch to compile all dialogue scripts (Fixes #1659) 2014-12-13 02:51:18 +01:00
scrawl
2ebf328dec Always print the failing dialogue script 
These aren't usually very long, so printing them shouldn't spam the console by too much.
 2014-12-13 00:39:24 +01:00
MiroslavR
5a7dbb19f7 Code clarity 2014-10-20 01:10:08 +02:00
MiroslavR
ed6bdc0bde Use all topics to search for keywords in dialogues (Fixes #2013) 
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
 2014-10-18 20:07:40 +02:00
scrawl
c4fa671381 Don't allow raising faction rank if the next rank has no name (Fixes #1975) 2014-10-05 16:47:55 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
e54ba2c5d1 Fix broken dialogue Function_HealthPercent 2014-09-13 20:39:58 +02:00
scrawl
d8943aef2f Encapsulate magic effect magnitude (Feature #1489) 2014-08-17 03:58:04 +02:00
scrawl
e508450c1c Add persuasion GMST to ensureNeededRecords (Fixes #1817) 2014-08-17 03:58:03 +02:00
Marc Zinnschlag
c9cd7fb6b7 Merge branch 'scripts' 2014-07-28 09:02:24 +02:00
Marc Zinnschlag
f6b502b195 rewrote dialgoue filter access to local variables 2014-07-25 09:08:59 +02:00
scrawl
d4ffd30f98 Implement Rank filter with no faction given (Fixes #1660) 2014-07-17 20:57:37 +02:00
scrawl
f9a39138cc Add missing endline 2014-07-17 16:16:14 +02:00
scrawl
8b404ee255 Fix not being able to exit dialogue using Escape when a Goodbye link appears 2014-07-13 06:42:24 +02:00
scrawl
28feb260eb Implement disposition/distance based aggression (Fixes #1520) 2014-06-16 20:05:53 +02:00
scrawl
0aba1088a1 Attempt to open companion window if no greetings are found (Bug #1507) 2014-06-16 02:52:25 +02:00
scrawl
1adb81abd0 Sort using ciLess, not ciEqual 2014-06-15 14:18:16 +02:00
scrawl
88f8f25ffa Don't allow scripted dialogue with dead actors (Fixes #1493) 2014-06-15 14:18:16 +02:00
scrawl
2dd54dbcfc Implement ClearInfoActor script instruction (Fixes #1422) 2014-06-10 18:49:41 +02:00
scrawl
a90245147b Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor (Fixes #1423) 2014-06-10 18:46:16 +02:00
scrawl
1ed3f092c1 Implement text replacement for journal topic responses (Fixes #1429) 2014-06-10 15:42:50 +02:00
scrawl
865486604f Make trade disposition changes temporary again, as in vanilla 2014-05-31 13:57:07 +02:00
scrawl
0b45a9e6b2 Fix case folding for faction reaction from ESX records 2014-05-27 19:02:48 +02:00
scrawl
e266c39c5d Implement modFactionReaction instruction (Closes #1347) 2014-05-27 14:54:29 +02:00
scrawl
b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
 2014-05-23 08:39:48 +02:00
scrawl
df8e095c83 Small cleanup 2014-05-22 23:27:54 +02:00
Emanuel Guevel
1e4a854433 Remove static method MWWorld::Class::get(&Ptr) 
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
 2014-05-22 20:50:00 +02:00
scrawl
3380e1e1c5 Fix ShouldAttack filter 
This makes NPCs exit dialogue properly when they should attack as a result of taunting actions.
 2014-05-22 12:20:25 +02:00
scrawl
1677fcf324 Dialogue merging 2014-05-18 15:25:16 +02:00
scrawl
5fc2b1a41b Allow setting a journal index even if there's no related journal entry 
This is used by the MV_SlaveMule quest.
 2014-05-18 07:39:16 +02:00
scrawl
e1458453f3 Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group 
Could be observed in TG_OverduePayments quest when talking to Trasteve about Dwemer Artifacts.

Info Refusal responses are not specific to any particular topic, so they should not be added to the journal. Trying to do so anyway will cause "unknown id" exceptions because MWDialogue::Entry expects the infoId to be from the Dialogue for the supplied topic.
 2014-05-18 06:52:15 +02:00
scrawl
872d9be1b4 Fix potential issue with dialogue globals 
Make sure they are updated throughout the conversation
 2014-05-09 19:19:21 +02:00
scrawl
27a05027f4 Fixes #1172: Added basic loading/saving progress bar 
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
 2014-04-28 11:29:57 +02:00
scrawl
f921f2e7db Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last. 
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
 2014-04-26 12:04:37 +02:00
scrawl
b13b25dd1b Fixes #1295: Support partial matches in Cell filter 2014-04-26 11:03:17 +02:00
scrawl
5eeed03f5b Only exchange bribe gold if the bribe was accepted 2014-03-30 00:12:31 +01:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
Marc Zinnschlag
7693f712bc started making CellStore into a proper class; encapsulated mCell member 2014-02-21 11:35:46 +01:00
Marc Zinnschlag
9f721fd144 store list of known topics in saved game files 2014-02-16 12:54:27 +01:00
scrawl
f89b3cac02 Feature #764: Store the actor that gave the dialog response 2014-02-01 18:42:01 +01:00
scrawl
a988a0d6dc Don't add duplicate topic responses to the journal 2014-02-01 18:42:00 +01:00
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
 2014-02-01 18:16:32 +01:00
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.
 2014-01-29 15:37:27 +01:00
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
 2014-01-24 18:28:35 +01:00
scrawl
70264eae3b Feature #764: Quest completetion status in quest book 2014-01-23 13:08:56 +01:00
scrawl
ea21d8fec3 Fix CreatureTargetted function 2014-01-22 13:30:45 +01:00
scrawl
4c94289b1f Fix PC Health Percent function 2014-01-22 13:30:07 +01:00
scrawl
f89c400305 Don't complain about greetings with no sound 2014-01-22 00:02:43 +01:00
scrawl
589fbbd871 Issue #777: Create InventoryStore for creatures with weapons/shields 2014-01-19 11:43:23 +01:00
greye
15d946415e minor cleanup 
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
 2014-01-14 12:46:53 +04:00
scrawl
3a1b6dd354 Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected. 2014-01-13 10:18:02 +01:00
scrawl
9bf7bf529c Implement crime-related dialogue globals as they are described in MSFD 2014-01-09 00:40:25 +01:00
scrawl
19d63f392f Clean up the NpcStats expelled interface. Show message box when expelled. 2014-01-08 18:59:00 +01:00
scrawl
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +01:00
scrawl
c85c2cff4e Fix disposition changes from trades not applying properly 2014-01-08 01:46:42 +01:00
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
 2014-01-06 00:23:17 +01:00
scrawl
14b70a3ce6 Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead) 2014-01-05 01:34:35 +01:00
scrawl
f4517c8221 For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire 2014-01-04 20:50:18 +01:00
scrawl
12691040d1 Fix incorrect disposition testing and get rid of of a related hack that is no longer needed. 2014-01-04 02:49:10 +01:00
scrawl
a0d38dfb63 Fix highlighted topics being selectable when in a choice 2013-12-19 00:26:08 +01:00
Marc Zinnschlag
34cdd2bb1f deal with dialogue/info records that don't exist anymore 2013-12-03 14:39:54 +01:00
Marc Zinnschlag
2293b92efe storing and loading the journal 2013-12-03 14:28:46 +01:00
Marc Zinnschlag
0f971163f7 use Entry instead of plain string for topic and quest entries 2013-12-01 14:50:25 +01:00
Marc Zinnschlag
b273f9e387 splitting JournalEntry into Entry and JournalEntry 2013-12-01 14:44:27 +01:00
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) 2013-11-30 12:41:18 +01:00
Marc Zinnschlag
eed46960fe some spelling fixes 2013-11-30 12:02:56 +01:00
Marc Zinnschlag
9d64c92d33 store text in journal entries 2013-11-30 11:57:33 +01:00
Marc Zinnschlag
71436b1160 changed interface for global variable access 2013-11-28 09:10:38 +01:00
Marc Zinnschlag
9d7695ea88 added missing columns to topic info table 2013-11-05 11:41:48 +01:00
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.
 2013-08-08 06:02:16 -07:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
Chris Robinson
d8ec813939 Say something from the "hit" dialog topic when losing health 2013-07-24 10:02:50 -07:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
Marc Zinnschlag
247a76766d fixed a typo in a doxygen comment 2013-04-25 10:27:43 +02:00
scrawl
baa7a9160c Rank condition should always fail if NPC is not in a faction 2013-04-25 02:31:39 +02:00
scrawl
51580ead4f Fix consecutive dialogue choices 2013-04-25 02:31:39 +02:00
Marc Zinnschlag
7136ac0079 added missing attribute columns to faction table 2013-04-04 10:58:53 +02:00
Marc Zinnschlag
f9f520df34 adjusted faction record to increase consistency with other records 2013-04-02 13:59:45 +02:00
scrawl
b0199c703c Companion UI 2013-03-31 13:13:46 +02:00
lazydev
38d19d33d8 fix for #634 2013-03-31 10:45:42 +02:00
scrawl
20774f8f81 Added merchant repair feature 2013-03-22 14:13:10 +01:00
Marc Zinnschlag
cd84b68e4b silencing some warnings 2013-03-20 20:55:48 +01:00
Marc Zinnschlag
775f9e8402 Merge remote-tracking branch 'potatoesmaster/dialogue' into next 2013-03-20 20:53:14 +01:00
Emanuel Guevel
8de93db488 Coding style consistence 2013-03-20 20:10:55 +01:00
Emanuel Guevel
f25b56ac88 Add dialogue function: NotLocal 2013-03-20 20:10:54 +01:00
Emanuel Guevel
ad3478c8f2 Fix inverted dialogue functions (NotClass etc.) 
The comparison present is useless for these functions.
 2013-03-20 20:10:54 +01:00
scrawl
6c1ff8caca Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
 2013-03-20 02:29:03 +01:00
scrawl
dd57eabc3e Better use an enum for magic effect IDs 2013-03-16 23:28:26 +01:00
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. 2013-03-16 20:52:05 +01:00
scrawl
cebcbe11f8 Implemented service refusal 2013-03-16 20:32:21 +01:00
scrawl
7ab236337b Dialogue responses should be random only for persuasion results 2013-03-14 21:33:00 +01:00
Marc Zinnschlag
dc3edc6024 Merge branch 'vartype' 2013-03-05 10:59:08 +01:00
Marc Zinnschlag
1489570b09 change variant in info record to new type 2013-03-05 10:34:03 +01:00
Marc Zinnschlag
0f4f91605a some cleanup 2013-03-02 11:19:48 +01:00
lazydev
ccb7ed93b3 fix for https://bugs.openmw.org/issues/593 2013-03-02 03:54:25 +04:00
Emanuel Guevel
0bc4c3556a Fix dialogue gender filter 2013-02-27 15:58:01 +01:00
Emanuel Guevel
19dff822f4 Dialogue: do not filter on disposition for creatures 2013-01-24 19:43:21 +01:00