Commit Graph

156 Commits (7b064920dbc1766a28279b72379b7f6383f88a4f)

Author SHA1 Message Date
Bret Curtis d799954ca0 replace and purge boost::math::gcd and other non-used headers 8 years ago
scrawl 84aceedfa2 Add comment 9 years ago
scrawl 3747843c92 Use QString::toInt instead of atoi 9 years ago
cfcohen c26463fd91 Should have coded it the way scrawl said, since it's cleaner. 9 years ago
cfcohen a9c9cc5508 Remove unnecessary copy of mEngineSettings in mInitialSettings. 9 years ago
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.
9 years ago
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.
9 years ago
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
10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl cac288d5be Remove OgreInit 10 years ago
scrawl 03257ecae5 QString encoding fix 10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
Alexander "Ace" Olofsson 942cf26eee And the missing includes 10 years ago
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
10 years ago
Sebastian Wick 639fbfad0b make borderless setting available to the UI 10 years ago
scrawl c6558fe487 Fix Ogre being initialised twice 10 years ago
Thoronador f0d3fc73d5 fix uninitialized pointer fields in GraphicsPage class 10 years ago
Thoronador f69d61976e minor performance improvements in other apps subdirectories 11 years ago
Marc Zinnschlag 04b1657d98 Merge branch 'openmw-27'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
11 years ago
Nikolay Kasyanov dfa900e4e3 OS X: Fixed “macro redefined” warning 11 years ago
Marc Zinnschlag 418ccf705d Merge branch 'openmw-27'
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
11 years ago
Marc Zinnschlag dec1483fa4 Merge branch 'saving' into openmw-27 11 years ago
scrawl 636d399c7f Refactored Ogre initialisation into a component 11 years ago
scrawl 8c9a5de26f Fix an irritating error message 11 years ago
graffy76 1a23cccce3 Implemented Launcher namespace 11 years ago
graffy76 217a4d75b4 Implemented profile function in launcher datafiles page
Implemented dependency sorting to ensure dependent files appear latest
in the list.
11 years ago
graffy76 cfdc19c427 Renamed esxSelector to contentSelector
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
11 years ago
graffy76 7b7dfa122d Merge branch 'master' into esxSelector 11 years ago
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)
12 years ago
graffy76 f6217f9c6a Moved esx selector classes out of global namespace 12 years ago
Sebastian Wick 20e591fe18 use index instead of string manipulation 12 years ago
Sebastian Wick c97fac8116 use QMessageBox to show errors 12 years ago
Sebastian Wick 89dee80dcf simpler remove of duplicates 12 years ago
Sebastian Wick 6abb5d5f75 small fixes 12 years ago
Sebastian Wick dbfc39468b better workaround 12 years ago
Marc Zinnschlag 0829548106 Merge remote-tracking branch 'swick/multimonitor'
Conflicts:
	apps/launcher/graphicspage.cpp
