Marc Zinnschlag
|
418ccf705d
|
Merge branch 'openmw-27'
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
|
11 years ago |
graffy76
|
ed913936f8
|
Eliminated game & addon keys from profile configuration
|
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
|
12c06a5615
|
Fixed broken dependency check
|
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 |
graffy76
|
cddece4f9e
|
Another stab at fixing the pathing problem...
|
11 years ago |
scrawl
|
636d399c7f
|
Refactored Ogre initialisation into a component
|
11 years ago |
graffy76
|
b51bef0d98
|
fixed missing adjuster widget in file dialog open view
|
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
|
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
|
16d87ea1d1
|
Merge branch 'master' into esxSelector
|
11 years ago |
graffy76
|
2ca7f24731
|
Fixed filedialog new / edit content path issue
|
11 years ago |
graffy76
|
b48f066f33
|
Reimplemented content selector for filedialog and datafilespage classes
|
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 |
Marc Zinnschlag
|
adf3a41a83
|
added topic and journal tables
|
11 years ago |
Marc Zinnschlag
|
3c580fbc59
|
Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'
|
11 years ago |
Jordan Ayers
|
296b2ab870
|
Magic Effect: Recognize other display types.
Fill out the list of effects which use percentage formatting.
Add in types which use Feet and level labels.
|
11 years ago |
Jordan Ayers
|
6ab7002908
|
MagicEffect: Put magnitude type into ESM::MagicEffect helper.
|
11 years ago |
graffy76
|
4c72a9ffdf
|
Fixed non-loading files
|
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 |
Emanuel Guevel
|
496f786c2a
|
Implement Disable/EnableLevitation script functions
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
|
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 |
Marc Zinnschlag
|
baae548106
|
added project scope filter saving
|
11 years ago |
Marc Zinnschlag
|
4ea5191d7d
|
fixed write function for ESM variant type
|
11 years ago |
Marc Zinnschlag
|
5779f799ab
|
create project file when saving content file
|
11 years ago |
Marc Zinnschlag
|
c42e74dadf
|
make 4 byte record type accessable from record struct
|
11 years ago |
graffy76
|
3b40192e90
|
Merge branch 'master' into esxSelector
|
11 years ago |
graffy76
|
9d358dd44c
|
Further implemented auto-checking / unchecking of dependencies
|
11 years ago |
graffy76
|
d7cff6361e
|
Fixed filter issue (all addons for a gamefile are enabled for checking).
Note: Other dependencies are not yet automatically selected when an
addon is checked.
|
11 years ago |
Marc Zinnschlag
|
d4b2a6b9f1
|
Merge remote-tracking branch 'graffy76/esxSelector' into saving
|
11 years ago |
graffy76
|
513f0c4b3e
|
Implemented file/adjuster widgets into new addon creation dialog
|
11 years ago |
Xethik
|
9f533dbbe4
|
Fixed "most vexing parse" issue.
|
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
|
244e581952
|
Finished implementing drag / drop
refactored datafilesmodel (now contentmodel)
refactored esmfil
|
11 years ago |
graffy76
|
0eb06ada39
|
Implemneting drag and drop
|
11 years ago |
Marc Zinnschlag
|
bf0fba68af
|
added save stage for globals
|
11 years ago |
Marc Zinnschlag
|
874ce26bef
|
added missing consts to record save functions
|
11 years ago |
Marc Zinnschlag
|
1ee228a566
|
fix for the ESMWriter fix
|
11 years ago |
Marc Zinnschlag
|
bcd36bd378
|
various ESMWriter fixes
|
11 years ago |
Marc Zinnschlag
|
bf8a25c2c6
|
Merge remote-tracking branch 'mckibbenta/tgm'
|
11 years ago |
Marc Zinnschlag
|
25b7cd33ea
|
added FileWidget; fixed OpenCS configuration
|
11 years ago |
graffy76
|
a6e7cf9a8c
|
Implementing drag and drop
|
11 years ago |
Marc Zinnschlag
|
9332684335
|
allow the use of value types in string filters
|
11 years ago |
scrawl
|
188df341c3
|
Replaced log2 to make VC happy
|
12 years ago |