mirror
/
openmw
mirror of https://github.com/OpenMW/openmw
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,317 Commits 115 Branches 76 Tags 173 MiB
Commit Graph

135 Commits

Author SHA1 Message Date
Marc Zinnschlag dec1483fa4 Merge branch 'saving' into openmw-27 2013-11-04 08:57:32 +01:00
scrawl 636d399c7f Refactored Ogre initialisation into a component 2013-10-30 14:04:33 +01:00
scrawl 8c9a5de26f Fix an irritating error message 2013-10-25 23:47:53 +02:00
graffy76 1a23cccce3 Implemented Launcher namespace 2013-10-25 11:17:26 -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 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
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 f6217f9c6a Moved esx selector classes out of global namespace 2013-08-18 15:11:29 -05:00
Sebastian Wick 20e591fe18 use index instead of string manipulation 2013-06-23 21:56:27 +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 0e29286856 fix custom resolution maximum 2013-06-22 19:15:13 +02: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 110dd5d0ee Possible fix for the resolutions not appearing with Direct3D Renderer 2013-03-15 01:56:39 +01:00
pvdk 81604613b5 Narrowed down includes to improve compile time 2013-03-12 01:29:13 +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 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 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 9cd8dd39de Make the launcher code conform to the coding standards and cleanup 2013-02-25 21:22:07 +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 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
scrawl d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-09 16:40:10 +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 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
scrawl e4f140841e Make OpenMW work with Ogre 1.9 2013-01-12 08:23:15 +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 85aaacb41a Some cleaning of the launcher source dir 2012-10-12 02:25:14 +02: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
Pieter van der Kloet be5e047106 Added aspect ratio info to the list of resolutions 2012-06-28 02:06:42 +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
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
scrawl b831c3313d render system was not written on launcher exit 2012-06-17 00:47:45 +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
k1ll b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 2012-03-15 15:51:39 +01:00
Pieter van der Kloet 2429f3960f Merge remote-tracking branch 'upstream/master' into launcher 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
 2012-03-05 23:43:59 +01:00
Pieter van der Kloet b320733e45 Fixed Qt exits, this time for all occurrences 2012-02-28 21:00:02 +01:00
Pieter van der Kloet 1512481c07 Changed the way whitespace was removed from retrieved Ogre values 2012-02-28 17:18:01 +01:00
Pieter van der Kloet 280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 2012-02-22 08:34:47 +01:00
Lukasz Gromanowski 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>
 2012-01-21 01:31:20 +01:00
Marc Zinnschlag 4e25200844 fixed usage of Qt exit 2011-11-03 09:08:40 +01:00
Jacob Essex 0e3859385d Now ensures that the directory to the config file exists before Ogre tries to access it 2011-11-02 11:11:27 +00:00
Pieter van der Kloet 5dbbc5bb7b Changed error handling for Ogre config and made the launcher exit cleanly 2011-10-12 23:02:27 +02:00
Marc Zinnschlag 7c8853f6fe post-merge fixes 2011-09-27 09:45:28 +02:00
Alexander "Ace" Olofsson 0defc590bc Quick fix for always using OpenGL rendering, no matter the selected rendersystem 2011-09-07 10:17:46 +02:00
Pieter van der Kloet b60bb408fd Added some useful error messages when things go wrong with Ogre 2011-09-06 02:02:34 +02:00
Lukasz Gromanowski 54cb6deab9 Issue #168: Configuration cleanup, part 2 2011-09-02 20:01:24 +02:00
Pieter van der Kloet ceb8190121 Modified config saving to use Ogre's own methods instead of custom stuff 2011-09-01 05:53:08 +02:00
Lukasz Gromanowski ea7eb7a62d fixes #128 Configuration cleanup. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-08-19 21:06:09 +02:00
Alexander "Ace" Olofsson a931124a2f Changed the confg writer, it now creates configs identical to those created by Ogre itself. This seems to have solved a small issue with Ogre always using OpenGL rendering even when Direct3D was selected in Windows. 2011-08-02 19:54:19 +02:00
Alexander "Ace" Olofsson 141e779e81 Some small launcher fixes 2011-08-02 19:21:27 +02:00
Pieter van der Kloet 88edbad717 Changed plugins.cfg lookup code to include the global directory 2011-07-31 19:17:52 +02:00
Pieter van der Kloet 8c4a246abd Disabled Ogre debug output to stdout/stderr 2011-07-31 18:13:24 +02:00
Pieter van der Kloet 3fb99fa4b5 Modified Ogre exception handling to get rid of a compiler warning 2011-07-31 17:43:16 +02:00
Pieter van der Kloet 18d8d89bdb Removed all debug messages 2011-07-30 03:09:29 +02:00
Pieter van der Kloet 7cbed6c58a Replaced some costly string-comparisons with QLatin1String 2011-06-26 23:35:23 +02:00
Pieter van der Kloet 8b58e53be9 Removed debug messages and cleaned up some old code 2011-06-24 18:01:24 +02:00
Pieter van der Kloet dcf4d242a5 Added warning message if Ogres config cannot be read 2011-06-24 17:46:02 +02:00
Pieter van der Kloet b9acc4a0ac Implemented the Graphics page, launcher now loads and saves Ogre settings 2011-05-11 01:12:25 +02:00
Pieter van der Kloet 314bac7862 Preliminary support for new profiles and some other modifications and cleanups 2011-05-02 22:21:42 +02:00
Pieter van der Kloet c17eed26f3 Removed whitespace 2011-04-28 21:55:06 +02:00
Pieter van der Kloet fc095b902d Added some more new files 2011-04-28 21:55:04 +02:00