mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 18:56:38 +00:00
Code Issues Releases Wiki Activity
36751 commits 115 branches 76 tags 128 MiB
Commit graph

898 commits

Author SHA1 Message Date
Yohaulticetl
640b32da56 Fixed merge conflicts 2018-08-14 19:57:48 +02:00
Yohaulticetl
7e9ce99062 Made the werewolf check optional 2018-08-14 19:56:40 +02:00
Yohaulticetl
d19cbdb652 Factored strength into hand-to-hand combat 2018-08-14 19:44:03 +02:00
Andrei Kortunov
2b90504558 Init SDL2 before Qt4 to avoid crash on Linux (bug #4529) 2018-08-07 22:57:16 +04:00
Capostrophic
ab29f9e13f Add permanent barter disposition change option (feature #3103) 2018-08-01 17:31:35 +03:00
Capostrophic
4d48ede6f1 Add two missing gameplay settings to Advanced tab 2018-08-01 13:36:31 +03:00
Marc Zinnschlag
20d4e27f82 Merged pull request #1821 2018-07-31 10:51:32 +02:00
Andrei Kortunov
2d4ec86b8d Provide launcher icons 2018-07-28 13:18:38 +04:00
Andrei Kortunov
28a02ac93b Use file selection dialogue result (bug #4524) 2018-07-27 21:25:21 +04:00
Thunderforge
72f6b1a693 Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface" 2018-06-28 20:13:18 -05:00
Thunderforge
506d615acc Moving csignal import from main to graphicspage 2018-06-14 22:16:35 -05:00
Thunderforge
7615e78e52 Move SDL initialization from main.cpp to graphicspage.cpp 2018-06-14 19:39:24 -05:00
Marc Zinnschlag
efb4abbb7f Merged pull request #1623 2018-06-09 10:49:04 +02:00
Thunderforge
dfa9968565 Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged 2018-06-08 19:18:23 -05:00
Thunderforge
62c4eb8d6a Explicitly flagging loaded cells changed as queued 2018-06-08 19:16:24 -05:00
Thunderforge
d46590934a Importing mutex 2018-06-03 16:59:27 -05:00
Thunderforge
e282ece3d1 Fixing bug with autocomplete not loading correctly during startup 2018-06-03 16:58:18 -05:00
Thunderforge
103a7ac628 Using a mutex lock to prevent race conditions 2018-06-03 16:32:12 -05:00
Thunderforge
e26c675829 Changing join to detach so that the thread will not block the UI 2018-06-02 17:29:35 -05:00
Thunderforge
26dfef7970 Changing where we are loading cells to prevent Qt access issue 2018-05-27 17:15:36 -05:00
Thunderforge
78234e9468 Moving autocomplete code to thread 2018-05-27 16:47:09 -05:00
Thunderforge
c2fff61ccd Changing so that data changes happen only after the addon is checked 2018-05-26 20:35:28 -05:00
Thunderforge
d58cce9c72 Adding WIP code to dynamically change the autocomplete fields 2018-05-22 20:50:31 -05:00
declan-millar
9ed4f33048 Replace spelling: soulgem -> soul gem 2018-05-21 19:10:24 +01:00
declan-millar
78e79d5775 Add advanced option to Rebalance soulgem values to the launcher 2018-05-21 13:33:42 +01:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) 2018-04-17 23:03:56 +02:00
Thunderforge
fb27f34a32 Add autocomplete to the "Start default character at" field 2018-04-07 21:27:36 -05:00
Thunderforge
d42791e260 Moving testing options to Advanced page 2018-03-15 22:11:54 -05:00
Thunderforge
dcc262ed91 Fixing Skip Menu checkbox not working correctly 2018-03-05 23:10:08 -06:00
Thunderforge
082e166fae Making "start default character at" field enabled or disabled by the previous checkbox 2018-03-05 21:41:29 -06:00
Thunderforge
da74ca5ce0 Add testing options to the Settings page 2018-03-05 21:26:59 -06:00
Thunderforge
6c3ac834c4 Preventing max quicksaves from being saved to settings.cfg if it is unchanged. 2018-03-05 19:57:19 -06:00
Thunderforge
b6d9b6f544 Formatting improvement for advanced page 2018-02-27 20:17:43 -06:00
Thunderforge
4292351993 Adding Max Quicksaves setting to Launcher 2018-02-27 20:17:21 -06:00
Thunderforge
a67373d116 Fixing "Show Enchant Chance" checkbox setting melee info instead 2018-02-19 18:28:04 -06:00
Thunderforge
8b17844781 Replacing Qt5-only method with Qt4-compatible code 2018-01-29 21:14:31 -06:00
Thunderforge
8837046d9c Adding panel for advanced settings.cfg options 2018-01-28 22:49:49 -06:00
AnyOldName3
a9b95596bc Add a missed trailing new line. 2017-09-08 22:21:00 +01:00
AnyOldName3
8c74f16247 Restore trailing new lines to shrink PR 2017-09-08 22:20:04 +01:00
AnyOldName3
5ce34f1cbf Move new behaviour into macro to reduce code duplication 2017-09-08 22:17:42 +01:00
AnyOldName3
3c0ec0d6d0 If CMake supports it, sets the debugger working directory for Visual Studio 2017-09-08 17:26:46 +01:00
Siimacore
c920d083e4 Correcting https://bugs.openmw.org/issues/3906. 2017-08-03 23:15:26 +02:00
scrawl
41fb17f39b Revert "Correcting https://bugs.openmw.org/issues/3906" 
This reverts commit b0abed00e5.
 2017-06-20 00:36:06 +02:00
scrawl
f7969fb178 Merge pull request #1317 from Siimacore/master 
Correcting https://bugs.openmw.org/issues/3906
 2017-06-12 23:47:07 +02:00
Siimacore
b0abed00e5 Correcting https://bugs.openmw.org/issues/3906 2017-06-10 21:36:35 +02:00
Bret Curtis
dbf149f9b2 gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now 2017-06-10 00:51:19 +02:00
Bret Curtis
d799954ca0 replace and purge boost::math::gcd and other non-used headers 2017-06-09 19:08:53 +02:00
scrawl
5297d7b5be Merge pull request #1137 from nikolaykasyanov/osx-structure 
[macOS] Move all resources files inside application bundles (fixes #3566)
 2016-11-25 02:51:32 +01:00
Nikolay Kasyanov
db69342b5d [macOS] Move all configs & resources into app bundles 
Fixes #3566 (https://bugs.openmw.org/issues/3566).
 2016-11-23 22:32:54 +01:00
scrawl
9d125bcaa2 Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix 
Fix various build issues with Visual Studio environment
 2016-11-17 18:25:23 +01:00
Phillip Andrews
c18fc113e5 Changed missing library dependencies to simple fix 2016-11-14 00:01:22 -06:00
Phillip Andrews
aeaedbc57a Moved install commands to target-specific cmakelists so that all configurations work. 2016-11-13 22:49:01 -06:00
Phillip Andrews
59eba1dede Changed tabs to spaces, oops 2016-11-13 16:59:36 -06:00
Phillip Andrews
1861302dbd Include various libraries for Visual Studio environment 2016-11-13 14:27:59 -06:00
Allofich
3420121c3f Fix shadowing warnings 2016-11-13 23:20:51 +09:00
Nikolay Kasyanov
5d4734c02e Use local path from configuration manager to load openmw.cfg in launcher 2016-11-01 21:27:35 +01:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
Alexander "Ace" Olofsson
338f0cf53d Merge branch 'appveyor' of github.com:ace13/openmw into appveyor 2016-01-19 22:11:46 +01:00
Rob Cutmore
21d13a48fa Make setup method of MainDialog class private 2016-01-16 06:43:45 -05:00
Rob Cutmore
a5411c1ec2 Remove unused code 2016-01-15 20:51:39 -05:00
Alexander "Ace" Olofsson
fe241be26c Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
2142d0d2d6 Make Qt5 happy 2015-12-24 02:48:00 +01:00
scrawl
177a6f4a68 Launcher: ensure to clear previous settings when reloading settings 2015-11-27 20:52:29 +01:00
scrawl
ace4cfc0a8 Fix 'duplicate setting' errors when running installation wizard 2015-11-27 20:32:45 +01:00
scrawl
2ffcc2a2b4 Fix incorrect path encoding handling in debug message 2015-11-26 17:34:22 +01:00
scrawl
d894d54e41 Improve path conversions 2015-11-26 17:15:28 +01:00
scrawl
84aceedfa2 Add comment 2015-11-26 17:15:12 +01:00
scrawl
325d208b4a Fix incorrect error message 2015-11-26 17:13:13 +01:00
scrawl
3747843c92 Use QString::toInt instead of atoi 2015-11-26 17:07:20 +01:00
cfcohen
c26463fd91 Should have coded it the way scrawl said, since it's cleaner. 2015-11-26 10:52:20 -05:00
cfcohen
a9c9cc5508 Remove unnecessary copy of mEngineSettings in mInitialSettings. 2015-11-26 10:42:43 -05: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
ad5eaaa705 Update the OpenMW Launcher so that it only writes changed values to 
the user settings.cfg file.  Add a helpful header to the top of new
settings.cfg files.  Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file.  Remove "automatically generated"
comments.
 2015-11-25 21:30:04 -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
cfcohen
18da95e4f8 Make openmw-launcher pass comments through settings.cfg, and reuse the 
Settings::Manager code to do most of the work.  Stop loading both the
global settings-default.cfg and the one in the current directory,
while continuing to prefer the latter one.  Cleanup paths slightly and
remove what appears to have been debugging in the launcher settings.
 2015-11-25 13:08:53 -05:00
Nikolay Kasyanov
014a2fc0e9 OS X: do not override Qt plugin path 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4dcb1a1b17 OS X: remove QPlastiqueStyle usage 2015-11-14 13:50:01 +01: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
609e146a22 Build fixes for windows 2015-06-15 16:48:18 +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
cc9cii
0efe8f5465 Fix broken launcher build for windows. 2015-06-14 14:42:08 +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.

Conflicts:
	components/config/gamesettings.cpp
 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
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +02:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
scrawl
4b5c2398a1 Remove QTextCodec::setCodecForCStrings 
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
 2015-06-12 02:00:06 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +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
Marc Zinnschlag
913caf96bd Merge branch 'openmw-36' 2015-05-23 09:46:54 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
Marc Zinnschlag
34f106749a removed a redundant typedef 2015-05-17 10:38:15 +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
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 2015-05-04 02:41:50 +02:00
scrawl
cac288d5be Remove OgreInit 2015-05-01 21:49:36 +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
dteviot
cc815c63f1 Fix: no longer loose changes when run install wizard or iniimport. 2015-02-24 20:14:18 +13:00
dteviot
84762c4eb8 Progress bar at 0% shows no text. 2015-02-23 19:30:46 +13: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
9708e8529f Removed unneeded include. 2015-02-22 08:58:17 +13: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
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
Thoronador
f69d61976e minor performance improvements in other apps subdirectories 2014-04-27 23:25:02 +02: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
af883991e2 Reimplemented the old new profile dialog behaviour 2014-04-17 02:17:18 +02:00
pvdk
30c3c3e245 Working on importing content lists in the launcher 2014-04-17 00:01:19 +02:00
pvdk
f8bb797b8a Settings tab is fully functional now 2014-04-16 18:34:24 +02:00
pvdk
21c406316f Working on the Settings tab: start the importer/wizard 2014-04-16 16:54:55 +02:00
pvdk
cfe66abbc5 Started working on the settings tab 2014-03-30 23:57:30 +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
c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
 2014-02-19 19:26:07 +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
greye
15d946415e minor cleanup 
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
 2014-01-14 12:46:53 +04:00
gus
828e5841d8 Windows SDL fix 2014-01-11 11:00:34 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
scrawl
33389b9b63 XDG compliant paths 2013-12-26 20:53:51 +01:00
pvdk
095ff4e17a Moved launcher settings stuff into components, so they can be reused in the wizard 2013-12-25 00:50:25 +01:00
pvdk
da9b67b6d2 Fix for Bug #922: Launcher writing merged openmw.cfg files 2013-12-16 20:40:58 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
pvdk
46973e8e82 Fix for Bug #982: unchecking addons is now saved to profile 2013-11-30 12:08:37 +01:00
Marc Zinnschlag
04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 2013-11-30 09:45:41 +01:00
Nikolay Kasyanov
dfa900e4e3 OS X: Fixed “macro redefined” warning 2013-11-10 20:59:10 +04:00
Marc Zinnschlag
418ccf705d Merge branch 'openmw-27' 
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
 2013-11-06 10:21:25 +01:00
Marc Zinnschlag
dec1483fa4 Merge branch 'saving' into openmw-27 2013-11-04 08:57:32 +01:00
graffy76
6d439d032f Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector 2013-11-03 21:38:10 -06:00
graffy76
ed913936f8 Eliminated game & addon keys from profile configuration 2013-11-03 21:36:41 -06:00
graffy76
dace904490 changed game/addon to content for writing to openmw.cfg from launcher 2013-11-03 16:45:18 -06:00
Marc Zinnschlag
3ac58b387b fixed wording of an error message 2013-11-03 22:08:38 +01:00
graffy76
1d4b5a2425 Fix broken launcher content file display / selection scheme 
Disable selection of content files with missing dependencies (grayed
out)
 2013-11-03 14:02:41 -06:00
graffy76
973803eb2f Fixed pathing issues in launcher 2013-11-03 00:02:46 -05: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
scrawl
636d399c7f Refactored Ogre initialisation into a component 2013-10-30 14:04:33 +01: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
ba365ff49e Fixed merge conflicts with saving branch 2013-10-25 19:23:03 -05:00
scrawl
8c9a5de26f Fix an irritating error message 2013-10-25 23:47:53 +02:00
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
 2013-10-25 14:44:22 -05:00
graffy76
1a23cccce3 Implemented Launcher namespace 2013-10-25 11:17:26 -05:00
graffy76
16d87ea1d1 Merge branch 'master' into esxSelector 2013-10-25 08:11:24 -05:00
graffy76
ba3589bc76 Revert "Implemented ContentSelector as a singleton "charm" modifier for" 
This reverts commit 24b167b755.

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp
 2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6 Reimplemented constentselector view class 2013-10-22 21:52:35 -05:00
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02: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
a5a0f61533 Fixed missing profiles combobox 2013-10-01 22:36:49 -05:00
graffy76
00c78a4aa1 Implementing ContentSelector class in DataFilesPage 
Moved AdjusterWidget / FileWidget to ContentSelectorView
 2013-10-01 21:29:45 -05:00
graffy76
24b167b755 Implemented ContentSelector as a singleton "charm" modifier for 
FileDialog...
 2013-09-29 12:19:07 -05:00
Tom Mason
dd0a416249 cleaned up bloodmoon_fix_ini 2013-09-29 16:59:52 +01:00
Tom Mason
fd169c2399 fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder 2013-09-29 15:49:47 +01:00
Lukasz Gromanowski
ef617d408b Issue #913: Merge --master and --plugin switches 
Merged master/plugin switches in launcher.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-09-29 09:14:40 +02:00
graffy76
513f0c4b3e Implemented file/adjuster widgets into new addon creation dialog 2013-09-22 23:52:53 -05:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
graffy76
7b7dfa122d Merge branch 'master' into esxSelector 2013-09-19 16:24:28 -05:00
graffy76
0eb06ada39 Implemneting drag and drop 2013-09-18 02:36:23 -05:00
Tom Mason
7b9c5c75e7 silenced unshield 2013-09-07 16:16:09 +01:00
Tom Mason
2b50e34566 Fixed issue with copy_file 
from: https://forum.openmw.org/viewtopic.php?f=20&t=1718&hilit=0.26&start=50#p18705
 2013-09-07 15:41:51 +01:00
Alexander "Ace" Olofsson
5e42c73356 Better fix for unshield, comments on changes, no more commented out code. 2013-09-05 10:39:17 +02:00
Alexander "Ace" Olofsson
22a5f7198f A few fixes to build on Windows 2013-09-04 23:25:47 +02:00
Nikolay Kasyanov
f9cfe654f2 Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154 
(Qt redefines min OS X version and SDL in turn checks this version and
doesn't accept version set by Qt)
 2013-09-01 23:17:41 +04:00
graffy76
e6fdc7e7fd ... 2013-08-20 12:34:39 -05:00
graffy76
6898321676 Reenabling features 
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
 2013-08-20 08:16:56 -05:00
graffy76
24e38846da Fixed broken profile actions 2013-08-20 03:53:23 -05:00
graffy76
b52645bf2a Fixes to accommodate master/plugin loading 2013-08-20 03:23:32 -05:00
Tom Mason
7f0f9037be fix for older versions of unshield 2013-08-19 22:57:21 +01:00
Tom Mason
06ff40eda7 only use unshield on not windows 2013-08-19 20:20:08 +01:00
Tom Mason
865a7c63df cmake for system libunshield 2013-08-19 20:20:00 +01:00
Tom Mason
d3748cd5bb Install uncompressed data files from cd 2013-08-19 20:19:53 +01:00
Tom Mason
9d1daf7dc2 enum was unnecessary 2013-08-19 20:19:47 +01:00
Tom Mason
641b7b0336 anonymous namespace 2013-08-19 20:19:41 +01:00
Tom Mason
454b64974d filenames 2013-08-19 20:19:35 +01:00
Tom Mason
3264b5974e fix invalid syntax 2013-08-19 20:19:25 +01:00
Tom Mason
90a892d304 unshield fixes 2013-08-19 20:19:11 +01:00
Tom Mason
ceb3317807 Integrate unshield with launcher 2013-08-19 20:19:01 +01:00
graffy76
f6217f9c6a Moved esx selector classes out of global namespace 2013-08-18 15:11:29 -05:00
graffy76
a14e0b32d8 Restructured esxselector directory 
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
 2013-08-18 09:48:13 -05:00
graffy76
45277c0082 Minor changes 
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
 2013-08-18 09:34:33 -05:00
graffy76
2878f51cd3 Reimplemented dependency selection feature 
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
 2013-08-17 19:40:28 -05:00
graffy76
b24dd5c6ac Continued migration of code to ContentSelector 2013-08-17 05:55:43 -05:00
graffy76
61602789e1 Began migrating code to ContentSelector base 2013-08-16 22:23:21 -05:00
graffy76
4c8c6d6971 Moved init code to master / plugin proxy classes 2013-08-16 21:20:48 -05:00
graffy76
7389507eb5 Created masterproxylist class 2013-08-16 21:12:30 -05:00
graffy76
2bc56d0b5c Fixed missing item list in launcher combobox 2013-08-16 20:59:58 -05:00
graffy76
b850fe0289 Removed vertical headers from plugin view 2013-08-16 18:59:01 -05:00
graffy76
49c4e1bf9e Removed master table widget 2013-08-16 18:23:02 -05:00
graffy76
84e5c2610a Implemented combobox for game file selection 2013-08-16 18:00:23 -05:00
Marc Zinnschlag
8ffea60b72 some cleanup 2013-06-26 10:09:26 +02:00
Marc Zinnschlag
12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-26 09:48:51 +02:00
Sebastian Wick
20e591fe18 use index instead of string manipulation 2013-06-23 21:56:27 +02:00
Sebastian Wick
357974a429 more minor stuff 2013-06-23 21:34:41 +02:00
Sebastian Wick
c97fac8116 use QMessageBox to show errors 2013-06-23 21:16:51 +02:00
Sebastian Wick
89dee80dcf simpler remove of duplicates 2013-06-23 21:04:49 +02:00
Sebastian Wick
6abb5d5f75 small fixes 2013-06-23 20:53:50 +02:00
Sebastian Wick
dbfc39468b better workaround 2013-06-23 20:45:24 +02:00
Marc Zinnschlag
0829548106 Merge remote-tracking branch 'swick/multimonitor' 
Conflicts:
	apps/launcher/graphicspage.cpp
 2013-06-23 08:34:35 +02:00
Sebastian Wick
6f7a7b4714 remove old code 2013-06-23 05:02:19 +02:00
Sebastian Wick
bb39a85f16 remove double entries 2013-06-23 04:43:34 +02:00
Sebastian Wick
14d074e3e7 select first screen if none is in the setting 2013-06-23 04:21:32 +02:00
Sebastian Wick
a1fea97c3b use SDL for resolution -> multimonitor support 2013-06-23 03:49:30 +02:00
Marc Zinnschlag
d61c12ccfc minor cleanup 2013-06-22 20:32:11 +02:00
Sebastian Wick
d364fd8561 Merge branch 'master' of https://github.com/zinnschlag/openmw 2013-06-22 19:17:39 +02:00
Sebastian Wick
0e29286856 fix custom resolution maximum 2013-06-22 19:15:13 +02:00
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
 2013-06-21 23:23:43 -05: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
Marc Zinnschlag
54f56b0515 Merge remote-tracking branch 'graffy76/usersettings' 
Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp
 2013-05-16 18:04:55 +02:00
graffy76
f6203cac2a update for master 2013-05-07 20:33:42 -05:00
pvdk
d5d14c5147 Fixes issue with multiple spaces in plugin filename not being read correctly 2013-04-25 11:04:12 +02:00
Bret Curtis
c1ec16986b add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt 2013-04-17 12:04:05 +02:00
Lukasz Gromanowski
98727d2fb6 Workaround for launcher compilation problems due to bug in Qt MOC compiler. 
For details please see:

https://forum.openmw.org/viewtopic.php?f=7&t=1451
https://bugreports.qt-project.org/browse/QTBUG-22829

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-04-02 21:32:23 +02:00
pvdk
e76d03dcc4 Added a warning message to the importer dialog 2013-03-19 12:01:54 +01:00
Marc Zinnschlag
0092a2f437 Merge remote-tracking branch 'pvdk/firstrunfix' 2013-03-18 20:09:10 +01:00
pvdk
75be474005 Use the resolution QRegExp cap() instead of converting ints back and forth 2013-03-16 13:45:23 +01:00
pvdk
d1860f2d6c Removed color information from Direct3D resolutions 2013-03-16 13:40:29 +01:00
pvdk
c15d920133 Fixed the first run dialog, makes sure Morrowind.ini is found 2013-03-16 01:46:28 +01:00
pvdk
110dd5d0ee Possible fix for the resolutions not appearing with Direct3D Renderer 2013-03-15 01:56:39 +01:00
Marc Zinnschlag
ce67fbdfca Merge remote-tracking branch 'pvdk/encoding' 2013-03-12 07:02:44 +01:00
pvdk
31ba332647 Moved Windows icon to files/launcher 2013-03-12 04:05:14 +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
Marc Zinnschlag
a0df25c631 Merge remote-tracking branch 'pvdk/uifix' 2013-03-11 10:10:48 +01:00
Pieter van der Kloet
b4d408af5d Added actions to datafiles.ui and implemented them in the launcher 2013-03-11 01:48:01 +01:00
Pieter van der Kloet
fc1940257a Fixed issue with new profile dialog being too small 2013-03-11 01:23:24 +01:00
Pieter van der Kloet
091c569fbe Fixed issue with the combobox dropdown looking weird 2013-03-11 01:20:30 +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
9145fb210b Merge remote-tracking branch 'upstream/master' into opencsui 2013-03-07 03:02:03 +01:00
Pieter van der Kloet
7504ae675b Implemented a file dialog for the editor using launcher .ui 2013-03-07 03:00:59 +01:00
Pieter van der Kloet
c9859382bf Made the launcher write the custom resolution to file, cleaned resolution parsing 2013-03-06 01:35:32 +01:00
Pieter van der Kloet
770d8af931 Forgot to add the DataFilesPage .ui 2013-03-05 03:57:27 +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
fb5213a754 Made the GraphicsPage use a .ui file and added support for custom res 2013-03-05 02:17:28 +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
2b6bb9657b Added Qt Designer .ui files 2013-03-02 23:49:31 +01:00
Pieter van der Kloet
b209b6a0e6 Added missing includes 2013-02-25 22:00:51 +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
17a0a201df Various fixes and changes to the settings handling 2013-02-25 00:56:04 +01:00
Pieter van der Kloet
919d1ee572 Some fixes to the settings handlers 2013-02-24 04:14:18 +01:00
Pieter van der Kloet
4737b20e4c Fixed a bug in the combobox popup font size, items overlapping 2013-02-24 04:00:22 +01:00
Pieter van der Kloet
be43fa334f Added support for non-latin characters, fixes Bug #515 2013-02-24 03:14:19 +01:00
Pieter van der Kloet
9198afeefb Improved context menu, added context menu for masters and added multi-selection support 2013-02-24 03:10:27 +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
63a13cf9ca Whoops, removed an include 2013-02-20 19:29:12 +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
2172fb4229 Added checkable message box class 2013-02-19 16:41:33 +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
bcf4f96209 Added writing masters/plugins to openmw.cfg 2013-02-18 23:10:50 +01:00
Pieter van der Kloet
178cf2154e Made checking/unchecking work with the new datafiles model 2013-02-18 17:59:08 +01:00
Pieter van der Kloet
fd430dc5a9 Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget 
Conflicts:
	apps/launcher/datafilespage.cpp
	components/fileorderlist/datafileslist.cpp
 2013-02-15 15:38:30 +01:00
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
 2013-02-15 15:21:14 +01:00
Pieter van der Kloet
43e9ad8733 The text color of the profiles dialog now turns red on invalid names 2013-02-15 14:26:09 +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
1b9cf8c23f More work on integrating the settings parser, profiles are handled correctly 2013-02-15 01:20:48 +01:00
Pieter van der Kloet
5d1bede9e5 Forgot to add two files 2013-02-14 11:20:47 +01:00
Pieter van der Kloet
aa25471517 WIP: working on improving the config file handling 2013-02-11 15:01:00 +01:00
Michal Sciubidlo
f4d60ae7b2 Files sorting (masters then plugins). 
Remove unneeded includes.
 2013-02-10 19:59:25 +01:00
scrawl
d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-09 16:40:10 +01:00
Michal Sciubidlo
f7e5ea24f4 Merge branch 'startup' into cs_load. 
Fix include in textinputdialog.cpp.
 2013-02-05 21:23:49 +01:00
Michal Sciubidlo
66ec4ca7d9 Split launcher specific code from DataFilesList back to DataFilesPage. 2013-02-04 22:14:14 +01:00
Michal Sciubidlo
155cca0c9a Upload missing files. 
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
 2013-02-02 18:36:01 +01:00
Michal Sciubidlo
ac62dd050d Rename datafilespage to datafileslist 2013-01-30 21:08:27 +01:00
Michal Sciubidlo
f029a9011a Move datafilespage to shared space. 2013-01-30 20:21:03 +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
5579df30ff Implemented data/data-local support and added settingshandlers to main.cpp 2013-01-26 18:19:04 +01:00
Pieter van der Kloet
6faf6f57e1 Added settings file reader/writers for openmw.cfg and settings.cfg 2013-01-25 05:19:06 +01:00
scrawl
e4f140841e Make OpenMW work with Ogre 1.9 2013-01-12 08:23:15 +01:00
Emanuel Guevel
63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter 
Edit other files accordingly.
 2013-01-06 01:37:58 +01:00
Marc Zinnschlag
2d468fec02 made previous commits naming standard compliant 2012-12-26 16:19:59 +01:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
scrawl
5f7d349126 several missing includes 2012-11-14 05:32:23 +01:00
pvdk
8cdd1e5539 Fixed problem with sorting of the masters in the launcher 2012-11-02 15:06:14 +01:00
Marc Zinnschlag
648b53ef93 removed unused launcher.cfg file 2012-10-31 10:09:27 +01:00
pvdk
b0647d6c8a Fix for Bug #413: resolutions no longer appear multiple times on Windows 2012-10-30 19:05:44 +01:00
pvdk
60aea3653f Modified sorting, should not crash anymore 2012-10-30 18:58:17 +01:00
Pieter van der Kloet
64c348c39e Added support for different encodings 2012-10-30 11:26:48 +01:00
Pieter van der Kloet
433773e0ea Fixed segfault in datafilesmodel because of invalid modelindex row 2012-10-30 11:10:06 +01:00
Pieter van der Kloet
6920958e16 Oops, forgot to add timestamps for master files 2012-10-30 10:08:24 +01:00
Pieter van der Kloet
6e758af05c Launcher cfg is stored in the user location only, fixes Bug #414 2012-10-30 06:51:22 +01:00
Pieter van der Kloet
1c06a06f91 Files are now sorted by modified timestamp, fixes Bug #415 2012-10-30 06:47:39 +01:00
Pieter van der Kloet
ef11a32fee Fixed a bug where a non-existant openmw.cfg would crash the launcher 2012-10-30 05:03:58 +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
pvdk
bc95336183 Merge remote-tracking branch 'upstream/master' into launcher-model 2012-10-12 00:08:14 +02:00
Pieter van der Kloet
5773676986 Got the Data Files tab to use the new model 2012-10-10 22:58:04 +02:00
Pieter van der Kloet
4174d3c235 Added new plugin model for the Data Files tab in the launcher 2012-10-10 21:31:40 +02:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
greye
1339787863 remove underscores from filenames in esm 2012-09-23 23:12:10 +04:00
Marc Zinnschlag
2bb400eaa8 Merge remote-tracking branch 'pvdk/datalocalfix' 2012-09-16 10:36:03 +02:00
Marc Zinnschlag
b041a511b6 Merge remote-tracking branch 'mmd/windowswarnings' 2012-09-16 10:33:06 +02:00
Pieter van der Kloet
4bcc34f4f9 Re-enabled and fixed multiple data directory handling in the launcher 2012-09-16 04:28:51 +02:00
Pieter van der Kloet
97326ffdbf Fixed data-local directory handling in the launcher 2012-09-16 03:01:48 +02:00
Lukasz Gromanowski
99c46093dd Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests 2012-09-08 22:18:25 +03:00
Marc Zinnschlag
2284d76307 re-enabled local data directory support in launcher 2012-09-04 11:02:18 +02:00
Michael Mc Donnell
3c3737ed78 Write error message for exception and fix warning 
Provides details of what went wrong when reading the .esp and also fixes a warning on vs2010.
 2012-08-29 19:38:33 -04:00
Lukasz Gromanowski
34513cf16b Added support for code coverage checking and unittests. 
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-08-19 22:23:46 +03:00
Nikolay Kasyanov
b05dfeae70 bug #348: cleanup 
moved files to appropriate component, moved function to namespace,
added docs
 2012-07-31 01:01:00 +04:00
Nikolay Kasyanov
0cdb651c5e removed excess invocation 2012-07-28 02:05:06 +04:00
Nikolay Kasyanov
fbe9a94568 bug #348: fixed OS X deployment 
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
 2012-07-28 01:55:37 +04:00
Nikolay Kasyanov
94ce95c679 bug #348: works again on OS X 2012-07-25 00:13:33 +04:00
scrawl
e7ab3544ac removed some redundant code 2012-07-21 13:52:12 +02:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
Pieter van der Kloet
2db6e4f4cf Second try: added aspect ratios to the resolution combobox 2012-06-29 19:13:12 +02:00
Marc Zinnschlag
fc063472d0 Revert "Added aspect ratio info to the list of resolutions" 
This reverts commit be5e047106.
 2012-06-29 14:41:19 +02:00
Marc Zinnschlag
e5cdc988a6 Merge remote branch 'pvdk/launcher' 2012-06-28 10:14:03 +02:00
Pieter van der Kloet
dded604eca Improved launcher images made by serpentine 2012-06-28 05:16:26 +02:00
Pieter van der Kloet
be5e047106 Added aspect ratio info to the list of resolutions 2012-06-28 02:06:42 +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
e5159a1950 Modified sorting of the values in the Graphics Page 2012-06-26 15:37:40 +02:00
Pieter van der Kloet
77ac8760d1 Cleaned up the GUI of the Graphics page 2012-06-26 03:07:54 +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
Marc Zinnschlag
1b368506d4 Merge remote branch 'pvdk/filedialog' 2012-06-20 16:05:20 +02:00
Pieter van der Kloet
d162445e68 Got rid of some unwanted warnings and did some cleanup on the launcher 2012-06-20 13:35:05 +02:00
Marc Zinnschlag
95d9c99d0d Merge remote branch 'pvdk/filedialog' 2012-06-20 09:28:43 +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
61ec56debc don't add duplicate resolutions 2012-06-19 16:02:28 +02:00
scrawl
c9e76d3e90 remove extra tokens at the end of the resolution string, if present 2012-06-19 15:57:58 +02:00
Marc Zinnschlag
4a726f272b Merge remote branch 'pvdk/filedialog' 2012-06-17 09:58:39 +02:00
Pieter van der Kloet
f81e127701 Created custom directory dialog which only accepts Data Files dirs 2012-06-17 06:48:32 +02:00
scrawl
b831c3313d render system was not written on launcher exit 2012-06-17 00:47:45 +02:00
Pieter van der Kloet
0bcec32c70 Changed launcher logo to the new one done by Necrod 2012-06-11 02:50:29 +02:00
scrawl
b25d62a7e2 rename antialiasing mode "MSAA 0" to "none" to avoid confusion. 2012-05-22 20:52:38 +02:00
scrawl
ad46049ee0 got the launcher working with the new settings system. 2012-05-22 20:37:18 +02:00
scrawl
355268dae1 make the launcher build and run again, but it doesn't change settings 2012-05-22 19:36:50 +02:00
Pieter van der Kloet
4488be33ce Added missing slash to launcher CMakeLists.txt 2012-03-29 00:12:34 +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