325d208b4a
Fix incorrect error message
9 years ago
046538984c
Fix duplicate filename in what() message. Use newly create cfgError
...
utility function consistently throughout code.
9 years ago
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.
9 years ago
5602cd9b7b
Fix the launcher's version label for builds with no git commit info
10 years ago
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.
10 years ago
c783b50a83
Fix config file priority in the launcher to match OpenMW
10 years ago
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
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
10 years ago
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
10 years ago
b7cd62e4de
Revert "Remove user preference setting option."
...
This reverts commit d3b7cf44d3
10 years ago
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
10 years ago
d3b7cf44d3
Remove user preference setting option.
10 years ago
15fe5d88e2
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- controlled via a checkbox in launcher settings
10 years ago
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
10 years ago
7d321e0fb7
Fix #2557
...
Don’t show main dialog right away if wizard is selected.
10 years ago
ccab8cc9a1
Register Player in the PhysicsSystem
10 years ago
997347b01e
Silence -Wreorder warnings.
10 years ago
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
10 years ago
5eadffd0c4
Make launcher's version label selectable so it can be copy-pasted into issue reports
10 years ago
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.
10 years ago
57a259c526
Remove references to no longer used font
10 years ago
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.
10 years ago
1e06f69d9e
Remove the "browse to existing installation" button, now replaced by the wizard
...
Clean up some debug spam
10 years ago
fda25f385a
Fixed segfault when launcher tries to reload settings on pages not yet there
11 years ago
0cc7c06262
Ensure the launcher is not shown when the wizard is run
11 years ago
6348af586e
Fixed some problems with the launcher and the wizard
11 years ago
a390dde818
Fixed importing configurations of existing installations
11 years ago
5af12d193a
Cleaned up old wizard stuff from launcher
11 years ago
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
11 years ago
beba58268c
Fix a typo within the launcher. Fixes bug #1058 .
11 years ago
cd990a665a
create QString from utf-8 when expected
11 years ago
aa07a33906
Fixed most of the memory leaks and started working on correctly exiting the thread
11 years ago
30c3c3e245
Working on importing content lists in the launcher
11 years ago
21c406316f
Working on the Settings tab: start the importer/wizard
11 years ago
bf6103a3a4
Merge branch 'wizardtab' into wizard
...
Conflicts:
files/ui/mainwindow.ui
11 years ago
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
11 years ago
3792b301e9
Wizard now runs the ini-importer to import settings from Morrowind.ini
11 years ago
b43325119a
Some changes to the version retrieval: ignore shallow clones
11 years ago
4e03e9cf87
Changed development version info text and the tooltip now works on all platforms
11 years ago
802448b217
Added a settings page to the launcher
11 years ago
19bef4fce8
Distinguish between release and development builds
11 years ago
c354cd52be
Added compile date and time to the version info in the launcher
11 years ago
fa186f5ec1
Added version information to the launcher
11 years ago
33389b9b63
XDG compliant paths
11 years ago
da9b67b6d2
Fix for Bug #922 : Launcher writing merged openmw.cfg files
11 years ago
3ac58b387b
fixed wording of an error message
11 years ago
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
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
1a23cccce3
Implemented Launcher namespace
11 years ago
f9591ddda6
Reimplemented constentselector view class
11 years ago
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
11 years ago
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
11 years ago
06ff40eda7
only use unshield on not windows
12 years ago
454b64974d
filenames
12 years ago
ceb3317807
Integrate unshield with launcher
12 years ago
a1fea97c3b
use SDL for resolution -> multimonitor support
12 years ago
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
12 years ago
43455129d0
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
12 years ago
fb462f1b1a
launcher: Throw error if no data files are selected
12 years ago
fd25616cab
launcher: Properly quit if settings write fails.
12 years ago
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
12 years ago
e76d03dcc4
Added a warning message to the importer dialog
12 years ago
c15d920133
Fixed the first run dialog, makes sure Morrowind.ini is found
12 years ago
f574c37e93
Added encoding flag to ini importer arguments
12 years ago
81604613b5
Narrowed down includes to improve compile time
12 years ago
52e5dcc7f0
Some fixes to the way data paths are saved and settings are handled
12 years ago
75cf009101
Finished implementing the .ui file for the DataFilesPage
12 years ago
4c9d0563fe
WIP: Implementing the .ui for the DataFilesPage
12 years ago
0a6e3701ab
Made the Play page use a .ui file too
12 years ago
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
12 years ago
9cd8dd39de
Make the launcher code conform to the coding standards and cleanup
12 years ago
c4ebdc230c
Cleaned up strings and indentation
12 years ago
a0007325ad
Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins
12 years ago
150d4a7a72
Added support for multiple ini files
12 years ago
18d01cd65a
Implemented a first-run dialog to import Morrowind.ini settings
12 years ago
35b68a3c40
Fixed accidental profile deletion and added sorting by date
12 years ago
990895fd2b
Mainwindow size and position now gets saved/restored
12 years ago
aa25471517
WIP: working on improving the config file handling
12 years ago
25edba0887
Rewriting the config code of the pages to use the new settings classes
12 years ago
d065b56948
Fixed default profile adding and made switching profiles more efficient
12 years ago
fe9120bcb3
Added support for the profiles and made creation/editing them more user friendly
12 years ago
ab8894e07a
Merge remote-tracking branch 'origin/launcher-model' into launcher-model
...
Conflicts:
apps/launcher/datafilespage.cpp
12 years ago
6433b1e022
Some minor fixes
12 years ago
85aaacb41a
Some cleaning of the launcher source dir
12 years ago
b73b39f3c6
launcher bugfix, settings was not written when "Play" was selected
13 years ago
6fe471c1c6
Resolutions are now sorted descendingly and removed some debug stuff
13 years ago
6a2bcddef5
Changed the way the launcher exits and polished the error handling code
13 years ago
e21442f6cc
Fix for Bug #306 : launcher now creates the config dir and returns proper error codes
13 years ago
ad46049ee0
got the launcher working with the new settings system.
13 years ago
2b2eb34f8f
Merge remote branch 'corristo/master' into next
13 years ago
66b31d3d43
Bug #229 (Fixed): On OS X Launcher cannot launch game if path to binary contains spaces
13 years ago
155cd76f37
Changed Launcher font to EB Garamond and added license info
13 years ago
5ffa3264b2
Appended resources/ to the stylesheet path
13 years ago
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
13 years ago
eea8773be1
Changed the order of preference for the configuration files
13 years ago
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>
13 years ago
5dbbc5bb7b
Changed error handling for Ogre config and made the launcher exit cleanly
13 years ago
7c8853f6fe
post-merge fixes
13 years ago
c9be134226
Fixed config file writing when file does not exist
14 years ago
scrawl
cfcohen
cc9cii
Nikolay Kasyanov
Rohit Nirmal
Marc Zinnschlag
dteviot
pvdk
Kevin Poitra
greye
graffy76
Lukasz Gromanowski
Tom Mason
Sebastian Wick
darkf