Commit Graph

99 Commits (master)

Author SHA1 Message Date
David Cernat cedf70f367 Add OpenMW commits up to 13 Apr 2021
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/actors.cpp
#   apps/openmw/mwmechanics/summoning.cpp
#   apps/openmw/mwphysics/mtphysics.hpp
4 years ago
fredzio fda639eb57 Remove unused forward declarations 4 years ago
David Cernat da3316daf8 Add OpenMW commits up to 4 Jan 2021
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwmechanics/npcstats.hpp
#   apps/openmw/mwphysics/actor.cpp
#   apps/openmw/mwphysics/mtphysics.hpp
#   components/CMakeLists.txt
4 years ago
David Cernat db32f7f9f8 [Client] Use ObjectDialogueChoice for highlighted topics in dialogue
The packet is now sent not just for items in the list on the right of the dialogue screen, but also for the clickable topics in the dialogue text itself.
4 years ago
David Cernat 1a4b817b31 [General] Rework ObjectDialogueChoice for multilingual compatibility
Use a different system for sending and applying ObjectDialogueChoice packets.
4 years ago
Alexei Dobrohotov 817ac4cfbd Don't regenerate the topics list unconditionally 4 years ago
David Cernat 7f435ceeac Add OpenMW commits up to 1 Nov 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwclass/container.hpp
#   apps/openmw/mwclass/creature.hpp
#   apps/openmw/mwclass/npc.hpp
#   apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#   apps/openmw/mwdialogue/journalimp.hpp
#   apps/openmw/mwgui/container.cpp
#   apps/openmw/mwgui/dialogue.hpp
#   apps/openmw/mwgui/mainmenu.cpp
#   apps/openmw/mwgui/windowmanagerimp.hpp
#   apps/openmw/mwmechanics/aiactivate.hpp
#   apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#   apps/openmw/mwscript/containerextensions.cpp
#   apps/openmw/mwscript/interpretercontext.hpp
#   components/CMakeLists.txt
4 years ago
David Cernat 9dcb0f4c32 [General] Implement ObjectDialogueChoice packet 4 years ago
Andrei Kortunov 8ca3c3b123 Mark overrided methods by override keyword 4 years ago
fredzio 947f3cf13c Optionally change color of keywords in the dialogue window based on the
next answer:
- if the answer was already heard, apply "color topic exhaused" setting
- if the answer was never heard, and the current actor is specified in
the dialog, apply "color topic specific"
- otherwise, do nothing special
5 years ago
Capostrophic fbcc8ef046 Reset dialogue history when the window can't track what closed it 5 years ago
Capostrophic 9dbdbbaea7 Only clear dialogue history if the dialogue window is closed (bug #5358) 5 years ago
Andrei Kortunov a79955352f Revert MR !103 and !105 since they cause issues with dialogue window 6 years ago
Phillip A c4d5203e14 Fix MR !103 breaking of dialogue with actors with no greetings 6 years ago
scrawl 7c5d2a1ac4 Update dialogue topics list after result script is run
Regression from 0.42.
7 years ago
scrawl e564dd842e Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response (Fixes #4166)
Don't delete Link objects prematurely (Fixes #4171)
7 years ago
Andrei Kortunov eaff7e30aa Fix a 'Good Beast' companion window 7 years ago
scrawl 03554b2f4b Fix some style issues flagged by cppcheck 7 years ago
scrawl 7a64098da3 Avoid rebuilding the dialogue topics pane unnecessarily
Also retaining key focus.
7 years ago
scrawl 1714271a76 Improve KeyboardNavigation to better handle modal windows
It's no longer possible to cycle to widgets that aren't part of the current modal window.

The window manager will remember the focused widget of a modal window on a limited basis (it'll be discarded when a different modal window opens).
7 years ago
scrawl 2ce79e07a4 Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways.
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
7 years ago
scrawl c5613e384e Remove duplicate disposition code 7 years ago
scrawl 717e68fab2 Remove redundant resetHistory argument 7 years ago
scrawl 19e07fad30 Remove redundant Services enum 7 years ago
scrawl b7752ec52d Make TradeWindow not depend on DialogueWindow 7 years ago
scrawl e7d2a8a4dc Call clear() for every window 7 years ago
scrawl 2b03bc0c56 Call WindowBase::onFrame() for every active window 7 years ago
scrawl 4fff2e2e34 Refactor exitCurrentGuiMode 7 years ago
scrawl 01391b7eed Rename WindowBase's open/close to onOpen/onClose 7 years ago
scrawl c203a0774a Adjust some layouts to take better advantage of keyboard navigation 7 years ago
Julian d7aa2a882d improve dialogue window performance 8 years ago
Andrei Kortunov 4bb9622c21 Handle greetings differently from responses 8 years ago
Andrei Kortunov 7d09a5d644 Progress bars vertical alignment 8 years ago
scrawl 5b9d10f851 Reduce includes in MWGui 10 years ago
scrawl eecea4131f Reduce MyGUI includes 10 years ago
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
10 years ago
scrawl 6b65502557 Add properties for new widget classes to MyGUI plugin 10 years ago
scrawl ac97a0f99d Fix dialogue choices being displayed in incorrect order 10 years ago
scrawl c6d3b0b70b Moved merchant restock from trade start to dialogue start, since other services also interact with it. 11 years ago
scrawl 44fd526c98 Don't show disposition bar for creatures 11 years ago
scrawl a90245147b Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor (Fixes #1423) 11 years ago
Digmaster e0356cf89d Added support to close modal windows with Esc 11 years ago
Digmaster e3e51324a4 Esc button exits all non-modal GUI windows 11 years ago
scrawl 5eeed03f5b Only exchange bribe gold if the bribe was accepted 11 years ago
Jeffrey Haines 3e8f7b3bae made mReceiver private 11 years ago
Jeffrey Haines 13d330e427 Feature #1233 Bribe gold not in inventory
Gold is now put into inventory receivers when bribing.
11 years ago
scrawl d43adbaa7c Topic link fixes for russian version, thanks to greye for testing 12 years ago
scrawl 166eac2e25 Cleanup 12 years ago
scrawl d16bb26a48 Added text colors, goodbye, message 12 years ago
scrawl 78e6dab9d2 Dialogue history rewrite WIP 12 years ago