| 
								
								
									 Marc Zinnschlag | d260e5c1bd | added file collection class | 2011-05-05 19:00:00 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 1487daac3d | Fixed preprocessor #if to #ifdef | 2011-05-04 03:22:23 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 0ff068817e | Fixed icon and changed minimumsize | 2011-05-03 16:26:22 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | dbd37a6d58 | Added messageboxes for game execution errors | 2011-05-03 16:16:53 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 2131452fac | Fixed file loading problem with relative paths when launcher wasn't run from cmdline | 2011-05-03 15:09:21 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | c42f99a586 | Implemented starting the game by pressing either the big play button or the dialog play button | 2011-05-03 03:17:01 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 2b0dabe669 | Changed profile switching again; Some stylesheet modifications | 2011-05-03 02:46:46 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 7bf21262a1 | Plugins and masters from the current profile are written to openmw.cfg now | 2011-05-03 02:01:25 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | a68be84b7f | Re-implemented the profile combobox on the Play page | 2011-05-03 01:23:35 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 4dbdc1cb26 | Implemented copy and delete profile functions | 2011-05-03 01:13:40 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 9e852a36bf | Changed all QList<> to const | 2011-05-03 00:47:12 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | ee4a2d0a8d | Fixed a problem with the currentprofile not being set in the combobox | 2011-05-03 00:43:44 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | ba3e4330f2 | Changed the way the masters get retrieved in masterSelectionChanged | 2011-05-03 00:36:20 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 2e058409bd | Fixed problem with profile writeout | 2011-05-02 23:06:11 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 314bac7862 | Preliminary support for new profiles and some other modifications and cleanups | 2011-05-02 22:21:42 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 557e659e15 | CMake modifications, stylesheet gets copied to destination dir now | 2011-05-02 20:07:37 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 366ade0e5f | Modified Play page, widgets are now properly centered | 2011-05-02 17:47:51 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | c22f39be8b | Merge remote-tracking branch 'upstream/master' | 2011-04-29 14:29:09 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 8256343d77 | Masters in the data directory are loaded now, even when they don't have dependent plugins | 2011-04-29 01:54:20 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 9a218b12c8 | Deleted some leftover resource files | 2011-04-28 23:08:05 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 1fc18075ff | Modified config loading function to always read/write from userPath There is no need for default (global) settings yet | 2011-04-28 22:54:50 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 7747c78584 | Fixed the use of path.hpp, which is in a CMake component now Also fixed some leftover lines from a wrongly modified conflict | 2011-04-28 22:23:42 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 7b554897e7 | Merge remote-tracking branch 'upstream/master' into newlauncher Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	components/esm/defs.hpp
	components/esm/loadappa.hpp
	components/esm/loadbody.hpp
	components/esm/loadclas.hpp
	components/esm/loadcrea.hpp
	components/esm/loadsndg.hpp
	components/interpreter/installopcodes.cpp | 2011-04-28 22:05:53 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 24f2c57c32 | Added missing resource file | 2011-04-28 21:55:10 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 4f18452ef6 | Merged clean newlauncher branch with config Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilesdialog.cpp
	apps/launcher/datafilesdialog.h
	apps/launcher/lineedit.hpp
	apps/launcher/maindialog.cpp
	apps/launcher/resources.qrc
	apps/launcher/resources/images/openmw-icon.png | 2011-04-28 21:55:09 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | e4129ce26e | Fixed config loading problem | 2011-04-28 21:55:09 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 64d636574e | More configfile stuff | 2011-04-28 21:55:09 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 0fc4767846 | Some renaming and ugly support for getPath | 2011-04-28 21:55:09 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 4ee748552b | More messing around with the launcher config file | 2011-04-28 21:55:09 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 5f6b4a853f | Removed leftover files | 2011-04-28 21:55:09 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | d8fa2f201a | improved description of openmw.cfg related cmake-variable | 2011-04-28 21:55:09 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | d47abff25d | create local openmw.cfg file for uninstalled version | 2011-04-28 21:55:08 +02:00 |  | 
				
					
						| 
								
								
									 Jan-Peter Nilsson | 1899e5dc1e | If there is an openmw.cfg in the current path, use it as global config | 2011-04-28 21:55:08 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 84ee3b585c | Added ability to get the previous profile when a new one is selected | 2011-04-28 21:55:08 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 04bc42a5c7 | Added combobox slot for changing the profile | 2011-04-28 21:55:08 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 274bce22c3 | Added writeConfig in Data Files tab and implemented the close button | 2011-04-28 21:55:08 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 5f19f6cfce | Added a function which returns the checked plugin names | 2011-04-28 21:55:08 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | e01afe1595 | Included new header | 2011-04-28 21:55:08 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | c911f62e8b | Added ability to get the previous profile when a new one is selected | 2011-04-28 21:55:07 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | be47750a45 | Added combobox slot for changing the profile | 2011-04-28 21:55:07 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | c68a4743bd | Added uncheck all function | 2011-04-28 21:55:07 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | a321685e7a | Modifications to the writeConfig function | 2011-04-28 21:55:07 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 8c4fad1f59 | Added writeConfig in Data Files tab and implemented the close button | 2011-04-28 21:55:07 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | de78b81a8f | Added a function which returns the checked plugin names | 2011-04-28 21:55:07 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | c17eed26f3 | Removed whitespace | 2011-04-28 21:55:06 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | a747bfb575 | Moved the stylesheet to the Play page | 2011-04-28 21:55:06 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 8f679218bd | Added stylesheet implementation for the Play tab | 2011-04-28 21:55:06 +02:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 94f3bc115f | Added missing resource file | 2011-04-28 21:55:06 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | d481222d92 | all program options (except help) can now be used from a cfg file | 2011-04-28 21:55:06 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 6dba09462a | change in multi_es branch broke fps switch; fixed now | 2011-04-28 21:55:05 +02:00 |  |