scrawl
03257ecae5
QString encoding fix
2015-02-09 20:15:41 +01:00
Marc Zinnschlag
6c4920c58e
Merge remote-tracking branch 'scrawl/master'
2015-02-06 09:23:45 +01:00
Marc Zinnschlag
ea21fbcbe6
Merge remote-tracking branch 'dteviot/master'
2015-02-06 09:22:57 +01:00
dteviot
cac250a90d
Fixed typo in comment.
2015-02-06 12:45:15 +13:00
dteviot
9d9cabf40d
Fix: Importer creates a single Content List ( Fixes #2345 )
2015-02-06 12:24:06 +13:00
scrawl
9825b68dfb
Fix SDL eating SIGINT signals in the launcher ( Fixes #2328 )
2015-02-05 04:18:42 +01:00
scrawl
0c6e2170db
Include cleanup
2015-02-05 04:18:42 +01:00
Marc Zinnschlag
82ff737c31
Merge remote-tracking branch 'scrawl/master'
2015-02-01 12:10:28 +01:00
scrawl
57a259c526
Remove references to no longer used font
2015-01-31 22:40:43 +01:00
scrawl
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
2015-01-31 22:40:38 +01:00
dteviot
e298589e7f
Reorganised DataFilesPage.cpp code.
...
Removed some recursive calling of saveSettings() and loadSettings().
2015-01-26 18:46:18 +13:00
Alexander "Ace" Olofsson
942cf26eee
And the missing includes
2015-01-23 16:06:19 +01:00
Alexander "Ace" Olofsson
7a903b7100
Doing forward declaration instead
2015-01-23 16:05:36 +01:00
Alexander "Ace" Olofsson
0c1d762790
Fix build when using new boost with Ogre.
...
This fixes a [Parse error at "BOOST_JOIN"] if you're using - for instance - Boost 1.57.0
2015-01-23 15:37:32 +01:00
dteviot
fcbf7d7deb
Fixed string formatting minor error found by Mingun.
2015-01-11 08:33:33 +13: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
dteviot
063388e0eb
Change "Profile" to "Content List" in user visible strings in Launcher. ( Fixes #810 )
2015-01-10 15:04:45 +13:00
dteviot
9d6efcecff
Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset
...
Fixed Conflict:
components/contentselector/model/contentmodel.cpp
2015-01-08 12:15:48 +13:00
Marco Schulze
6cd5b78ca7
Fix missing include in apps/launcher/main.cpp
2015-01-01 14:15:05 -03:00
scrawl
363d1f9207
Merge remote-tracking branch 'upstream/master'
2014-12-30 23:01:45 +01:00
dteviot
a62e15d93d
Read profile files from LauncherSettings in load order.
2014-12-30 17:25:19 +13:00
Marc Zinnschlag
2fa0764c89
Merge remote-tracking branch 'swick/master'
2014-12-26 16:08:07 +01:00
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +01:00
Sebastian Wick
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
2014-12-24 15:09:50 +01:00
MiroslavR
3cc32b641a
Fix some memory leaks
2014-12-23 20:44:25 +01:00
Sebastian Wick
639fbfad0b
make borderless setting available to the UI
2014-12-22 02:44:20 +01:00
scrawl
8ed376af5e
Launcher: fix changing active profile through the Play page
2014-12-11 15:59:43 +01:00
scrawl
1937ace1b7
Launcher: fix bugs deleting profiles ( Fixes #2188 )
2014-12-10 21:52:30 +01:00
scrawl
33019b93b4
Fix bug setting current launcher profile on startup (Bug #2188 )
2014-12-10 21:10:14 +01:00
scrawl
a4e32d23c6
Fix old profile content not being cleared correctly when saving content file selection ( Fixes #2173 )
2014-11-30 20:52:34 +01: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
scrawl
c6558fe487
Fix Ogre being initialised twice
2014-11-19 13:19:02 +01:00
scrawl
4fa303d7c4
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
2014-11-18 17:43:51 +01:00
Nikolay Kasyanov
0dc08e2983
Properly add libunshiled include dir
2014-10-29 11:26:06 +02:00
Thoronador
f0d3fc73d5
fix uninitialized pointer fields in GraphicsPage class
2014-10-10 23:47:27 +02:00
cc9cii
6d12374ace
Move windows platform specific files into a common directory.
2014-09-05 22:36:33 +10:00
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
2014-06-10 15:03:27 +02:00
slothlife
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
2014-06-02 02:51:04 -05: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
cb598f0455
the same for data-local entry
2014-05-22 01:13:27 +04:00
greye
28b59f4008
process paths as UTF-8 in launcher
2014-05-22 01:08:03 +04:00
greye
e02b04536f
fix most vexing parse issue
2014-05-18 14:55:05 +04:00
greye
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
2014-05-18 14:55:05 +04:00
greye
cd990a665a
create QString from utf-8 when expected
2014-05-18 14:55:05 +04:00