12 years ago
Sebastian Wick 6f7a7b4714 remove old code 12 years ago
Sebastian Wick bb39a85f16 remove double entries 12 years ago
Sebastian Wick 14d074e3e7 select first screen if none is in the setting 12 years ago
Sebastian Wick a1fea97c3b use SDL for resolution -> multimonitor support 12 years ago
Marc Zinnschlag d61c12ccfc minor cleanup 12 years ago
Sebastian Wick 0e29286856 fix custom resolution maximum 12 years ago
pvdk 75be474005 Use the resolution QRegExp cap() instead of converting ints back and forth 12 years ago
pvdk d1860f2d6c Removed color information from Direct3D resolutions 12 years ago
pvdk 110dd5d0ee Possible fix for the resolutions not appearing with Direct3D Renderer 12 years ago
pvdk 81604613b5 Narrowed down includes to improve compile time 12 years ago
Pieter van der Kloet 9145fb210b Merge remote-tracking branch 'upstream/master' into opencsui 12 years ago
Pieter van der Kloet c9859382bf Made the launcher write the custom resolution to file, cleaned resolution parsing 12 years ago
Pieter van der Kloet fb5213a754 Made the GraphicsPage use a .ui file and added support for custom res 12 years ago
Pieter van der Kloet 9cd8dd39de Make the launcher code conform to the coding standards and cleanup 12 years ago
Pieter van der Kloet 17a0a201df Various fixes and changes to the settings handling 12 years ago
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
12 years ago
scrawl d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 12 years ago
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.
12 years ago
Michal Sciubidlo f029a9011a Move datafilespage to shared space. 12 years ago
Pieter van der Kloet 25edba0887 Rewriting the config code of the pages to use the new settings classes 12 years ago
scrawl e4f140841e Make OpenMW work with Ogre 1.9 12 years ago
pvdk b0647d6c8a Fix for Bug #413: resolutions no longer appear multiple times on Windows 12 years ago
pvdk 85aaacb41a Some cleaning of the launcher source dir 12 years ago
Nikolay Kasyanov b05dfeae70 bug #348: cleanup
moved files to appropriate component, moved function to namespace,
added docs
13 years ago
Nikolay Kasyanov 0cdb651c5e removed excess invocation 13 years ago
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
13 years ago
Nikolay Kasyanov 94ce95c679 bug #348: works again on OS X 13 years ago
scrawl e7ab3544ac removed some redundant code 13 years ago
scrawl 014396e80c remove the plugins.cfg files, do not enforce CG plugin 13 years ago
Pieter van der Kloet 2db6e4f4cf Second try: added aspect ratios to the resolution combobox 13 years ago
Marc Zinnschlag fc063472d0 Revert "Added aspect ratio info to the list of resolutions"
This reverts commit be5e047106.
13 years ago
Pieter van der Kloet be5e047106 Added aspect ratio info to the list of resolutions 13 years ago
Pieter van der Kloet e5159a1950 Modified sorting of the values in the Graphics Page 13 years ago
Pieter van der Kloet 77ac8760d1 Cleaned up the GUI of the Graphics page 13 years ago
Pieter van der Kloet 6fe471c1c6 Resolutions are now sorted descendingly and removed some debug stuff 13 years ago
Pieter van der Kloet 6a2bcddef5 Changed the way the launcher exits and polished the error handling code 13 years ago
scrawl 61ec56debc don't add duplicate resolutions 13 years ago
scrawl c9e76d3e90 remove extra tokens at the end of the resolution string, if present 13 years ago
scrawl b831c3313d render system was not written on launcher exit 13 years ago
scrawl b25d62a7e2 rename antialiasing mode "MSAA 0" to "none" to avoid confusion. 13 years ago
scrawl ad46049ee0 got the launcher working with the new settings system. 13 years ago
scrawl 355268dae1 make the launcher build and run again, but it doesn't change settings 13 years ago
k1ll b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 13 years ago
Pieter van der Kloet 2429f3960f Merge remote-tracking branch 'upstream/master' into launcher
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
13 years ago
Pieter van der Kloet b320733e45 Fixed Qt exits, this time for all occurrences 13 years ago
Pieter van der Kloet 1512481c07 Changed the way whitespace was removed from retrieved Ogre values 13 years ago
Pieter van der Kloet 280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 13 years ago
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>
13 years ago
Marc Zinnschlag 4e25200844 fixed usage of Qt exit 13 years ago
Jacob Essex 0e3859385d Now ensures that the directory to the config file exists before Ogre tries to access it 13 years ago
Pieter van der Kloet 5dbbc5bb7b Changed error handling for Ogre config and made the launcher exit cleanly 13 years ago
Marc Zinnschlag 7c8853f6fe post-merge fixes 13 years ago
Alexander "Ace" Olofsson 0defc590bc Quick fix for always using OpenGL rendering, no matter the selected rendersystem 14 years ago
Pieter van der Kloet b60bb408fd Added some useful error messages when things go wrong with Ogre 14 years ago
Lukasz Gromanowski 54cb6deab9 Issue #168: Configuration cleanup, part 2 14 years ago
Pieter van der Kloet ceb8190121 Modified config saving to use Ogre's own methods instead of custom stuff 14 years ago
Lukasz Gromanowski ea7eb7a62d fixes #128 Configuration cleanup.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
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. 14 years ago
Alexander "Ace" Olofsson 141e779e81 Some small launcher fixes 14 years ago
Pieter van der Kloet 88edbad717 Changed plugins.cfg lookup code to include the global directory 14 years ago
Pieter van der Kloet 8c4a246abd Disabled Ogre debug output to stdout/stderr 14 years ago
Pieter van der Kloet 3fb99fa4b5 Modified Ogre exception handling to get rid of a compiler warning 14 years ago
Pieter van der Kloet 18d8d89bdb Removed all debug messages 14 years ago
Pieter van der Kloet 7cbed6c58a Replaced some costly string-comparisons with QLatin1String 14 years ago