graffy76
ed913936f8
Eliminated game & addon keys from profile configuration
2013-11-03 21:36:41 -06:00
graffy76
dace904490
changed game/addon to content for writing to openmw.cfg from launcher
2013-11-03 16:45:18 -06:00
graffy76
1d4b5a2425
Fix broken launcher content file display / selection scheme
...
Disable selection of content files with missing dependencies (grayed
out)
2013-11-03 14:02:41 -06:00
graffy76
12c06a5615
Fixed broken dependency check
2013-11-03 06:21:28 -06:00
graffy76
973803eb2f
Fixed pathing issues in launcher
2013-11-03 00:02:46 -05:00
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
2013-11-02 09:31:23 -05:00
graffy76
cddece4f9e
Another stab at fixing the pathing problem...
2013-11-01 21:47:26 -05:00
graffy76
0cb591e4f6
Fixed path problem with adjuster widget and local data path.
2013-10-31 18:12:13 -05:00
Marc Zinnschlag
f5fbe7361f
Merge remote-tracking branch 'lgro/saving' into saving
2013-10-28 08:35:51 +01:00
graffy76
b51bef0d98
fixed missing adjuster widget in file dialog open view
2013-10-27 20:21:19 -05:00
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>
2013-10-27 20:03:12 +01:00
Lukasz Gromanowski
489475a32f
Corrected compilation error (g++ 4.8.2) triggered by not found declaration
...
in argument-dependent lookup at the point of instantiation.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 19:57:05 +01:00
graffy76
ea7a8eb2a4
last commit
2013-10-26 23:04:39 -05:00
graffy76
5e123d3f52
Hide adjusterwidget for open files view
2013-10-26 22:57:22 -05:00
graffy76
9b483c3ae3
Fix for file path issues
2013-10-26 22:55:44 -05:00
graffy76
ba365ff49e
Fixed merge conflicts with saving branch
2013-10-25 19:23:03 -05:00
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
2013-10-25 14:44:22 -05:00
graffy76
1a23cccce3
Implemented Launcher namespace
2013-10-25 11:17:26 -05:00
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
2013-10-25 08:11:24 -05:00
graffy76
2ca7f24731
Fixed filedialog new / edit content path issue
2013-10-24 17:33:28 -05:00
graffy76
b48f066f33
Reimplemented content selector for filedialog and datafilespage classes
2013-10-23 17:39:17 -05:00
graffy76
ba3589bc76
Revert "Implemented ContentSelector as a singleton "charm" modifier for"
...
This reverts commit 24b167b755
2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6
Reimplemented constentselector view class
2013-10-22 21:52:35 -05:00
Marc Zinnschlag
3146af34d6
some fixes for the merged filter branch
2013-10-21 19:28:57 +02:00
Marc Zinnschlag
fdba029566
Merge remote-tracking branch 'sirherrbatka/filters' into saving
2013-10-21 18:59:12 +02:00
Marek Kochanowicz
ce2c558257
Missed a file.
2013-10-21 18:40:20 +02:00
Marek Kochanowicz
70602c2c36
Removed changes in the unimplemented copy ctor.
2013-10-21 18:24:16 +02:00
Marek Kochanowicz
5e1bdd605b
Corrected formatting in document.hpp
2013-10-21 18:15:26 +02:00
Marc Zinnschlag
743c6ea5b1
save dialogue records
2013-10-21 16:47:32 +02:00
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
2013-10-21 16:45:43 +02:00
Marek Kochanowicz
b23df42817
Removed old comment. Changed to set resources path correctly.
2013-10-21 16:06:16 +02:00
Marc Zinnschlag
3b85d97087
handle deleted dialogue records
2013-10-21 15:38:13 +02:00
Marc Zinnschlag
dc12648a3e
add fixed dialogue records when creating a new omwgame file
2013-10-21 14:26:54 +02:00
Marc Zinnschlag
c0e5501431
disallow the deletion of non-topic, non-journal dialogue records
2013-10-21 13:58:47 +02:00
Marc Zinnschlag
0be157efea
set dialogue type for newly created dialogue records
2013-10-21 13:39:13 +02:00
Marc Zinnschlag
75c5316ad7
added dialogue type column to topics table
2013-10-20 17:26:09 +02:00
Marek Kochanowicz
b138533bf3
renamed defaultfilter.omwaddon.project to defaultfilters.
2013-10-20 17:21:09 +02:00
Marc Zinnschlag
adf3a41a83
added topic and journal tables
2013-10-20 17:15:32 +02:00
Marc Zinnschlag
ebf7732912
some cleanup
2013-10-20 15:48:39 +02:00
Marek Kochanowicz
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
2013-10-20 10:56:27 +02:00
Marek Kochanowicz
6b293961b4
This appears to work.
2013-10-20 10:02:33 +02:00
Marek Kochanowicz
155662860c
Added configrue file in cmake. Hopefully it will copy defaultfilters file.
2013-10-20 09:50:16 +02:00
Marek Kochanowicz
cafea438bd
Added missing light filter.
2013-10-20 09:44:10 +02:00
Marek Kochanowicz
762cbf6278
Changed gauntlets filter. It showes now both gauntlets and bracers.
2013-10-19 18:51:36 +02:00
Marek Kochanowicz
184456892b
Added check to load custom filters set when present.
2013-10-19 18:43:47 +02:00
Marek Kochanowicz
4e26a61db3
Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path.
2013-10-18 22:11:14 +02:00
Marek Kochanowicz
a7002e8a09
Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.
2013-10-17 18:21:41 +02:00
scrawl
3a3f2a37c8
Add cut, copy & paste of text
2013-10-17 12:47:49 +02:00
Marc Zinnschlag
74f7071b82
Merge remote-tracking branch 'jeaye/gitignore'
2013-10-17 10:25:41 +02:00
jeaye
04735a6734
Extend .gitignore
...
Organize .gitignore to make it easier to add to
Ignore only binaries, not directories
Removed some invalid ignores (.cfg, .desktop, etc)
Better globbing
2013-10-16 14:44:18 -07:00
