0829548106
Merge remote-tracking branch 'swick/multimonitor'
...
Conflicts:
apps/launcher/graphicspage.cpp
12 years ago
6f7a7b4714
remove old code
12 years ago
bb39a85f16
remove double entries
12 years ago
14d074e3e7
select first screen if none is in the setting
12 years ago
a1fea97c3b
use SDL for resolution -> multimonitor support
12 years ago
d61c12ccfc
minor cleanup
12 years ago
d364fd8561
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
0e29286856
fix custom resolution maximum
12 years ago
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
12 years ago
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
12 years ago
43455129d0
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
12 years ago
fb462f1b1a
launcher: Throw error if no data files are selected
12 years ago
fd25616cab
launcher: Properly quit if settings write fails.
12 years ago
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
12 years ago
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
12 years ago
f6203cac2a
update for master
12 years ago
d5d14c5147
Fixes issue with multiple spaces in plugin filename not being read correctly
12 years ago
c1ec16986b
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
12 years ago
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>
12 years ago
e76d03dcc4
Added a warning message to the importer dialog
12 years ago
0092a2f437
Merge remote-tracking branch 'pvdk/firstrunfix'
12 years ago
75be474005
Use the resolution QRegExp cap() instead of converting ints back and forth
12 years ago
d1860f2d6c
Removed color information from Direct3D resolutions
12 years ago
c15d920133
Fixed the first run dialog, makes sure Morrowind.ini is found
12 years ago
110dd5d0ee
Possible fix for the resolutions not appearing with Direct3D Renderer
12 years ago
ce67fbdfca
Merge remote-tracking branch 'pvdk/encoding'
12 years ago
31ba332647
Moved Windows icon to files/launcher
12 years ago
f574c37e93
Added encoding flag to ini importer arguments
12 years ago
81604613b5
Narrowed down includes to improve compile time
12 years ago
a0df25c631
Merge remote-tracking branch 'pvdk/uifix'
12 years ago
b4d408af5d
Added actions to datafiles.ui and implemented them in the launcher
12 years ago
fc1940257a
Fixed issue with new profile dialog being too small
12 years ago
091c569fbe
Fixed issue with the combobox dropdown looking weird
12 years ago
52e5dcc7f0
Some fixes to the way data paths are saved and settings are handled
12 years ago
9145fb210b
Merge remote-tracking branch 'upstream/master' into opencsui
12 years ago
7504ae675b
Implemented a file dialog for the editor using launcher .ui
12 years ago
c9859382bf
Made the launcher write the custom resolution to file, cleaned resolution parsing
12 years ago
770d8af931
Forgot to add the DataFilesPage .ui
12 years ago
75cf009101
Finished implementing the .ui file for the DataFilesPage
12 years ago
4c9d0563fe
WIP: Implementing the .ui for the DataFilesPage
12 years ago
fb5213a754
Made the GraphicsPage use a .ui file and added support for custom res
12 years ago
0a6e3701ab
Made the Play page use a .ui file too
12 years ago
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
12 years ago
2b6bb9657b
Added Qt Designer .ui files
12 years ago
b209b6a0e6
Added missing includes
12 years ago
9cd8dd39de
Make the launcher code conform to the coding standards and cleanup
12 years ago
c4ebdc230c
Cleaned up strings and indentation
12 years ago
a0007325ad
Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins
12 years ago
17a0a201df
Various fixes and changes to the settings handling
12 years ago
919d1ee572
Some fixes to the settings handlers
12 years ago
4737b20e4c
Fixed a bug in the combobox popup font size, items overlapping
12 years ago
be43fa334f
Added support for non-latin characters, fixes Bug #515
12 years ago
9198afeefb
Improved context menu, added context menu for masters and added multi-selection support
12 years ago
150d4a7a72
Added support for multiple ini files
12 years ago
63a13cf9ca
Whoops, removed an include
12 years ago
18d01cd65a
Implemented a first-run dialog to import Morrowind.ini settings
12 years ago
2172fb4229
Added checkable message box class
12 years ago
35b68a3c40
Fixed accidental profile deletion and added sorting by date
12 years ago
bcf4f96209
Added writing masters/plugins to openmw.cfg
12 years ago
178cf2154e
Made checking/unchecking work with the new datafiles model
12 years ago
fd430dc5a9
Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget
...
Conflicts:
apps/launcher/datafilespage.cpp
components/fileorderlist/datafileslist.cpp
12 years ago
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
43e9ad8733
The text color of the profiles dialog now turns red on invalid names
12 years ago
990895fd2b
Mainwindow size and position now gets saved/restored
12 years ago
1b9cf8c23f
More work on integrating the settings parser, profiles are handled correctly
12 years ago
5d1bede9e5
Forgot to add two files
12 years ago
aa25471517
WIP: working on improving the config file handling
12 years ago
f4d60ae7b2
Files sorting (masters then plugins).
...
Remove unneeded includes.
12 years ago
d47090b312
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
12 years ago
f7e5ea24f4
Merge branch 'startup' into cs_load.
...
Fix include in textinputdialog.cpp.
12 years ago
66ec4ca7d9
Split launcher specific code from DataFilesList back to DataFilesPage.
12 years ago
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
ac62dd050d
Rename datafilespage to datafileslist
12 years ago
f029a9011a
Move datafilespage to shared space.
12 years ago
25edba0887
Rewriting the config code of the pages to use the new settings classes
12 years ago
5579df30ff
Implemented data/data-local support and added settingshandlers to main.cpp
12 years ago
6faf6f57e1
Added settings file reader/writers for openmw.cfg and settings.cfg
12 years ago
e4f140841e
Make OpenMW work with Ogre 1.9
12 years ago
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
12 years ago
2d468fec02
made previous commits naming standard compliant
12 years ago
74ae479780
Cell names localization fix
12 years ago
5f7d349126
several missing includes
12 years ago
8cdd1e5539
Fixed problem with sorting of the masters in the launcher
12 years ago
648b53ef93
removed unused launcher.cfg file
12 years ago
b0647d6c8a
Fix for Bug #413 : resolutions no longer appear multiple times on Windows
12 years ago
60aea3653f
Modified sorting, should not crash anymore
12 years ago
64c348c39e
Added support for different encodings
12 years ago
433773e0ea
Fixed segfault in datafilesmodel because of invalid modelindex row
12 years ago
6920958e16
Oops, forgot to add timestamps for master files
12 years ago
6e758af05c
Launcher cfg is stored in the user location only, fixes Bug #414
12 years ago
1c06a06f91
Files are now sorted by modified timestamp, fixes Bug #415
12 years ago
ef11a32fee
Fixed a bug where a non-existant openmw.cfg would crash the launcher
12 years ago
d065b56948
Fixed default profile adding and made switching profiles more efficient
12 years ago
fe9120bcb3
Added support for the profiles and made creation/editing them more user friendly
12 years ago
ab8894e07a
Merge remote-tracking branch 'origin/launcher-model' into launcher-model
...
Conflicts:
apps/launcher/datafilespage.cpp
12 years ago
6433b1e022
Some minor fixes
12 years ago
85aaacb41a
Some cleaning of the launcher source dir
12 years ago
bc95336183
Merge remote-tracking branch 'upstream/master' into launcher-model
12 years ago
5773676986
Got the Data Files tab to use the new model
12 years ago
4174d3c235
Added new plugin model for the Data Files tab in the launcher
12 years ago
35d099a638
disabling gcc extensions
12 years ago
1339787863
remove underscores from filenames in esm
12 years ago
2bb400eaa8
Merge remote-tracking branch 'pvdk/datalocalfix'
12 years ago
b041a511b6
Merge remote-tracking branch 'mmd/windowswarnings'
12 years ago
4bcc34f4f9
Re-enabled and fixed multiple data directory handling in the launcher
12 years ago
97326ffdbf
Fixed data-local directory handling in the launcher
12 years ago
99c46093dd
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
12 years ago
2284d76307
re-enabled local data directory support in launcher
12 years ago
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.
13 years ago
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>
13 years ago
b05dfeae70
bug #348 : cleanup
...
moved files to appropriate component, moved function to namespace,
added docs
13 years ago
0cdb651c5e
removed excess invocation
13 years ago
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
94ce95c679
bug #348 : works again on OS X
13 years ago
e7ab3544ac
removed some redundant code
13 years ago
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
2db6e4f4cf
Second try: added aspect ratios to the resolution combobox
13 years ago
fc063472d0
Revert "Added aspect ratio info to the list of resolutions"
...
This reverts commit be5e047106
13 years ago
e5cdc988a6
Merge remote branch 'pvdk/launcher'
13 years ago
dded604eca
Improved launcher images made by serpentine
13 years ago
be5e047106
Added aspect ratio info to the list of resolutions
13 years ago
b73b39f3c6
launcher bugfix, settings was not written when "Play" was selected
13 years ago
e5159a1950
Modified sorting of the values in the Graphics Page
13 years ago
77ac8760d1
Cleaned up the GUI of the Graphics page
13 years ago
6fe471c1c6
Resolutions are now sorted descendingly and removed some debug stuff
13 years ago
6a2bcddef5
Changed the way the launcher exits and polished the error handling code
13 years ago
1b368506d4
Merge remote branch 'pvdk/filedialog'
13 years ago
d162445e68
Got rid of some unwanted warnings and did some cleanup on the launcher
13 years ago
95d9c99d0d
Merge remote branch 'pvdk/filedialog'
13 years ago
e21442f6cc
Fix for Bug #306 : launcher now creates the config dir and returns proper error codes
13 years ago
61ec56debc
don't add duplicate resolutions
13 years ago
c9e76d3e90
remove extra tokens at the end of the resolution string, if present
13 years ago
4a726f272b
Merge remote branch 'pvdk/filedialog'
13 years ago
f81e127701
Created custom directory dialog which only accepts Data Files dirs
13 years ago
b831c3313d
render system was not written on launcher exit
13 years ago
0bcec32c70
Changed launcher logo to the new one done by Necrod
13 years ago
b25d62a7e2
rename antialiasing mode "MSAA 0" to "none" to avoid confusion.
13 years ago
ad46049ee0
got the launcher working with the new settings system.
13 years ago
355268dae1
make the launcher build and run again, but it doesn't change settings
13 years ago
4488be33ce
Added missing slash to launcher CMakeLists.txt
13 years ago
2b2eb34f8f
Merge remote branch 'corristo/master' into next
13 years ago
66b31d3d43
Bug #229 (Fixed): On OS X Launcher cannot launch game if path to binary contains spaces
13 years ago
155cd76f37
Changed Launcher font to EB Garamond and added license info
13 years ago
73a1b256a8
Changed warning dialog text to be less ambiguous
13 years ago
fd4826d06f
Fix for Bug #222 , config is always written to user location now
13 years ago
0b517d15c1
Made missing data files dialog less scary and added exception handling for esmreader
13 years ago
b7eb7ff8e3
Added support for linking static Ogre libraries and plugins into the launcher and openmw.
13 years ago
1ed1c29db9
Fix Boost path problem for Boost versions below 1.43
13 years ago
96c0b8760e
Got rid of the console showing up on Windows and removed libpng stuff
13 years ago
2429f3960f
Merge remote-tracking branch 'upstream/master' into launcher
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
13 years ago
b283ad86fb
revert to old launcher stylesheet location on OS X
13 years ago
5ffa3264b2
Appended resources/ to the stylesheet path
13 years ago
11ec5cf2e2
Stylesheet location changed in CMakeLists and some minor fixes to the launcher
13 years ago
b320733e45
Fixed Qt exits, this time for all occurrences
13 years ago
5b54a658d8
Launcher improvements: ask for data dir and write it to cfg if none is found
...
and prevent removal of the default profile
13 years ago
1512481c07
Changed the way whitespace was removed from retrieved Ogre values
13 years ago
7aaa7f185f
same for launcher
13 years ago
d58b408ae1
Deploying Qt image format plugins on OS X considered useless
13 years ago
c9a1789db8
Bug fix for processing data paths in OpenMW Launcher.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
13 years ago
547d6a0639
Merge remote branch 'lgro/config' into config
13 years ago
0c0b594090
Issue #168 - Configuration cleanup
...
Removed unnecessary path methods - according to forum disscusion:
http://openmw.org/forum/viewtopic.php?f=6&t=448
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
d9c1ed3d5e
Merge remote branch 'corristo/osx-packaging' into config
13 years ago
2020d916ec
added missing comment
13 years ago
57a4b19880
Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete
13 years ago
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
13 years ago
5a42c6c6f5
Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher
13 years ago
eea8773be1
Changed the order of preference for the configuration files
13 years ago
472d88e2c5
Feature #162 - Need to create app bundle using CMake, not by hand WIP
13 years ago
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
9794c4b928
Merge branch 'cmake'
13 years ago
cb1373a4c7
rewrote cmake scripts for components
13 years ago
4e25200844
fixed usage of Qt exit
13 years ago
0e3859385d
Now ensures that the directory to the config file exists before Ogre tries to access it
13 years ago
5dbbc5bb7b
Changed error handling for Ogre config and made the launcher exit cleanly
13 years ago
9e34f30500
Merge remote-tracking branch 'upstream/master'
13 years ago
22514cbd4c
Merge branch 'debfix'
13 years ago
9872c89539
packaging fixes for .deb packages
13 years ago
6bfaf221e8
Created working icon for Windows and removed QMake file (not parsed by CMake)
13 years ago
7c8853f6fe
post-merge fixes
13 years ago
0defc590bc
Quick fix for always using OpenGL rendering, no matter the selected rendersystem
14 years ago
ada552ed1f
Added tooltip with plugin info and visual indication of missing masters
14 years ago
b7ae31d5fe
Fixed a context menu bug which caused an assert on empty view
14 years ago
c9be134226
Fixed config file writing when file does not exist
14 years ago
3e6658428b
Removed commented line
14 years ago
889e7d6c2e
Config file handling changes to use the right priority and behave like openmw
14 years ago
b60bb408fd
Added some useful error messages when things go wrong with Ogre
14 years ago
ccfd011df6
Modified write function to always use user location for openmw.cfg
14 years ago
d43455fd57
Issue #168 : Configuration cleanup, part 2
...
Corrected --data and --data-local parameters handling.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
54cb6deab9
Issue #168 : Configuration cleanup, part 2
14 years ago
ceb8190121
Modified config saving to use Ogre's own methods instead of custom stuff
14 years ago
ea7eb7a62d
fixes #128 Configuration cleanup.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
50773448d9
Small change in the way config files are found, now includes global config and error handling
14 years ago
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
141e779e81
Some small launcher fixes
14 years ago
b51ab69ab7
Merge remote-tracking branch 'upstream/newlauncher' into newlauncher
14 years ago
88edbad717
Changed plugins.cfg lookup code to include the global directory
14 years ago
8c4a246abd
Disabled Ogre debug output to stdout/stderr
14 years ago
3fb99fa4b5
Modified Ogre exception handling to get rid of a compiler warning
14 years ago
14704e65a1
minor fix
14 years ago
1b536d69f3
Added and removed some debugging information
14 years ago
18d8d89bdb
Removed all debug messages
14 years ago
c9c54fed8f
Modified Boost fix to work with Boost ≥ 1.46
14 years ago
0acf34a0de
boost compatibility fix
14 years ago
57a18d4a24
Combobox hack should be applied to the play tab, not the data files tab. Fixed it.
14 years ago
53d778762e
Added dirty hack to get the combobox to work on Mac and GTK platforms
14 years ago
7cbed6c58a
Replaced some costly string-comparisons with QLatin1String
14 years ago
6716bf649e
Some stylesheet improvements and a drop-shadow for the scroll background
14 years ago
24947d800a
Fixed launcher config and style location. Launcher will be started when opening bundle
14 years ago
1278ce2514
Fixed problem with png images
14 years ago
9f88796648
Appended a space to the Current Profile: label
14 years ago
d2a0d3dd67
Launcher: small fix for mac
14 years ago
db20186e50
Added newline to the end of some files, GitHub was complaining about it
14 years ago
118765a274
Renamed the launcher executable and icons, added .desktop file and default config, modified/updated some other files
14 years ago
8b58e53be9
Removed debug messages and cleaned up some old code
14 years ago
dcf4d242a5
Added warning message if Ogres config cannot be read
14 years ago
83e642678f
Put the filter input in a toolbar and made it work with a shortcut (Alt+F)
14 years ago
15df25f947
Cleaned up the CMakeList file
14 years ago
371ec41530
Plugins moved using the actions now keep their selection too
14 years ago
6feaac3d6f
Removed isChecked function, can be done with less code
14 years ago
410229e521
Dropped plugins now retain their selection so you can see where they went
14 years ago
8b50cd48f5
Added refresh functionality for the plugins table
14 years ago
44e3cf17d7
Fallback icons for the actions in the right-click context menu
14 years ago
8495d91d7c
Added right-click context menu for modifying the plugins, e.g. move up, check/uncheck
14 years ago
9d2bf8af62
Added support for the load order of plugins specified in the profiles
14 years ago
f219b0d47a
Added error messages and fixed config file loading
14 years ago
8c04d00a50
Modified row height of the plugins table to use the height of checkbox instead of dynamic resizing
14 years ago
eba813b4ac
Fixed clear button in the filter line-edit and changed "delete profile" icon
14 years ago
157822eeaf
Removed what's this? button from dialog titlebar
14 years ago
b877a94481
Modified the launcher to use the new multi-dir plugin approach
14 years ago
ac965af671
Moved functions around for better readability
14 years ago
d3143c6e52
Implemented filter function for the plugin list
14 years ago
9b439d74da
Removed some leftover files belonging to the old launcher
14 years ago
b9acc4a0ac
Implemented the Graphics page, launcher now loads and saves Ogre settings
14 years ago
409bd0fe7e
Moved the stylesheet to main.cpp and made some stylesheet-related changes
14 years ago
a0586cda99
Complete support for fallback icons on Windows using the Tango theme
14 years ago
76653cb2d5
Started working on fallback icons for Windows
14 years ago
1487daac3d
Fixed preprocessor #if to #ifdef
14 years ago
0ff068817e
Fixed icon and changed minimumsize
14 years ago
dbd37a6d58
Added messageboxes for game execution errors
14 years ago
2131452fac
Fixed file loading problem with relative paths when launcher wasn't run from cmdline
14 years ago
c42f99a586
Implemented starting the game by pressing either the big play button or the dialog play button
14 years ago
2b0dabe669
Changed profile switching again; Some stylesheet modifications
14 years ago
7bf21262a1
Plugins and masters from the current profile are written to openmw.cfg now
14 years ago
a68be84b7f
Re-implemented the profile combobox on the Play page
14 years ago
4dbdc1cb26
Implemented copy and delete profile functions
14 years ago
9e852a36bf
Changed all QList<> to const
14 years ago
ee4a2d0a8d
Fixed a problem with the currentprofile not being set in the combobox
14 years ago
ba3e4330f2
Changed the way the masters get retrieved in masterSelectionChanged
14 years ago
2e058409bd
Fixed problem with profile writeout
14 years ago
Marc Zinnschlag
Sebastian Wick
graffy76
darkf
pvdk
Bret Curtis
Lukasz Gromanowski
Michal Sciubidlo
scrawl
Emanuel Guevel
lazydev
greye
Michael Mc Donnell
Nikolay Kasyanov
k1ll
Jacob Essex
Alexander "Ace" Olofsson