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
|
fdf6645dbc
|
Merge remote-tracking branch 'smbas/fix-info-tables'
|
2015-06-26 18:47:16 +02:00 |
|
Marc Zinnschlag
|
4487bda702
|
size limits for meta data strings
|
2015-06-26 18:19:00 +02:00 |
|
Marc Zinnschlag
|
1e033fa8fe
|
added meta data dialogue sub view
|
2015-06-26 16:11:00 +02:00 |
|
Marc Zinnschlag
|
57015f3666
|
fixed handling of numeric read-only fields in dialogue sub views
|
2015-06-26 15:50:36 +02:00 |
|
Marc Zinnschlag
|
10fbe6aada
|
split DialogueSubView in SimpleDialogueSubView and DialogueSubView
|
2015-06-26 15:17:47 +02:00 |
|
cc9cii
|
b1f07ba4fb
|
Resolve merge issues and change the getSpells() interface.
|
2015-06-25 18:57:32 +10:00 |
|
Stanislav Bas
|
d282bead23
|
InfoCreator accepts drops of Topic/Journal ID
|
2015-06-25 11:24:19 +03:00 |
|
Stanislav Bas
|
5b82b9d9d0
|
ReferenceCreator accepts drops of Cell ID
|
2015-06-25 11:20:35 +03: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 |
|
Stanislav Bas
|
21f0b586ec
|
Rows with the same topic but in different letter case can be reordered
|
2015-06-24 20:01:29 +03:00 |
|
Marc Zinnschlag
|
e29d9bcc8e
|
use a namespace instead of a class with only static functions
|
2015-06-24 17:29:47 +02:00 |
|
Stanislav Bas
|
270c17faa7
|
Prevent drops on non-editable table cells
|
2015-06-24 16:36:09 +03: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
|
d606b62688
|
Nested tables accept drops
|
2015-06-21 21:35:00 +03:00 |
|
Stanislav Bas
|
b9882eb59a
|
DragRecordTable checks drag type before accepting it
|
2015-06-21 18:40:13 +03:00 |
|
Stanislav Bas
|
a23de394f8
|
Refine DropLineEdit code
|
2015-06-21 17:16:13 +03:00 |
|
Stanislav Bas
|
2565452052
|
Add some drag'n'drop utils to work with TableMimeData
|
2015-06-21 17:08:10 +03:00 |
|
Stanislav Bas
|
7dcdd130bb
|
Rework Dialogue subview code according to DropLineEdit changes
|
2015-06-20 20:52:47 +03:00 |
|
Stanislav Bas
|
64701b273d
|
LineEdits for ID values accept drops with a proper type
|
2015-06-20 18:29:31 +03:00 |
|
Stanislav Bas
|
27ece7f36a
|
Rework DropLineEdit. Make it type-sensitive
|
2015-06-20 17:33:36 +03:00 |
|
Marc Zinnschlag
|
8aba52170f
|
fixed a build error
|
2015-06-20 11:34:32 +02:00 |
|
Stanislav Bas
|
e212414bc7
|
Use an ID parent type as the collection ID in GenericCreator.
Fix impossibility of creation/cloning records from Dialogue subviews in Info tables
|
2015-06-19 13:49:48 +03:00 |
|
Stanislav Bas
|
581ba55db9
|
Add Topic/Journal Id completion to InfoCreator
|
2015-06-19 12:51:50 +03:00 |
|
Stanislav Bas
|
a6734a0ea4
|
Add Cell Id completion to ReferenceCreator
|
2015-06-19 11:50:02 +03:00 |
|
Stanislav Bas
|
36271f25ec
|
Rework creator factories to accept Document as a parameter
|
2015-06-18 22:59:40 +03:00 |
|
Marc Zinnschlag
|
d5bc561d17
|
Merge remote-tracking branch 'smbas/feature-color-picking'
|
2015-06-18 16:37:49 +02:00 |
|
cc9cii
|
ccf840da2b
|
Merge branch 'master' into autocalc
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
|
2015-06-18 22:08:27 +10:00 |
|
cc9cii
|
ad04046243
|
Mimic vanilla CS behaviour with NPC stats auto calculations. Should resolve Bug #2663.
- Currently does not auto-update when race, class or skills tables change.
|
2015-06-18 22:02:08 +10:00 |
|
Stanislav Bas
|
cf487581f7
|
Show the pop-up of ColorEditor immediately after the editor creation in tables
|
2015-06-18 12:50:46 +03:00 |
|
Marc Zinnschlag
|
12e0873446
|
Merge remote-tracking branch 'smbas/feature-info-tables-sorting'
|
2015-06-18 10:31:44 +02:00 |
|
Marc Zinnschlag
|
63d46f7e66
|
removed an unused variable
|
2015-06-18 10:26:35 +02:00 |
|
Stanislav Bas
|
c60fed89ac
|
Enable sorting for Info tables
|
2015-06-17 23:50:18 +03:00 |
|
Stanislav Bas
|
ed09424223
|
Correct the position of the colored rectangle in ColorEditor and ColorDelegate
|
2015-06-17 00:45:43 +03:00 |
|
Stanislav Bas
|
850f612c8b
|
Merge branch 'master' into feature-color-picking
|
2015-06-16 22:39:12 +03:00 |
|
Stanislav Bas
|
1e368de289
|
Adjust columns of nested tables when a dialog subview is opened
|
2015-06-16 21:47:27 +03:00 |
|
Stanislav Bas
|
6cfee630aa
|
Proper size hint for DataDisplayDelegate
|
2015-06-16 21:25:06 +03:00 |
|
Stanislav Bas
|
2c1ca33a20
|
Refactor Enum- and DataDisplayDelegate code
|
2015-06-16 15:39:54 +03:00 |
|
Stanislav Bas
|
0ffb2bc6bc
|
Proper size hint for EnumDelegate
|
2015-06-16 14:18:47 +03:00 |
|
Stanislav Bas
|
d906a9d7d1
|
DataDisplayDelegate doesn't draw a text outside a table cell
|
2015-06-16 00:19:51 +03:00 |
|
Stanislav Bas
|
f19d07b404
|
Rename ColorPickerDelegate to ColorDelegate
|
2015-06-12 23:09:31 +03:00 |
|
Stanislav Bas
|
caeba1b887
|
Draw the frame around rect in ColorEditor and ColorPickerDelegate
|
2015-06-12 20:34:35 +03:00 |
|
Stanislav Bas
|
eb5180ba86
|
Save selected color in a model when picking is finished
|
2015-06-12 18:33:55 +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 |
|
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
|
d63b01dde3
|
Checkboxes in the table view use a combobox editor
|
2015-06-06 15:41:25 +03:00 |
|
Stanislav Bas
|
b25cc6bc55
|
IdCompletionManager uses Display type instread of ColumnId for creating completers
|
2015-06-03 12:01:13 +03:00 |
|