Commit Graph

32 Commits (08484a46c7e8ed17202eb28d1cbf4f43799e5320)

Author SHA1 Message Date
pvdk 095ff4e17a Moved launcher settings stuff into components, so they can be reused in the wizard 11 years ago
graffy76 ed913936f8 Eliminated game & addon keys from profile configuration 11 years ago
graffy76 973803eb2f Fixed pathing issues in launcher 11 years ago
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
11 years ago
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>
11 years ago
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
11 years ago
graffy76 1a23cccce3 Implemented Launcher namespace 11 years ago
Lukasz Gromanowski ef617d408b Issue #913: Merge --master and --plugin switches
Merged master/plugin switches in launcher.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Marc Zinnschlag 12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 12 years ago
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
12 years ago
Marc Zinnschlag f0718c477f Merge remote-tracking branch 'darkf/issue-812' 12 years ago
darkf fb462f1b1a launcher: Throw error if no data files are selected 12 years ago
pvdk b3595a6a2e Fix for duplicate key/value pairs being written to settings.cfg, Bug #755 12 years ago
Marc Zinnschlag 54f56b0515 Merge remote-tracking branch 'graffy76/usersettings'
Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp
12 years ago
graffy76 f6203cac2a update for master 12 years ago
pvdk d5d14c5147 Fixes issue with multiple spaces in plugin filename not being read correctly 12 years ago
pvdk 52e5dcc7f0 Some fixes to the way data paths are saved and settings are handled 12 years ago
Pieter van der Kloet b209b6a0e6 Added missing includes 12 years ago
Pieter van der Kloet 9cd8dd39de Make the launcher code conform to the coding standards and cleanup 12 years ago
Pieter van der Kloet a0007325ad Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins 12 years ago
Pieter van der Kloet 17a0a201df Various fixes and changes to the settings handling 12 years ago
Pieter van der Kloet 919d1ee572 Some fixes to the settings handlers 12 years ago
Pieter van der Kloet 150d4a7a72 Added support for multiple ini files 12 years ago
Pieter van der Kloet 18d01cd65a Implemented a first-run dialog to import Morrowind.ini settings 12 years ago
Pieter van der Kloet 35b68a3c40 Fixed accidental profile deletion and added sorting by date 12 years ago
Pieter van der Kloet bcf4f96209 Added writing masters/plugins to openmw.cfg 12 years ago
Pieter van der Kloet 178cf2154e Made checking/unchecking work with the new datafiles model 12 years ago
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
12 years ago
Pieter van der Kloet 1b9cf8c23f More work on integrating the settings parser, profiles are handled correctly 12 years ago
Pieter van der Kloet aa25471517 WIP: working on improving the config file handling 12 years ago
Pieter van der Kloet 5579df30ff Implemented data/data-local support and added settingshandlers to main.cpp 12 years ago
Pieter van der Kloet 6faf6f57e1 Added settings file reader/writers for openmw.cfg and settings.cfg 12 years ago