mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 23:19:56 +00:00
Code Issues Releases Wiki Activity
24855 commits 38 branches 54 tags 122 MiB
Commit graph

402 commits

Author SHA1 Message Date
Leon Krieg
c7b4b2cdd7 Fixed multiple spelling mistakes 2016-12-14 16:39:33 +01:00
Allofich
1c54f54ab8 Fix shadowing warnings 2016-10-15 00:12:46 +09:00
Allofich
1c2e04747d Remove stray line 2016-10-13 23:38:21 +09:00
MiroslavR
14468262a7 Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577) 2016-10-11 02:53:43 +02:00
Allofich
028db21c8a Don't let disposition at end of dialogue be below 0 (Fixes #3584) 2016-10-10 02:20:24 +09:00
Allofich
53e94b7c3f Fix shadowing warnings 2016-10-06 23:33:52 +09:00
scrawl
b6230bd31f Reject weather dialogue conditions when in an interior cell (Fixes #3437) 2016-06-11 18:26:20 +02:00
scrawl
2ca7415708 Handle DialInfo::mFactionLess (Bug #3380) 2016-05-01 00:10:50 +02:00
scrawl
4854d6b093 Set the TalkedToPc flag for voiced dialogue (Fixes #3346) 2016-04-12 21:39:05 +02:00
scrawl
79eb2d20e0 Cleanup 2016-03-18 00:39:19 +01:00
scrawl
12ec90f9e7 Change default argument, fix GetDisposition 2016-03-18 00:38:02 +01:00
ae-g-i-s
c9791c5c1a Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233) 2016-03-08 21:30:28 +01:00
ae-g-i-s
2f1c6c740c Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)" 
This reverts commit 000597236e.
 2016-03-08 20:41:39 +01:00
ae-g-i-s
000597236e Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233) 2016-03-06 18:29:32 +01:00
scrawl
90a99991d1 Use empty() instead of !size() 2016-02-22 19:06:12 +01:00
scrawl
f315a4386f Accept an implicit reference in Journal (Fixes #3135) 2016-01-11 23:07:01 +01:00
scrawl
a9f0f30bb8 Reject conditions testing agaist Choice when not currently in a choice (Fixes #3117) 2016-01-01 23:55:52 +01:00
scrawl
0333c40047 Fix typo in SameRace dialogue function (function was inverted, Fixes #3116) 2016-01-01 02:59:55 +01:00
scrawl
2176ac592c Call updateDialogueGlobals before dialogue starts (Fixes #3034) 2015-12-19 21:58:49 +01:00
scrawl
04f7a8f8eb Remove redundant getId function 2015-12-18 16:58:38 +01:00
scrawl
8222c78cf2 Do not filter creature dialogue by NPC-only conditions (Fixes #3086) 2015-12-16 01:30:04 +01:00
scrawl
2737aabe93 Pc functions apply to creature dialogue (Fixes #3078) 2015-12-14 01:52:13 +01:00
scrawl
f875597be5 Don't use tolower() 
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
 2015-12-07 21:58:30 +01:00
scrawl
c912310c52 Don't add persuasion results to the journal 2015-12-01 16:16:21 +01:00
scrawl
d5a738bd39 Apply 27e669296e (locale-unaware tolower) to more code 
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
 2015-11-30 00:38:52 +01:00
scrawl
93565eccbf Update the dialogue topic list after running greeting script 2015-10-18 21:40:16 +02:00
scrawl
04df656f54 Remove some junk 2015-10-18 21:39:53 +02:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
scrawl
24ae1d5ace Fix some issues found by coverity 2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson
3655ef16af Explicitly instantiate ESM::StatState 2015-07-07 19:19:37 +02:00
scrawl
141e9d36a4 Get rid of unused DialogueManager::mScriptVerbose 2015-06-04 20:12:39 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
ac88326909 Exit out of choice when no responses are found (Fixes #2525) 2015-05-11 16:38:16 +02:00
scrawl
37a6d7da76 WindowManager refactoring 2015-03-11 20:04:25 +01:00
scrawl
e30f240ba2 Add travel service support for creatures (Fixes #2432) 2015-03-09 03:15:11 +01:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
Alexander "Ace" Olofsson
df5a08b6de Move manualref code out of header 2015-02-09 15:01:49 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
Marc Zinnschlag
c02c72e134 Merge remote-tracking branch 'jordan-ayers/topic/dialogue-set' 2015-01-30 18:23:14 +01:00
Jordan Ayers
419046e121 Dialogue: Use std::set for known topics in the manager. 
There were three different data structures being used for topic lists
in this code.  (map< string, true >, list< string >, and vector< string >)
Switch the local topic lists to set< string >.  This supports everything
the list and map were doing, reduces the variety of data structures, and
makes count (a more efficient search) available.

The vector has not changed, since it's tied to the ESM modules, and must
meet other requirements.
 2015-01-29 18:28:13 -06:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
scrawl
6367b4dc0b Improve INFO struct naming 2015-01-27 23:12:21 +01:00
scrawl
6f41e0d12e Reapply quest index when loading quest from savegame (Bug #2260) 2015-01-27 23:12:20 +01:00
scrawl
697ab16ec5 Fix for coverity defects 2015-01-27 19:00:26 +01:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00
scrawl
8b5effe3e0 Fix wrong magic number for JOUR in openmw savegames 2015-01-23 15:34:47 +01:00
scrawl
5104a5a023 Add missing setFactionReaction instruction, use absolute storage instead of difference 
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).

This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
 2015-01-20 00:53:31 +01:00
scrawl
c3f3f8b3d0 Use only Cell records for saving progress bar (Fixes #2259) 2015-01-11 18:01:06 +01:00
scrawl
579f5d232f Move interactive messageBox to separate function 2015-01-10 23:23:48 +01:00
scrawl
37bea9d4dc Fix exception for empty dialog topics (Fixes #2267) 2015-01-10 15:06:30 +01:00
scrawl
ce2cbab402 Dialogue: improve conflict resolution for chains of overlapping keywords (unit test for such a case will follow) 2015-01-09 20:08:52 +01:00
scrawl
ddd6e682bc Dialogue: add conflict resolution for overlapping keywords (Fixes #2245) 2015-01-09 04:19:38 +01:00
scrawl
cc9af9562b Function_CreatureTargetted should return '2' for werewolfs 
This makes NPCs say the correct attack voice files when fighting a werewolf.
 2014-12-24 15:45:12 +01:00
scrawl
4aed5158cc Support region names in cell dialogue filter (Fixes #2113) 2014-12-24 15:45:12 +01:00
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