graffy76
973803eb2f
Fixed pathing issues in launcher
11 years ago
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
11 years ago
scrawl
636d399c7f
Refactored Ogre initialisation into a component
11 years ago
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>
11 years ago
graffy76
ba365ff49e
Fixed merge conflicts with saving branch
11 years ago
scrawl
8c9a5de26f
Fix an irritating error message
11 years ago
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
11 years ago
graffy76
1a23cccce3
Implemented Launcher namespace
11 years ago
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
11 years ago
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
11 years ago
graffy76
f9591ddda6
Reimplemented constentselector view class
11 years ago
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
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
a5a0f61533
Fixed missing profiles combobox
11 years ago
graffy76
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
11 years ago
graffy76
24b167b755
Implemented ContentSelector as a singleton "charm" modifier for
...
FileDialog...
11 years ago
Tom Mason
dd0a416249
cleaned up bloodmoon_fix_ini
11 years ago
Tom Mason
fd169c2399
fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder
11 years ago
Lukasz Gromanowski
ef617d408b
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches in launcher.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
graffy76
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
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
graffy76
0eb06ada39
Implemneting drag and drop
11 years ago
Tom Mason
7b9c5c75e7
silenced unshield
11 years ago
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
11 years ago
Alexander "Ace" Olofsson
5e42c73356
Better fix for unshield, comments on changes, no more commented out code.
11 years ago
Alexander "Ace" Olofsson
22a5f7198f
A few fixes to build on Windows
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)
11 years ago
graffy76
e6fdc7e7fd
...
12 years ago
graffy76
6898321676
Reenabling features
...
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
12 years ago
graffy76
24e38846da
Fixed broken profile actions
12 years ago
graffy76
b52645bf2a
Fixes to accommodate master/plugin loading
12 years ago
Tom Mason
7f0f9037be
fix for older versions of unshield
12 years ago
Tom Mason
06ff40eda7
only use unshield on not windows
12 years ago
Tom Mason
865a7c63df
cmake for system libunshield
12 years ago
Tom Mason
d3748cd5bb
Install uncompressed data files from cd
12 years ago
Tom Mason
9d1daf7dc2
enum was unnecessary
12 years ago
Tom Mason
641b7b0336
anonymous namespace
12 years ago
Tom Mason
454b64974d
filenames
12 years ago
Tom Mason
3264b5974e
fix invalid syntax
12 years ago
Tom Mason
90a892d304
unshield fixes
12 years ago
Tom Mason
ceb3317807
Integrate unshield with launcher
12 years ago
graffy76
f6217f9c6a
Moved esx selector classes out of global namespace
12 years ago
graffy76
a14e0b32d8
Restructured esxselector directory
...
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
12 years ago
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
12 years ago
graffy76
2878f51cd3
Reimplemented dependency selection feature
...
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
12 years ago
graffy76
b24dd5c6ac
Continued migration of code to ContentSelector
12 years ago
graffy76
61602789e1
Began migrating code to ContentSelector base
12 years ago
graffy76
4c8c6d6971
Moved init code to master / plugin proxy classes
12 years ago
graffy76
7389507eb5
Created masterproxylist class
12 years ago
graffy76
2bc56d0b5c
Fixed missing item list in launcher combobox
12 years ago
graffy76
b850fe0289
Removed vertical headers from plugin view
12 years ago
graffy76
49c4e1bf9e
Removed master table widget
12 years ago
graffy76
84e5c2610a
Implemented combobox for game file selection
12 years ago
Marc Zinnschlag
8ffea60b72
some cleanup
12 years ago
Marc Zinnschlag
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
12 years ago
Sebastian Wick
20e591fe18
use index instead of string manipulation
12 years ago
Sebastian Wick
357974a429
more minor stuff
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
d364fd8561
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
Sebastian Wick
0e29286856
fix custom resolution maximum
12 years ago
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
12 years ago
Marc Zinnschlag
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
12 years ago
darkf
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
darkf
fb462f1b1a
launcher: Throw error if no data files are selected
12 years ago
darkf
fd25616cab
launcher: Properly quit if settings write fails.
12 years ago
pvdk
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
12 years ago
Marc Zinnschlag
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
12 years ago
graffy76
f6203cac2a
update for master
12 years ago
pvdk
d5d14c5147
Fixes issue with multiple spaces in plugin filename not being read correctly
12 years ago
Bret Curtis
c1ec16986b
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
12 years ago
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>
12 years ago
pvdk
e76d03dcc4
Added a warning message to the importer dialog
12 years ago
Marc Zinnschlag
0092a2f437
Merge remote-tracking branch 'pvdk/firstrunfix'
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
c15d920133
Fixed the first run dialog, makes sure Morrowind.ini is found
12 years ago
pvdk
110dd5d0ee
Possible fix for the resolutions not appearing with Direct3D Renderer
12 years ago
Marc Zinnschlag
ce67fbdfca
Merge remote-tracking branch 'pvdk/encoding'
12 years ago
pvdk
31ba332647
Moved Windows icon to files/launcher
12 years ago
pvdk
f574c37e93
Added encoding flag to ini importer arguments
12 years ago
pvdk
81604613b5
Narrowed down includes to improve compile time
12 years ago
Marc Zinnschlag
a0df25c631
Merge remote-tracking branch 'pvdk/uifix'
12 years ago
Pieter van der Kloet
b4d408af5d
Added actions to datafiles.ui and implemented them in the launcher
12 years ago
Pieter van der Kloet
fc1940257a
Fixed issue with new profile dialog being too small
12 years ago
Pieter van der Kloet
091c569fbe
Fixed issue with the combobox dropdown looking weird
12 years ago
pvdk
52e5dcc7f0
Some fixes to the way data paths are saved and settings are handled
12 years ago
Pieter van der Kloet
9145fb210b
Merge remote-tracking branch 'upstream/master' into opencsui
12 years ago
Pieter van der Kloet
7504ae675b
Implemented a file dialog for the editor using launcher .ui
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
770d8af931
Forgot to add the DataFilesPage .ui
12 years ago
Pieter van der Kloet
75cf009101
Finished implementing the .ui file for the DataFilesPage
12 years ago
Pieter van der Kloet
4c9d0563fe
WIP: Implementing the .ui for the DataFilesPage
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
0a6e3701ab
Made the Play page use a .ui file too
12 years ago
Pieter van der Kloet
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
12 years ago
Pieter van der Kloet
2b6bb9657b
Added Qt Designer .ui files
12 years ago
Pieter van der Kloet
b209b6a0e6
Added missing includes
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
c4ebdc230c
Cleaned up strings and indentation
12 years ago
Pieter van der Kloet
a0007325ad
Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins
12 years ago
Pieter van der Kloet
17a0a201df
Various fixes and changes to the settings handling
12 years ago
Pieter van der Kloet
919d1ee572
Some fixes to the settings handlers
12 years ago
Pieter van der Kloet
4737b20e4c
Fixed a bug in the combobox popup font size, items overlapping
12 years ago
Pieter van der Kloet
be43fa334f
Added support for non-latin characters, fixes Bug #515
12 years ago
Pieter van der Kloet
9198afeefb
Improved context menu, added context menu for masters and added multi-selection support
12 years ago
Pieter van der Kloet
150d4a7a72
Added support for multiple ini files
12 years ago
Pieter van der Kloet
63a13cf9ca
Whoops, removed an include
12 years ago
Pieter van der Kloet
18d01cd65a
Implemented a first-run dialog to import Morrowind.ini settings
12 years ago
Pieter van der Kloet
2172fb4229
Added checkable message box class
12 years ago
Pieter van der Kloet
35b68a3c40
Fixed accidental profile deletion and added sorting by date
12 years ago
Pieter van der Kloet
bcf4f96209
Added writing masters/plugins to openmw.cfg
12 years ago
Pieter van der Kloet
178cf2154e
Made checking/unchecking work with the new datafiles model
12 years ago
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
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
Pieter van der Kloet
43e9ad8733
The text color of the profiles dialog now turns red on invalid names
12 years ago
Pieter van der Kloet
990895fd2b
Mainwindow size and position now gets saved/restored
12 years ago
Pieter van der Kloet
1b9cf8c23f
More work on integrating the settings parser, profiles are handled correctly
12 years ago
Pieter van der Kloet
5d1bede9e5
Forgot to add two files
12 years ago
Pieter van der Kloet
aa25471517
WIP: working on improving the config file handling
12 years ago
Michal Sciubidlo
f4d60ae7b2
Files sorting (masters then plugins).
...
Remove unneeded includes.
12 years ago
scrawl
d47090b312
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
12 years ago
Michal Sciubidlo
f7e5ea24f4
Merge branch 'startup' into cs_load.
...
Fix include in textinputdialog.cpp.
12 years ago
Michal Sciubidlo
66ec4ca7d9
Split launcher specific code from DataFilesList back to DataFilesPage.
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
ac62dd050d
Rename datafilespage to datafileslist
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
Pieter van der Kloet
5579df30ff
Implemented data/data-local support and added settingshandlers to main.cpp
12 years ago
Pieter van der Kloet
6faf6f57e1
Added settings file reader/writers for openmw.cfg and settings.cfg
12 years ago
scrawl
e4f140841e
Make OpenMW work with Ogre 1.9
12 years ago
Emanuel Guevel
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
12 years ago
Marc Zinnschlag
2d468fec02
made previous commits naming standard compliant
12 years ago
lazydev
74ae479780
Cell names localization fix
12 years ago
scrawl
5f7d349126
several missing includes
12 years ago
pvdk
8cdd1e5539
Fixed problem with sorting of the masters in the launcher
12 years ago
Marc Zinnschlag
648b53ef93
removed unused launcher.cfg file
12 years ago
pvdk
b0647d6c8a
Fix for Bug #413 : resolutions no longer appear multiple times on Windows
12 years ago
pvdk
60aea3653f
Modified sorting, should not crash anymore
12 years ago
Pieter van der Kloet
64c348c39e
Added support for different encodings
12 years ago
Pieter van der Kloet
433773e0ea
Fixed segfault in datafilesmodel because of invalid modelindex row
12 years ago
Pieter van der Kloet
6920958e16
Oops, forgot to add timestamps for master files
12 years ago
Pieter van der Kloet
6e758af05c
Launcher cfg is stored in the user location only, fixes Bug #414
12 years ago
Pieter van der Kloet
1c06a06f91
Files are now sorted by modified timestamp, fixes Bug #415
12 years ago
Pieter van der Kloet
ef11a32fee
Fixed a bug where a non-existant openmw.cfg would crash the launcher
12 years ago
Pieter van der Kloet
d065b56948
Fixed default profile adding and made switching profiles more efficient
12 years ago
Pieter van der Kloet
fe9120bcb3
Added support for the profiles and made creation/editing them more user friendly
12 years ago
Pieter van der Kloet
ab8894e07a
Merge remote-tracking branch 'origin/launcher-model' into launcher-model
...
Conflicts:
apps/launcher/datafilespage.cpp
12 years ago
Pieter van der Kloet
6433b1e022
Some minor fixes
12 years ago
pvdk
85aaacb41a
Some cleaning of the launcher source dir
12 years ago
pvdk
bc95336183
Merge remote-tracking branch 'upstream/master' into launcher-model
12 years ago
Pieter van der Kloet
5773676986
Got the Data Files tab to use the new model
12 years ago
Pieter van der Kloet
4174d3c235
Added new plugin model for the Data Files tab in the launcher
12 years ago
Marc Zinnschlag
35d099a638
disabling gcc extensions
12 years ago
greye
1339787863
remove underscores from filenames in esm
12 years ago
Marc Zinnschlag
2bb400eaa8
Merge remote-tracking branch 'pvdk/datalocalfix'
12 years ago
Marc Zinnschlag
b041a511b6
Merge remote-tracking branch 'mmd/windowswarnings'
12 years ago
Pieter van der Kloet
4bcc34f4f9
Re-enabled and fixed multiple data directory handling in the launcher
12 years ago
Pieter van der Kloet
97326ffdbf
Fixed data-local directory handling in the launcher
12 years ago
Lukasz Gromanowski
99c46093dd
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
12 years ago
Marc Zinnschlag
2284d76307
re-enabled local data directory support in launcher
12 years ago
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.
13 years ago
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>
13 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
Marc Zinnschlag
e5cdc988a6
Merge remote branch 'pvdk/launcher'
13 years ago
Pieter van der Kloet
dded604eca
Improved launcher images made by serpentine
13 years ago
Pieter van der Kloet
be5e047106
Added aspect ratio info to the list of resolutions
13 years ago
scrawl
b73b39f3c6
launcher bugfix, settings was not written when "Play" was selected
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
Marc Zinnschlag
1b368506d4
Merge remote branch 'pvdk/filedialog'
13 years ago
Pieter van der Kloet
d162445e68
Got rid of some unwanted warnings and did some cleanup on the launcher
13 years ago
Marc Zinnschlag
95d9c99d0d
Merge remote branch 'pvdk/filedialog'
13 years ago
Pieter van der Kloet
e21442f6cc
Fix for Bug #306 : launcher now creates the config dir and returns proper error codes
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
Marc Zinnschlag
4a726f272b
Merge remote branch 'pvdk/filedialog'
13 years ago
Pieter van der Kloet
f81e127701
Created custom directory dialog which only accepts Data Files dirs
13 years ago
scrawl
b831c3313d
render system was not written on launcher exit
13 years ago
Pieter van der Kloet
0bcec32c70
Changed launcher logo to the new one done by Necrod
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