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
