Pieter van der Kloet 2429f3960f Merge remote-tracking branch 'upstream/master' into launcher ...

Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp

2012-03-05 23:43:59 +01:00

..

resources

Created working icon for Windows and removed QMake file (not parsed by CMake)

2011-09-28 02:57:57 +02:00

CMakeLists.txt

Merge remote-tracking branch 'upstream/master' into launcher

2012-03-05 23:43:59 +01:00

combobox.hpp

Included new header

2011-04-28 21:55:08 +02:00

datafilespage.cpp

Merge remote-tracking branch 'upstream/master' into launcher

2012-03-05 23:43:59 +01:00

datafilespage.hpp

Launcher improvements: ask for data dir and write it to cfg if none is found

2012-02-28 17:19:44 +01:00

graphicspage.cpp

Merge remote-tracking branch 'upstream/master' into launcher

2012-03-05 23:43:59 +01:00

graphicspage.hpp

Fixed stylesheet and configuration problems with the launcher and code cleanup

2012-02-22 08:34:47 +01:00

launcher.rc

Renamed the launcher executable and icons, added .desktop file and default config, modified/updated some other files

2011-06-24 21:42:18 +02:00

lineedit.cpp

Fixed clear button in the filter line-edit and changed "delete profile" icon

2011-05-13 01:58:26 +02:00

lineedit.hpp

Added some more new files

2011-04-28 21:55:04 +02:00

main.cpp

Fixed stylesheet and configuration problems with the launcher and code cleanup

2012-02-22 08:34:47 +01:00

maindialog.cpp

Appended resources/ to the stylesheet path

2012-03-01 04:38:37 +01:00

maindialog.hpp

Fixed stylesheet and configuration problems with the launcher and code cleanup

2012-02-22 08:34:47 +01:00

naturalsort.cpp

Added support for the load order of plugins specified in the profiles

2011-06-07 01:42:53 +02:00

naturalsort.hpp

Added support for the load order of plugins specified in the profiles

2011-06-07 01:42:53 +02:00

playpage.cpp

Combobox hack should be applied to the play tab, not the data files tab. Fixed it.

2011-07-16 15:40:40 +02:00

playpage.hpp

Implemented starting the game by pressing either the big play button or the dialog play button

2011-05-03 03:17:01 +02:00

pluginsmodel.cpp

minor fix

2011-07-31 10:42:42 +02:00

pluginsmodel.hpp

Dropped plugins now retain their selection so you can see where they went

2011-06-08 16:55:53 +02:00

pluginsview.cpp

Removed debug messages and cleaned up some old code

2011-06-24 18:01:24 +02:00

pluginsview.hpp

Removed debug messages and cleaned up some old code

2011-06-24 18:01:24 +02:00

resources.qrc

Renamed the launcher executable and icons, added .desktop file and default config, modified/updated some other files

2011-06-24 21:42:18 +02:00