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

501 commits

Author SHA1 Message Date
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