scrawl
325d208b4a
Fix incorrect error message
2015-11-26 17:13:13 +01:00
cfcohen
046538984c
Fix duplicate filename in what() message. Use newly create cfgError
...
utility function consistently throughout code.
2015-11-26 01:49:14 -05:00
cfcohen
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
2015-11-25 13:17:03 -05:00
scrawl
5602cd9b7b
Fix the launcher's version label for builds with no git commit info
2015-08-06 02:54:47 +02:00
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
2015-07-18 03:09:04 +02:00
scrawl
c783b50a83
Fix config file priority in the launcher to match OpenMW
2015-07-18 01:38:35 +02:00
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
2015-06-16 19:53:41 +02:00
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
2015-06-14 16:32:13 +02:00
cc9cii
c22c9c271d
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
2015-06-14 14:51:01 +10:00
scrawl
de98d991b4
Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
...
Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2
2015-06-13 23:50:12 +02:00
scrawl
b7cd62e4de
Revert "Remove user preference setting option."
...
This reverts commit d3b7cf44d3
2015-06-13 23:49:27 +02:00
scrawl
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
2015-06-07 15:23:54 +02:00
cc9cii
d3b7cf44d3
Remove user preference setting option.
2015-06-07 13:29:45 +10:00
cc9cii
15fe5d88e2
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- controlled via a checkbox in launcher settings
2015-06-06 20:35:55 +10:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
Nikolay Kasyanov
7d321e0fb7
Fix #2557
...
Don’t show main dialog right away if wizard is selected.
2015-05-16 13:18:04 +03:00
scrawl
ccab8cc9a1
Register Player in the PhysicsSystem
2015-05-12 17:40:42 +02:00
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
Marc Zinnschlag
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
2015-02-26 19:05:30 +01:00
scrawl
5eadffd0c4
Make launcher's version label selectable so it can be copy-pasted into issue reports
2015-02-22 00:13:03 +01:00
dteviot
accc078e0e
Morrowind.ini import progress bar. ( Fixes #2344 )
...
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
2015-02-22 08:46:12 +13:00
scrawl
57a259c526
Remove references to no longer used font
2015-01-31 22:40:43 +01:00
dteviot
05b89be8bf
Launcher sets content list to match values in openmw.cfg ( Fixes #811 )
...
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
2015-01-10 18:46:47 +13:00
scrawl
1e06f69d9e
Remove the "browse to existing installation" button, now replaced by the wizard
...
Clean up some debug spam
2014-11-20 22:39:34 +01:00
pvdk
fda25f385a
Fixed segfault when launcher tries to reload settings on pages not yet there
2014-05-30 02:50:17 +02:00
pvdk
0cc7c06262
Ensure the launcher is not shown when the wizard is run
2014-05-30 02:41:09 +02:00
pvdk
6348af586e
Fixed some problems with the launcher and the wizard
2014-05-30 02:12:48 +02:00
pvdk
a390dde818
Fixed importing configurations of existing installations
2014-05-29 21:17:49 +02:00
pvdk
5af12d193a
Cleaned up old wizard stuff from launcher
2014-05-29 17:57:41 +02:00
pvdk
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
2014-05-29 16:42:16 +02:00
Kevin Poitra
beba58268c
Fix a typo within the launcher. Fixes bug #1058 .
2014-05-27 01:47:57 -05:00
greye
cd990a665a
create QString from utf-8 when expected
2014-05-18 14:55:05 +04:00
pvdk
aa07a33906
Fixed most of the memory leaks and started working on correctly exiting the thread
2014-04-18 13:17:37 +02:00
pvdk
30c3c3e245
Working on importing content lists in the launcher
2014-04-17 00:01:19 +02:00
pvdk
21c406316f
Working on the Settings tab: start the importer/wizard
2014-04-16 16:54:55 +02:00
pvdk
bf6103a3a4
Merge branch 'wizardtab' into wizard
...
Conflicts:
files/ui/mainwindow.ui
2014-03-30 23:16:48 +02:00
pvdk
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
2014-03-16 20:05:12 +01:00
pvdk
3792b301e9
Wizard now runs the ini-importer to import settings from Morrowind.ini
2014-02-25 15:33:30 +01:00
pvdk
b43325119a
Some changes to the version retrieval: ignore shallow clones
2014-02-19 14:19:08 +01:00
pvdk
4e03e9cf87
Changed development version info text and the tooltip now works on all platforms
2014-02-02 20:10:47 +01:00
pvdk
802448b217
Added a settings page to the launcher
2014-01-27 20:14:02 +01:00
pvdk
19bef4fce8
Distinguish between release and development builds
2014-01-23 13:18:05 +01:00
pvdk
c354cd52be
Added compile date and time to the version info in the launcher
2014-01-22 18:37:49 +01:00
pvdk
fa186f5ec1
Added version information to the launcher
2014-01-22 17:51:10 +01:00
scrawl
33389b9b63
XDG compliant paths
2013-12-26 20:53:51 +01:00
pvdk
da9b67b6d2
Fix for Bug #922 : Launcher writing merged openmw.cfg files
2013-12-16 20:40:58 +01:00
Marc Zinnschlag
3ac58b387b
fixed wording of an error message
2013-11-03 22:08:38 +01: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
1a23cccce3
Implemented Launcher namespace
2013-10-25 11:17:26 -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
Tom Mason
06ff40eda7
only use unshield on not windows
2013-08-19 20:20:08 +01:00
Tom Mason
454b64974d
filenames
2013-08-19 20:19:35 +01:00
Tom Mason
ceb3317807
Integrate unshield with launcher
2013-08-19 20:19:01 +01:00
Sebastian Wick
a1fea97c3b
use SDL for resolution -> multimonitor support
2013-06-23 03:49:30 +02:00
Marc Zinnschlag
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
2013-06-17 15:02:18 +02:00
darkf
43455129d0
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
2013-06-17 08:58:48 +00:00
darkf
fb462f1b1a
launcher: Throw error if no data files are selected
2013-06-11 20:28:38 -07:00
darkf
fd25616cab
launcher: Properly quit if settings write fails.
2013-06-11 20:28:36 -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
pvdk
e76d03dcc4
Added a warning message to the importer dialog
2013-03-19 12:01:54 +01:00
pvdk
c15d920133
Fixed the first run dialog, makes sure Morrowind.ini is found
2013-03-16 01:46:28 +01:00
pvdk
f574c37e93
Added encoding flag to ini importer arguments
2013-03-12 04:00:43 +01:00
pvdk
81604613b5
Narrowed down includes to improve compile time
2013-03-12 01:29:13 +01: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
75cf009101
Finished implementing the .ui file for the DataFilesPage
2013-03-05 03:47:57 +01:00
Pieter van der Kloet
4c9d0563fe
WIP: Implementing the .ui for the DataFilesPage
2013-03-05 03:13:39 +01:00
Pieter van der Kloet
0a6e3701ab
Made the Play page use a .ui file too
2013-03-03 01:49:41 +01:00
Pieter van der Kloet
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
2013-03-03 00:48:09 +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
c4ebdc230c
Cleaned up strings and indentation
2013-02-25 01:28:13 +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
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
990895fd2b
Mainwindow size and position now gets saved/restored
2013-02-15 14:12:25 +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
25edba0887
Rewriting the config code of the pages to use the new settings classes
2013-01-27 16:39:51 +01:00
Pieter van der Kloet
d065b56948
Fixed default profile adding and made switching profiles more efficient
2012-10-30 04:21:31 +01:00
Pieter van der Kloet
fe9120bcb3
Added support for the profiles and made creation/editing them more user friendly
2012-10-23 01:47:07 +02:00
Pieter van der Kloet
ab8894e07a
Merge remote-tracking branch 'origin/launcher-model' into launcher-model
...
Conflicts:
apps/launcher/datafilespage.cpp
2012-10-22 14:59:43 +02:00
Pieter van der Kloet
6433b1e022
Some minor fixes
2012-10-22 02:25:10 +02:00
pvdk
85aaacb41a
Some cleaning of the launcher source dir
2012-10-12 02:25:14 +02:00
scrawl
b73b39f3c6
launcher bugfix, settings was not written when "Play" was selected
2012-06-27 00:55:25 +02:00
Pieter van der Kloet
6fe471c1c6
Resolutions are now sorted descendingly and removed some debug stuff
2012-06-26 02:41:54 +02:00
Pieter van der Kloet
6a2bcddef5
Changed the way the launcher exits and polished the error handling code
2012-06-20 23:25:22 +02:00
Pieter van der Kloet
e21442f6cc
Fix for Bug #306 : launcher now creates the config dir and returns proper error codes
2012-06-20 02:28:49 +02:00
scrawl
ad46049ee0
got the launcher working with the new settings system.
2012-05-22 20:37:18 +02:00
Marc Zinnschlag
2b2eb34f8f
Merge remote branch 'corristo/master' into next
2012-03-28 18:07:21 +02:00
Nikolay Kasyanov
66b31d3d43
Bug #229 (Fixed): On OS X Launcher cannot launch game if path to binary contains spaces
2012-03-28 12:04:42 +04:00
Pieter van der Kloet
155cd76f37
Changed Launcher font to EB Garamond and added license info
2012-03-24 20:43:35 +01:00
Pieter van der Kloet
5ffa3264b2
Appended resources/ to the stylesheet path
2012-03-01 04:38:37 +01:00
Pieter van der Kloet
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
2012-02-22 08:34:47 +01:00
Pieter van der Kloet
eea8773be1
Changed the order of preference for the configuration files
2012-02-10 21:45:46 +01:00
Lukasz Gromanowski
7c24ae9ac7
Issue #168 - Configuration cleanup - WIP
...
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-21 01:31:20 +01:00
Pieter van der Kloet
5dbbc5bb7b
Changed error handling for Ogre config and made the launcher exit cleanly
2011-10-12 23:02:27 +02:00
Marc Zinnschlag
7c8853f6fe
post-merge fixes
2011-09-27 09:45:28 +02:00
Pieter van der Kloet
c9be134226
Fixed config file writing when file does not exist
2011-09-06 15:57:40 +02:00
