graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								ed913936f8 
								
							 
						 
						
							
							
								
								Eliminated game & addon keys from profile configuration  
							
							
							
						 
						
							2013-11-03 21:36:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								973803eb2f 
								
							 
						 
						
							
							
								
								Fixed pathing issues in launcher  
							
							
							
						 
						
							2013-11-03 00:02:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								8d12e2b99d 
								
							 
						 
						
							
							
								
								fixed merge conflicts  
							
							... 
							
							
							
							Merge branch 'saving' of https://github.com/zinnschlag/openmw  into esxSelector
Conflicts:
	apps/launcher/datafilespage.cpp
	apps/launcher/settings/gamesettings.hpp
	components/contentselector/model/contentmodel.cpp 
							
						 
						
							2013-11-02 09:31:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukasz Gromanowski 
								
							 
						 
						
							
							
							
							
								
							
							
								d51c9b64dd 
								
							 
						 
						
							
							
								
								Issue  #913 : Merge --master and --plugin switches  
							
							... 
							
							
							
							Launcher part of master/plugin switches merge.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com> 
							
						 
						
							2013-10-27 20:03:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								9ce4a04a2d 
								
							 
						 
						
							
							
								
								merge from saving  
							
							... 
							
							
							
							Merge branch 'saving' of https://github.com/zinnschlag/openmw  into esxSelector
Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp 
							
						 
						
							2013-10-25 14:44:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								1a23cccce3 
								
							 
						 
						
							
							
								
								Implemented Launcher namespace  
							
							
							
						 
						
							2013-10-25 11:17:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukasz Gromanowski 
								
							 
						 
						
							
							
							
							
								
							
							
								ef617d408b 
								
							 
						 
						
							
							
								
								Issue  #913 : Merge --master and --plugin switches  
							
							... 
							
							
							
							Merged master/plugin switches in launcher.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com> 
							
						 
						
							2013-09-29 09:14:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								12cfe1fdfe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'graffy76/recordStatusDelegate'  
							
							
							
						 
						
							2013-06-26 09:48:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								a73b97d125 
								
							 
						 
						
							
							
								
								Fixed broken references and other bugs  
							
							... 
							
							
							
							Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data 
							
						 
						
							2013-06-21 23:23:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f0718c477f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'darkf/issue-812'  
							
							
							
						 
						
							2013-06-17 15:02:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									darkf 
								
							 
						 
						
							
							
							
							
								
							
							
								fb462f1b1a 
								
							 
						 
						
							
							
								
								launcher: Throw error if no data files are selected  
							
							
							
						 
						
							2013-06-11 20:28:38 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								b3595a6a2e 
								
							 
						 
						
							
							
								
								Fix for duplicate key/value pairs being written to settings.cfg, Bug  #755  
							
							
							
						 
						
							2013-06-02 21:43:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								54f56b0515 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'graffy76/usersettings'  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp 
							
						 
						
							2013-05-16 18:04:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								f6203cac2a 
								
							 
						 
						
							
							
								
								update for master  
							
							
							
						 
						
							2013-05-07 20:33:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								d5d14c5147 
								
							 
						 
						
							
							
								
								Fixes issue with multiple spaces in plugin filename not being read correctly  
							
							
							
						 
						
							2013-04-25 11:04:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								52e5dcc7f0 
								
							 
						 
						
							
							
								
								Some fixes to the way data paths are saved and settings are handled  
							
							
							
						 
						
							2013-03-10 21:12:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								b209b6a0e6 
								
							 
						 
						
							
							
								
								Added missing includes  
							
							
							
						 
						
							2013-02-25 22:00:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								9cd8dd39de 
								
							 
						 
						
							
							
								
								Make the launcher code conform to the coding standards and cleanup  
							
							
							
						 
						
							2013-02-25 21:22:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								a0007325ad 
								
							 
						 
						
							
							
								
								Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins  
							
							
							
						 
						
							2013-02-25 01:22:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								17a0a201df 
								
							 
						 
						
							
							
								
								Various fixes and changes to the settings handling  
							
							
							
						 
						
							2013-02-25 00:56:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								919d1ee572 
								
							 
						 
						
							
							
								
								Some fixes to the settings handlers  
							
							
							
						 
						
							2013-02-24 04:14:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								150d4a7a72 
								
							 
						 
						
							
							
								
								Added support for multiple ini files  
							
							
							
						 
						
							2013-02-23 23:18:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								18d01cd65a 
								
							 
						 
						
							
							
								
								Implemented a first-run dialog to import Morrowind.ini settings  
							
							
							
						 
						
							2013-02-20 19:27:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								35b68a3c40 
								
							 
						 
						
							
							
								
								Fixed accidental profile deletion and added sorting by date  
							
							
							
						 
						
							2013-02-19 15:58:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								bcf4f96209 
								
							 
						 
						
							
							
								
								Added writing masters/plugins to openmw.cfg  
							
							
							
						 
						
							2013-02-18 23:10:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								178cf2154e 
								
							 
						 
						
							
							
								
								Made checking/unchecking work with the new datafiles model  
							
							
							
						 
						
							2013-02-18 17:59:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								ee27e3bb58 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/next' into settingsnext  
							
							... 
							
							
							
							Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp 
							
						 
						
							2013-02-15 15:21:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								1b9cf8c23f 
								
							 
						 
						
							
							
								
								More work on integrating the settings parser, profiles are handled correctly  
							
							
							
						 
						
							2013-02-15 01:20:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								aa25471517 
								
							 
						 
						
							
							
								
								WIP: working on improving the config file handling  
							
							
							
						 
						
							2013-02-11 15:01:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								5579df30ff 
								
							 
						 
						
							
							
								
								Implemented data/data-local support and added settingshandlers to main.cpp  
							
							
							
						 
						
							2013-01-26 18:19:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								6faf6f57e1 
								
							 
						 
						
							
							
								
								Added settings file reader/writers for openmw.cfg and settings.cfg  
							
							
							
						 
						
							2013-01-25 05:19:06 +01:00