Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								959fe3eb87 
								
							 
						 
						
							
							
								
								Reset the scrollbar position in the topic list when DialogueWindow is closed  
							
							
							
						 
						
							2015-06-01 23:49:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								5dc6cdeb99 
								
							 
						 
						
							
							
								
								Scroll to the top of the topic list when dialog is started  
							
							
							
						 
						
							2015-06-01 01:14:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rohit Nirmal 
								
							 
						 
						
							
							
							
							
								
							
							
								396fba7fa9 
								
							 
						 
						
							
							
								
								Silence -Wreorder warnings, and remove -Wno-reorder.  
							
							
							
						 
						
							2015-05-21 22:46:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								37a6d7da76 
								
							 
						 
						
							
							
								
								WindowManager refactoring  
							
							
							
						 
						
							2015-03-11 20:04:25 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								728b842e72 
								
							 
						 
						
							
							
								
								Use MyGUI::utility in favor of boost lexical_cast  
							
							
							
						 
						
							2015-01-10 03:01:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								eecea4131f 
								
							 
						 
						
							
							
								
								Reduce MyGUI includes  
							
							
							
						 
						
							2015-01-10 02:50:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ddd6e682bc 
								
							 
						 
						
							
							
								
								Dialogue: add conflict resolution for overlapping keywords ( Fixes   #2245 )  
							
							
							
						 
						
							2015-01-09 04:19:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								363d1f9207 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2014-12-30 23:01:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fb542a64ec 
								
							 
						 
						
							
							
								
								Merchant items should be restocked instantly  
							
							
							
						 
						
							2014-12-24 15:45:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander "Ace" Olofsson 
								
							 
						 
						
							
							
							
							
								
							
							
								462b41a3a8 
								
							 
						 
						
							
							
								
								Missing files, aka; Why you shouldn't stresscommit  
							
							
							
						 
						
							2014-12-19 11:26:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f9ae0d9d66 
								
							 
						 
						
							
							
								
								Fix dialogue goodbye link conflicting with choice links  
							
							
							
						 
						
							2014-12-01 23:09:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thoronador 
								
							 
						 
						
							
							
							
							
								
							
							
								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. 
							
						 
						
							2014-10-12 23:28:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7c52d05f85 
								
							 
						 
						
							
							
								
								Disable topics list visually when in a choice  
							
							
							
						 
						
							2014-09-28 14:00:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7252cb63a6 
								
							 
						 
						
							
							
								
								Fix cppcheck issues  
							
							
							
						 
						
							2014-09-26 17:48:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6b65502557 
								
							 
						 
						
							
							
								
								Add properties for new widget classes to MyGUI plugin  
							
							
							
						 
						
							2014-09-25 16:25:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e42cb8020e 
								
							 
						 
						
							
							
								
								Change all skins to get font colors from fallback settings ( Fixes   #704 )  
							
							
							
						 
						
							2014-09-20 10:40:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ac97a0f99d 
								
							 
						 
						
							
							
								
								Fix dialogue choices being displayed in incorrect order  
							
							
							
						 
						
							2014-09-18 04:10:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cfc57d0fe0 
								
							 
						 
						
							
							
								
								Use MyGUI's castType for widget casts  
							
							
							
						 
						
							2014-09-13 04:07:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c4ae07f48a 
								
							 
						 
						
							
							
								
								Remove partially broken sound pausing in main menu ( Fixes   #1707 )  
							
							
							
						 
						
							2014-08-16 02:01:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c6d3b0b70b 
								
							 
						 
						
							
							
								
								Moved merchant restock from trade start to dialogue start, since other services also interact with it.  
							
							
							
						 
						
							2014-07-28 02:27:48 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								44fd526c98 
								
							 
						 
						
							
							
								
								Don't show disposition bar for creatures  
							
							
							
						 
						
							2014-06-26 15:36:19 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								dcc0e2d105 
								
							 
						 
						
							
							
								
								When dialogue goodbye is forced, allow using either the red link or the goodbye button  
							
							... 
							
							
							
							Fixes  #1373  
						
							2014-06-01 00:21:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								03d7137655 
								
							 
						 
						
							
							
								
								Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button  
							
							
							
						 
						
							2014-05-29 06:19:25 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								e0356cf89d 
								
							 
						 
						
							
							
								
								Added support to close modal windows with Esc  
							
							
							
						 
						
							2014-05-27 03:00:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								e0d55116a4 
								
							 
						 
						
							
							
								
								Dims and disabled Goodbye button in dialogs when unavailable.  
							
							
							
						 
						
							2014-05-27 00:30:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								e3e51324a4 
								
							 
						 
						
							
							
								
								Esc button exits all non-modal GUI windows  
							
							
							
						 
						
							2014-05-26 23:13:37 -04: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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. 
							
						 
						
							2014-05-20 16:57:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								d08869a25d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwrender/localmap.cpp 
							
						 
						
							2014-05-15 08:13:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								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. 
							
						 
						
							2014-05-14 20:12:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								c160a04ede 
								
							 
						 
						
							
							
								
								Revert "Fixes for warnings when building with MSVC"  
							
							... 
							
							
							
							This reverts commit 46eb20b98c 
							
						 
						
							2014-05-14 00:03:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fil Krynicki 
								
							 
						 
						
							
							
							
							
								
							
							
								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. 
							
						 
						
							2014-05-10 17:47:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fil Krynicki 
								
							 
						 
						
							
							
							
							
								
							
							
								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. 
							
						 
						
							2014-05-10 17:05:15 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								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. 
							
						 
						
							2014-05-09 08:32:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5eeed03f5b 
								
							 
						 
						
							
							
								
								Only exchange bribe gold if the bribe was accepted  
							
							
							
						 
						
							2014-03-30 00:12:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeffrey Haines 
								
							 
						 
						
							
							
							
							
								
							
							
								6b28c06b2c 
								
							 
						 
						
							
							
								
								Feature  #1233  Bribe gold in inventory - Corrected 1000 drake bribe  
							
							
							
						 
						
							2014-03-29 07:47:41 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeffrey Haines 
								
							 
						 
						
							
							
							
							
								
							
							
								13d330e427 
								
							 
						 
						
							
							
								
								Feature  #1233  Bribe gold not in inventory  
							
							... 
							
							
							
							Gold is now put into inventory receivers when bribing. 
							
						 
						
							2014-03-28 21:16:42 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c8c0e5de38 
								
							 
						 
						
							
							
								
								Fixed code issues found with unity build. Missing include guards, duplicated functions, ...  
							
							
							
						 
						
							2014-03-16 23:49:06 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								0f5dc59176 
								
							 
						 
						
							
							
								
								Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.  
							
							
							
						 
						
							2014-01-08 23:37:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								098f9712f1 
								
							 
						 
						
							
							
								
								Add getPlayerPtr() utility method. Reduces dependencies a lot.  
							
							
							
						 
						
							2014-01-08 18:39:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a0d38dfb63 
								
							 
						 
						
							
							
								
								Fix highlighted topics being selectable when in a choice  
							
							
							
						 
						
							2013-12-19 00:26:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b6c22ad5d9 
								
							 
						 
						
							
							
								
								Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.  
							
							
							
						 
						
							2013-11-21 17:19:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									vorenon 
								
							 
						 
						
							
							
							
							
								
							
							
								4e8e048968 
								
							 
						 
						
							
							
								
								Added missing click sounds to dialogue  
							
							
							
						 
						
							2013-06-19 01:46:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									vorenon 
								
							 
						 
						
							
							
							
							
								
							
							
								76a2abcbe3 
								
							 
						 
						
							
							
								
								added missing line break in front of multiple choice questions  
							
							
							
						 
						
							2013-06-16 19:46:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									vorenon 
								
							 
						 
						
							
							
							
							
								
							
							
								4c0086b54c 
								
							 
						 
						
							
							
								
								Workaround for bug  #820  
							
							
							
						 
						
							2013-06-16 01:09:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								daab4f55a3 
								
							 
						 
						
							
							
								
								Use Morrowind's fonts  
							
							
							
						 
						
							2013-06-06 22:26:06 +02:00