artemutin@yandex.ru
b0018aa791
Fix namespace, add file to CMakeLists.txt
...
(cherry picked from commit e672880f64
)
2015-11-01 22:34:49 +11:00
Marc Zinnschlag
3eef192e4d
create merged document and open a view for it (document is still empty at this point)
...
(cherry picked from commit 1b663f01af
)
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/documentmanager.cpp
2015-11-01 13:31:28 +11:00
Marc Zinnschlag
e4381c3ec8
added merge operation (doesn't do anything yet)
...
(cherry picked from commit 904ad94952
)
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
2015-11-01 13:25:34 +11:00
Marc Zinnschlag
ef1e01639e
added UI for merge tool (merge tool itself is still missing)
...
(cherry picked from commit b83f9445a9
)
Conflicts:
apps/opencs/editor.cpp
apps/opencs/editor.hpp
2015-11-01 13:22:42 +11:00
Stanislav Bas
b53a77389b
Show race only when mesh type is Skin (in BodyParts table)
2015-09-08 06:47:34 +10:00
Stanislav Bas
ef02bc657f
Add magic effect verifier
2015-09-08 06:20:25 +10:00
Stanislav Bas
b667500ae2
Add the configuration widget for extended commands
...
Conflicts:
apps/opencs/CMakeLists.txt
2015-07-30 09:20:05 +10:00
Marc Zinnschlag
c5eec822ae
display script errors in script subview
2015-07-27 15:20:21 +10:00
Stanislav Bas
110306f6b0
Create a separate class for Edit 'ID' action to use in tables' context menus
2015-07-27 13:44:07 +10:00
cc9cii
740c8bc6f1
Merge branch 'master' into cc9cii
...
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/view/world/dialoguesubview.cpp
2015-07-27 10:53:39 +10:00
Marc Zinnschlag
49dc30683f
refactored dialogue subview button bar into a new class
2015-06-27 12:49:56 +02:00
cc9cii
2612a91f8d
Merge branch 'master' into autocalc
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.hpp
apps/opencs/view/world/dialoguesubview.cpp
2015-06-27 07:46:36 +10:00
Marc Zinnschlag
f3ff90e1fd
moved meta data into a new single-row table
2015-06-26 13:01:25 +02:00
cc9cii
66877cbfe7
Merge branch 'master' into autocalc
...
Conflicts:
apps/opencs/view/world/nestedtable.cpp
apps/opencs/view/world/util.cpp
2015-06-25 13:39:59 +10:00
cc9cii
8af12788a4
Merge branch 'master' into autocalc
...
Conflicts:
apps/opencs/view/world/util.cpp
2015-06-24 21:16:48 +10:00
cc9cii
6b00d4ad91
Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS.
...
- Vanilla behaviour mimic'd where possible, except copying over autocalc spells to the npc's spell list when the status changes
2015-06-24 21:05:59 +10:00
Stanislav Bas
2565452052
Add some drag'n'drop utils to work with TableMimeData
2015-06-21 17:08:10 +03:00
Stanislav Bas
27ece7f36a
Rework DropLineEdit. Make it type-sensitive
2015-06-20 17:33:36 +03:00
Marc Zinnschlag
d5bc561d17
Merge remote-tracking branch 'smbas/feature-color-picking'
2015-06-18 16:37:49 +02:00
Stanislav Bas
2e40b68862
Add a custom proxy model for Info tables
2015-06-17 22:47:39 +03:00
Stanislav Bas
850f612c8b
Merge branch 'master' into feature-color-picking
2015-06-16 22:39:12 +03:00
scrawl
609e146a22
Build fixes for windows
2015-06-15 16:48:18 +02:00
Stanislav Bas
2c15ad5e0c
Add SoundGens verifier
2015-06-13 19:08:31 +03:00
Stanislav Bas
f19d07b404
Rename ColorPickerDelegate to ColorDelegate
2015-06-12 23:09:31 +03:00
scrawl
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
2015-06-12 15:13:42 +02:00
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
2015-06-11 23:38:08 +02:00
Stanislav Bas
e257c915bf
Add color picker popup to choose color
2015-06-12 00:00:23 +03:00
Stanislav Bas
ef88b28c26
Create a custom item editor for color columns
2015-06-09 15:20:50 +03:00
Stanislav Bas
d7fb497255
Color values are displayed as colored rectangles in tables
2015-06-08 21:33:23 +03:00
Stanislav Bas
9e405b69fa
Create the custom completer popup to avoid the problem with the wrong height of the default popup
2015-05-31 16:43:28 +03:00
Stanislav Bas
33e36ee922
Add the ID completion delegate
2015-05-30 15:51:33 +03:00
Stanislav Bas
87a1f9f9aa
Add ID completion manager
2015-05-30 15:31:44 +03:00
cc9cii
9ad69d9085
Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585 .
2015-05-29 05:44:35 +10:00
cc9cii
3a31468af0
Pathgrid record verifier. Feature #2000 .
2015-05-27 22:12:11 +10:00
cc9cii
cfcfb17320
Updates to optional horizontal scrollbar.
...
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
2015-05-18 07:12:02 +10:00
cc9cii
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
2015-04-19 13:31:16 +10:00
cc9cii
47d5eac290
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/idtable.hpp
2015-04-17 12:37:34 +10:00
cc9cii
a976dca27b
Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...
2015-04-13 06:39:38 +10:00
cc9cii
ef84e553be
Renamed some stuff.
2015-04-12 13:48:23 +10:00
cc9cii
41b368a759
Moved templated code around a bit.
2015-04-12 10:52:01 +10:00
cc9cii
bdf0d8db22
Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.
2015-04-09 19:11:19 +10:00
cc9cii
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
2015-04-02 20:19:15 +11:00
cc9cii
619b5206cd
More consistency nit pick.
2015-03-30 16:41:55 +11:00
cc9cii
29ef08bb75
Spelling and other consistencies nit pick.
2015-03-30 11:53:33 +11:00
Marc Zinnschlag
23cf859fee
added search stages (cell table only for now)
2015-03-27 16:33:54 +01:00
Marc Zinnschlag
78c6268891
added search class and search box widget
2015-03-25 11:56:14 +01:00
Marc Zinnschlag
d053c62032
setting up global search operation and subview
2015-03-17 12:30:47 +01:00
cc9cii
5eefcd862f
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/tools/tools.cpp
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/idtable.hpp
apps/opencs/model/world/refidadapter.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/view/world/dialoguesubview.hpp
2015-03-16 10:30:54 +11:00
Marc Zinnschlag
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
2015-03-14 12:00:24 +01:00