a6e23d03d3
Don't clamp disposition twice, clamping is already done inside getDerivedDisposition
9 years ago
12ec90f9e7
Change default argument, fix GetDisposition
9 years ago
c9791c5c1a
Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves ( fixes #3233 )
9 years ago
5952498e9e
Explicitely cast a size_t to int
9 years ago
7d4125d97f
Fixes for building with unity build
9 years ago
77a1d947cc
extracted MWMechanics::getPlayer()
10 years ago
77f1387da8
Include cleanup
10 years ago
959fe3eb87
Reset the scrollbar position in the topic list when DialogueWindow is closed
10 years ago
5dc6cdeb99
Scroll to the top of the topic list when dialog is started
10 years ago
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
37a6d7da76
WindowManager refactoring
10 years ago
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
10 years ago
728b842e72
Use MyGUI::utility in favor of boost lexical_cast
10 years ago
eecea4131f
Reduce MyGUI includes
10 years ago
ddd6e682bc
Dialogue: add conflict resolution for overlapping keywords ( Fixes #2245 )
10 years ago
363d1f9207
Merge remote-tracking branch 'upstream/master'
10 years ago
fb542a64ec
Merchant items should be restocked instantly
10 years ago
462b41a3a8
Missing files, aka; Why you shouldn't stresscommit
10 years ago
f9ae0d9d66
Fix dialogue goodbye link conflicting with choice links
10 years ago
4d62541b62
fix usage of numeric_limits static functions min() and max()
...
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
10 years ago
7c52d05f85
Disable topics list visually when in a choice
10 years ago
7252cb63a6
Fix cppcheck issues
10 years ago
6b65502557
Add properties for new widget classes to MyGUI plugin
10 years ago
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
10 years ago
ac97a0f99d
Fix dialogue choices being displayed in incorrect order
10 years ago
cfc57d0fe0
Use MyGUI's castType for widget casts
10 years ago
c4ae07f48a
Remove partially broken sound pausing in main menu ( Fixes #1707 )
11 years ago
c6d3b0b70b
Moved merchant restock from trade start to dialogue start, since other services also interact with it.
11 years ago
8b404ee255
Fix not being able to exit dialogue using Escape when a Goodbye link appears
11 years ago
44fd526c98
Don't show disposition bar for creatures
11 years ago
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
dcc0e2d105
When dialogue goodbye is forced, allow using either the red link or the goodbye button
...
Fixes #1373
11 years ago
03d7137655
Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button
11 years ago
e0356cf89d
Added support to close modal windows with Esc
11 years ago
e0d55116a4
Dims and disabled Goodbye button in dialogs when unavailable.
11 years ago
e3e51324a4
Esc button exits all non-modal GUI windows
11 years ago
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. :)
11 years ago
7ab98f0c6f
Clear choices when dialogue starts
...
This is usually not needed, because it is not possible to exit dialogue while in a choice. However you can still exit dialogue by loading a different savegame.
11 years ago
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
11 years ago
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
11 years ago
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
11 years ago
eb5ef270ba
Bug 1047 update - defaults and edge case
...
Handles edge case where it was possible to highlight adjacent
sub-terms without whitespace between them.
Also makes ignoring words not prefixed by whitespace the
assumed behaviour.
11 years ago
9095a45ba7
Bug 1047 Fix
...
Dialog links can no longer be highlighted if they appear in the
middle of the word. This is achieved by confirming that the
character before a match is not alphabetic, so that words
following hyphens can still potentially match.
11 years ago
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
11 years ago
5eeed03f5b
Only exchange bribe gold if the bribe was accepted
11 years ago
6b28c06b2c
Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe
11 years ago
13d330e427
Feature #1233 Bribe gold not in inventory
...
Gold is now put into inventory receivers when bribing.
11 years ago
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
11 years ago
15d946415e
minor cleanup
...
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
11 years ago
0f5dc59176
Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.
11 years ago
scrawl
ae-g-i-s
Alexander "Ace" Olofsson
dteviot
Stanislav Bas
Rohit Nirmal
dteviot
Thoronador
Digmaster
Digmaster
Emanuel Guevel
Marc Zinnschlag
slothlife
Fil Krynicki
Jeffrey Haines
greye