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 |
graffy76
|
6d439d032f
|
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
|
11 years ago |
graffy76
|
ed913936f8
|
Eliminated game & addon keys from profile configuration
|
11 years ago |
graffy76
|
dace904490
|
changed game/addon to content for writing to openmw.cfg from launcher
|
11 years ago |
Marc Zinnschlag
|
3ac58b387b
|
fixed wording of an error message
|
11 years ago |
graffy76
|
1d4b5a2425
|
Fix broken launcher content file display / selection scheme
Disable selection of content files with missing dependencies (grayed
out)
|
11 years ago |
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)
|
12 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 |