Marc Zinnschlag
|
b7bb7d6902
|
Merge remote-tracking branch 'scrawl/master'
Conflicts:
apps/opencs/editor.cpp
|
11 years ago |
Bret Curtis
|
36efe9605f
|
necessary dpkg rules to get opencs building and packaged on dpkg systems
|
11 years ago |
graffy76
|
dace904490
|
changed game/addon to content for writing to openmw.cfg from launcher
|
11 years ago |
|
graffy76
|
12c06a5615
|
Fixed broken dependency check
|
11 years ago |
|
graffy76
|
973803eb2f
|
Fixed pathing issues in launcher
|
11 years ago |
|
graffy76
|
cddece4f9e
|
Another stab at fixing the pathing problem...
|
11 years ago |
scrawl
|
e6960d915a
|
Add simple Ogre widget
|
11 years ago |
|
graffy76
|
0cb591e4f6
|
Fixed path problem with adjuster widget and local data path.
|
11 years ago |
|
graffy76
|
b51bef0d98
|
fixed missing adjuster widget in file dialog open view
|
11 years ago |
|
graffy76
|
ea7a8eb2a4
|
last commit
|
11 years ago |
|
graffy76
|
5e123d3f52
|
Hide adjusterwidget for open files view
|
11 years ago |
|
graffy76
|
9b483c3ae3
|
Fix for file path issues
|
11 years ago |
|
graffy76
|
ba365ff49e
|
Fixed merge conflicts with saving branch
|
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
|
3146af34d6
|
some fixes for the merged filter branch
|
11 years ago |
|
Marc Zinnschlag
|
fdba029566
|
Merge remote-tracking branch 'sirherrbatka/filters' into saving
|
11 years ago |
Marek Kochanowicz
|
70602c2c36
|
Removed changes in the unimplemented copy ctor.
|
11 years ago |
|
Marek Kochanowicz
|
5e1bdd605b
|
Corrected formatting in document.hpp
|
11 years ago |
|
Marc Zinnschlag
|
743c6ea5b1
|
save dialogue records
|
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 |
|
Marek Kochanowicz
|
b23df42817
|
Removed old comment. Changed to set resources path correctly.
|
11 years ago |
|
Marc Zinnschlag
|
3b85d97087
|
handle deleted dialogue records
|
11 years ago |
|
Marc Zinnschlag
|
dc12648a3e
|
add fixed dialogue records when creating a new omwgame file
|
11 years ago |
|
Marc Zinnschlag
|
c0e5501431
|
disallow the deletion of non-topic, non-journal dialogue records
|
11 years ago |
|
Marc Zinnschlag
|
0be157efea
|
set dialogue type for newly created dialogue records
|
11 years ago |
|
Marc Zinnschlag
|
75c5316ad7
|
added dialogue type column to topics table
|
11 years ago |
|
Marc Zinnschlag
|
adf3a41a83
|
added topic and journal tables
|
11 years ago |
|
Marc Zinnschlag
|
ebf7732912
|
some cleanup
|
11 years ago |
|
Marek Kochanowicz
|
96b6787255
|
Getting rid of extension. Correcting tiny mistake in filters file.
|
11 years ago |
|
Marek Kochanowicz
|
184456892b
|
Added check to load custom filters set when present.
|
11 years ago |
|
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.
|
11 years ago |
|
Marek Kochanowicz
|
a7002e8a09
|
Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.
|
11 years ago |
|
Marek Kochanowicz
|
3000386443
|
failed attempt on switch adding.
|
11 years ago |
|
Marc Zinnschlag
|
db7ea30483
|
allow float values in cell for value tests
|
11 years ago |
|
Marc Zinnschlag
|
679754b305
|
corrected an error message
|
11 years ago |
|
Marc Zinnschlag
|
9b0766b678
|
minor fix in ValueNode::toString
|
11 years ago |
|
Marc Zinnschlag
|
4905f1c8ab
|
make testing empty cells against an empty string yield true
|
11 years ago |
|
Marc Zinnschlag
|
b8ae195a46
|
Merge branch 'scene'
|
11 years ago |
|
Marc Zinnschlag
|
4624bed899
|
changed handling of scene toolbar button icons
|
11 years ago |
|
Marc Zinnschlag
|
608d154ad7
|
Merge remote-tracking branch 'rainChu/master'
|
11 years ago |
|
Marc Zinnschlag
|
b5d620a8dc
|
fixed string filter on enum column when column is empty
|
11 years ago |
|
Marc Zinnschlag
|
a29b8667ef
|
fixed string filter on boolean columns when testing against the value false
|
11 years ago |
|
Marc Zinnschlag
|
a77044cda4
|
fixed column numbering
|
11 years ago |
|
graffy76
|
17950210fa
|
Merge branch 'master' into esxSelector
|
11 years ago |
|
Marc Zinnschlag
|
74cee66273
|
consolidated magic numbers for button size
|
11 years ago |