pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								c54217d008 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into HEAD  
							
							... 
							
							
							
							Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp 
							
						 
						
							2014-02-19 19:26:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								1262eab03a 
								
							 
						 
						
							
							
								
								Added some nice error messages to the installation process  
							
							
							
						 
						
							2014-01-28 01:03:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								802448b217 
								
							 
						 
						
							
							
								
								Added a settings page to the launcher  
							
							
							
						 
						
							2014-01-27 20:14:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								fa186f5ec1 
								
							 
						 
						
							
							
								
								Added version information to the launcher  
							
							
							
						 
						
							2014-01-22 17:51:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								0f7f3391f7 
								
							 
						 
						
							
							
								
								WIP: Working on the installation of addons  
							
							
							
						 
						
							2014-01-17 13:21:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								40486370d9 
								
							 
						 
						
							
							
								
								Working on the Unshield functionality  
							
							
							
						 
						
							2013-12-25 18:52:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								3a37761d76 
								
							 
						 
						
							
							
								
								Some minor cleanups  
							
							
							
						 
						
							2013-12-24 23:47:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								445f96434e 
								
							 
						 
						
							
							
								
								Added Morrowind.ini detection logic  
							
							
							
						 
						
							2013-12-24 23:09:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								30710bad70 
								
							 
						 
						
							
							
								
								Modified components widget so the checked items can be stored for all pages to access  
							
							
							
						 
						
							2013-12-15 15:13:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								c82f0ec35f 
								
							 
						 
						
							
							
								
								Implemented the language selection page  
							
							
							
						 
						
							2013-12-13 15:30:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								d7f9604140 
								
							 
						 
						
							
							
								
								WIP: Working on the installation selection and added the ui for the language page  
							
							
							
						 
						
							2013-12-13 13:38:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								8162f8370b 
								
							 
						 
						
							
							
								
								Added all the pages to the wizard  
							
							
							
						 
						
							2013-12-08 21:35:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								f458f0c6c1 
								
							 
						 
						
							
							
								
								Added the Wizard .ui/resource files and some basic source to get started  
							
							
							
						 
						
							2013-12-07 23:17:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								9b483c3ae3 
								
							 
						 
						
							
							
								
								Fix for file path issues  
							
							
							
						 
						
							2013-10-26 22:55:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								f9591ddda6 
								
							 
						 
						
							
							
								
								Reimplemented constentselector view class  
							
							
							
						 
						
							2013-10-22 21:52:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								217a4d75b4 
								
							 
						 
						
							
							
								
								Implemented profile function in launcher datafiles page  
							
							... 
							
							
							
							Implemented dependency sorting to ensure dependent files appear latest
in the list. 
							
						 
						
							2013-10-06 21:13:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								00c78a4aa1 
								
							 
						 
						
							
							
								
								Implementing ContentSelector class in DataFilesPage  
							
							... 
							
							
							
							Moved AdjusterWidget / FileWidget to ContentSelectorView 
							
						 
						
							2013-10-01 21:29:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								513f0c4b3e 
								
							 
						 
						
							
							
								
								Implemented file/adjuster widgets into new addon creation dialog  
							
							
							
						 
						
							2013-09-22 23:52:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								cfdc19c427 
								
							 
						 
						
							
							
								
								Renamed esxSelector to contentSelector  
							
							... 
							
							
							
							Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file 
							
						 
						
							2013-09-21 23:06:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								244e581952 
								
							 
						 
						
							
							
								
								Finished implementing drag / drop  
							
							... 
							
							
							
							refactored datafilesmodel (now contentmodel)
refactored esmfil 
							
						 
						
							2013-09-19 06:53:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								a6e7cf9a8c 
								
							 
						 
						
							
							
								
								Implementing drag and drop  
							
							
							
						 
						
							2013-09-07 15:57:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								6898321676 
								
							 
						 
						
							
							
								
								Reenabling features  
							
							... 
							
							
							
							Profile functions enabled
New/load file functions partially enabled
Layout reorganized 
							
						 
						
							2013-08-20 08:16:56 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								b52645bf2a 
								
							 
						 
						
							
							
								
								Fixes to accommodate master/plugin loading  
							
							
							
						 
						
							2013-08-20 03:23:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								e614ec3353 
								
							 
						 
						
							
							
								
								Fixing profile code in progress...  
							
							
							
						 
						
							2013-08-18 17:11:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								f6217f9c6a 
								
							 
						 
						
							
							
								
								Moved esx selector classes out of global namespace  
							
							
							
						 
						
							2013-08-18 15:11:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								45277c0082 
								
							 
						 
						
							
							
								
								Minor changes  
							
							... 
							
							
							
							Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view 
							
						 
						
							2013-08-18 09:34:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								66e50343ad 
								
							 
						 
						
							
							
								
								Fixed row-selection/check feature  
							
							
							
						 
						
							2013-08-18 08:54:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								a9db983233 
								
							 
						 
						
							
							
								
								Fixing row-click selection  
							
							
							
						 
						
							2013-08-18 07:29:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								2878f51cd3 
								
							 
						 
						
							
							
								
								Reimplemented dependency selection feature  
							
							... 
							
							
							
							Moved more code to ContentSelector
Added support for omwgame and omwaddon files 
							
						 
						
							2013-08-17 19:40:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								49c4e1bf9e 
								
							 
						 
						
							
							
								
								Removed master table widget  
							
							
							
						 
						
							2013-08-16 18:23:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								84e5c2610a 
								
							 
						 
						
							
							
								
								Implemented combobox for game file selection  
							
							
							
						 
						
							2013-08-16 18:00:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sebastian Wick 
								
							 
						 
						
							
							
							
							
								
							
							
								a1fea97c3b 
								
							 
						 
						
							
							
								
								use SDL for resolution -> multimonitor support  
							
							
							
						 
						
							2013-06-23 03:49:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								b3595a6a2e 
								
							 
						 
						
							
							
								
								Fix for duplicate key/value pairs being written to settings.cfg, Bug  #755  
							
							
							
						 
						
							2013-06-02 21:43:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								f6203cac2a 
								
							 
						 
						
							
							
								
								update for master  
							
							
							
						 
						
							2013-05-07 20:33:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									pvdk 
								
							 
						 
						
							
							
							
							
								
							
							
								75f86f3a85 
								
							 
						 
						
							
							
								
								Some changes to the stylesheet and other small GUI improvements  
							
							
							
						 
						
							2013-03-12 01:03:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								b4d408af5d 
								
							 
						 
						
							
							
								
								Added actions to datafiles.ui and implemented them in the launcher  
							
							
							
						 
						
							2013-03-11 01:48:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								5e13614e08 
								
							 
						 
						
							
							
								
								Improved appearance of combobox and when using dark color themes  
							
							
							
						 
						
							2013-03-11 01:34:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								7504ae675b 
								
							 
						 
						
							
							
								
								Implemented a file dialog for the editor using launcher .ui  
							
							
							
						 
						
							2013-03-07 03:00:59 +01:00