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
16d87ea1d1
Merge branch 'master' into esxSelector
2013-10-25 08:11:24 -05:00
graffy76
f9591ddda6
Reimplemented constentselector view class
2013-10-22 21:52:35 -05: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
Marc Zinnschlag
0be157efea
set dialogue type for newly created dialogue records
2013-10-21 13:39:13 +02:00
graffy76
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
2013-10-01 21:29:45 -05:00
Marc Zinnschlag
0c5f07a65a
added SceneToolMode class
2013-09-28 11:27:24 +02:00
Marc Zinnschlag
84cadc10f4
added scene toolbar buttons (still not doing anything)
2013-09-28 11:06:56 +02:00
Marc Zinnschlag
9ea092927f
added basic scene subview (no functionality yet)
2013-09-28 09:25:54 +02:00
Marc Zinnschlag
d4b2a6b9f1
Merge remote-tracking branch 'graffy76/esxSelector' into saving
2013-09-23 10:09:43 +02:00
Marc Zinnschlag
1c4a4b4f26
generalised RefIdTypeDelegate into IdTypeDelegate
2013-09-22 13:39:44 +02:00
Marc Zinnschlag
3d2281fe80
added signals and functions to Data for handling ID list changes
2013-09-19 12:11:27 +02:00
Marc Zinnschlag
8326ac9b6f
replaced dummy save implementation with a threaded dummy save implementation
2013-09-15 12:53:59 +02:00
Marc Zinnschlag
b7bffc8a79
removed Verifier class (using Operation class without subclassing now)
2013-09-14 15:16:31 +02:00
Marc Zinnschlag
077a157841
moved Operation and Stage from model/tools to model/doc
2013-09-14 14:56:23 +02:00
Marc Zinnschlag
e9f14449eb
added AdjusterWidget
2013-09-10 16:45:01 +02:00
Marc Zinnschlag
25b7cd33ea
added FileWidget; fixed OpenCS configuration
2013-09-08 14:31:20 +02:00
Marc Zinnschlag
ecedb60169
splitting new game and new addon functions (new game currently not working)
2013-09-08 12:06:28 +02:00
Marc Zinnschlag
6cd7da6547
Merge remote-tracking branch 'marcrbouvier/master'
2013-09-03 13:47:07 +02:00
Marc Bouvier
51332b86a1
[Feature #811 ] Only 1 Instance of OpenCS is Allowed
...
If another instance of OpenCS is started, then it will terminate. This
is done by creating a QLocalServer with a unique ID. If another
QLocalServer with the same ID attempts to be opened, then the creation
of the QLocalServer will fail and the application will terminate.
2013-09-03 01:44:21 -05:00
Marc Zinnschlag
3cf60da5a7
added numeric value filter node
2013-08-24 14:43:38 +02:00
Marc Zinnschlag
de956737fe
added text filter node
2013-08-22 14:50:42 +02:00
Marc Zinnschlag
ba6edc55d4
added not filter node
2013-08-22 13:45:50 +02:00
Marc Zinnschlag
806e9a2888
added and and or filter nodes
2013-08-22 13:14:35 +02:00
Marc Zinnschlag
c38860fa72
added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node)
2013-08-18 14:17:18 +02:00
Marc Zinnschlag
236dc9fc43
replaced binary filter node with a n-ary node
2013-08-16 14:18:31 +02:00
Marc Zinnschlag
789a66eaa7
added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now)
2013-08-11 20:39:21 +02:00
Marc Zinnschlag
f5b06d5d52
basic filter tree structure
2013-08-09 14:49:05 +02:00
Marc Zinnschlag
f6226e4859
added Creator class for filters
2013-08-08 15:55:23 +02:00
Marc Zinnschlag
76b9d3dbc1
columns are now identified via an enum instead the name string
2013-08-07 09:36:05 +02:00
Marc Zinnschlag
d2f96deb98
renamed columns.hpp to columimp.hpp
2013-08-02 10:42:52 +02:00
Marc Zinnschlag
adb05737ee
Merge branch 'master' into filter
...
Conflicts:
apps/opencs/model/world/universalid.cpp
apps/opencs/view/doc/view.cpp
apps/opencs/view/world/subviews.cpp
2013-07-30 15:55:50 +02:00
Marc Zinnschlag
102700a498
added specialised Creator for references
2013-07-30 12:53:03 +02:00
Marc Zinnschlag
57be764cce
added specialised Creator for referenceable records
2013-07-30 12:34:18 +02:00
Marc Zinnschlag
82958e6514
added custom creator for cell records
2013-07-28 18:08:57 +02:00
Marc Zinnschlag
32c697abc6
validate IDs entered by the user
2013-07-28 14:40:11 +02:00
Marc Zinnschlag
fee748d4b5
added creator bar UI and cancel button
2013-07-26 21:09:23 +02:00
Marc Zinnschlag
ba5ca5beed
replaced createAndDelete flag with a new class hierarhy (Creator)
2013-07-26 12:35:17 +02:00
Marc Zinnschlag
55e7e71c11
added optional per-subview status bar
2013-07-25 14:29:56 +02:00
Marc Zinnschlag
7600d6c04b
basic filter table
2013-07-22 21:18:47 +02:00
Marc Zinnschlag
6a5ab34971
Merge branch 'region'
2013-07-14 12:19:02 +02:00
Marc Zinnschlag
b17f383c6d
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
...
Conflicts:
apps/opencs/view/world/table.cpp
2013-07-11 09:09:52 +02:00
graffy76
bb049806df
Repo permissions commit fix #2
2013-07-10 21:13:59 -05:00
Marc Zinnschlag
4f05f2bddf
basic region map; non-interactive for now and working with dummy data instead of real cell/region records
2013-07-08 13:12:50 +02:00
Marc Zinnschlag
4986b7d65d
Merge branch 'master' into ref
2013-07-06 17:54:19 +02:00
Marc Zinnschlag
9a49125281
added references table
2013-07-06 17:03:18 +02:00
graffy76
9d95a38934
Implementing delegate for referenceables table Type column
...
Added delegate skeleton class
Added delegate creation code in ViewManager
Added Display_RefRecordType enum to columnbase.hpp
Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp
modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class
2013-06-29 08:54:32 -05:00
graffy76
101c147217
Final changes for record status icon feature, incl. window size user
...
preference
1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
2013-06-20 18:06:25 -05:00
Marc Zinnschlag
5b3d2f5da1
gave Collection class its own header file and removed an unsed cpp file
2013-06-17 14:28:09 +02:00
graffy76
f87eb67968
Fixed conflicts
...
Merge branch 'cs-windows' of https://github.com/Glorf/openmw
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/model/settings/usersettings.hpp
apps/opencs/view/settings/usersettingsdialog.cpp
2013-06-17 06:45:44 -05:00
