cc9cii
273ff1cccb
Address review comments.
2015-06-26 07:48:48 +10:00
Stanislav Bas
ea97b0a20c
Refine InfoTableProxyModel::getFirstInfoRow() code
2015-06-25 20:08:42 +03:00
Stanislav Bas
844e5c504d
Fix conversion to QString
2015-06-25 19:41:26 +03:00
cc9cii
67b6c86a59
Fix initialisation order - properly this time.
2015-06-25 20:34:27 +10:00
cc9cii
705253e456
Fix initialisation order.
2015-06-25 19:54:07 +10:00
cc9cii
b1f07ba4fb
Resolve merge issues and change the getSpells() interface.
2015-06-25 18:57:32 +10: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
7af43a1155
Address review feedback.
2015-06-25 13:32:22 +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
b0aad9c8cb
Merge remote-tracking branch 'smbas/feature-improved-dragndrop'
2015-06-24 17:20:43 +02:00
cc9cii
e5e4a04f8b
Remove more c++11 dependencies.
2015-06-24 22:19:27 +10:00
Stanislav Bas
d1339a643a
Fix for NestedTableProxyModel::forwardDataChanged()
2015-06-24 15:07:09 +03:00
cc9cii
0cf9832017
Add missing files for autocalc. Remove c++11 dependency.
2015-06-24 21:58:28 +10:00
cc9cii
18ec0d3e65
Add missing files for autocalc.
2015-06-24 21:21:35 +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
dc37aea8eb
Add missing mappings to TableMimeData
2015-06-20 21:00:15 +03:00
Marc Zinnschlag
197b8ec731
added severity attribute for operation messages ( Fixes #2717 )
2015-06-20 19:08:31 +02:00
Stanislav Bas
ced4e237a8
Fix the sorting of Info tables when new row are added
2015-06-20 12:43:53 +03:00
Stanislav Bas
f1a38ffe93
InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row
2015-06-20 11:29:15 +03:00
Stanislav Bas
170692b480
InfoTableProxyModel: invalidate first row cache after row insertion/deletion
2015-06-19 19:24:06 +03:00
Stanislav Bas
581ba55db9
Add Topic/Journal Id completion to InfoCreator
2015-06-19 12:51:50 +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
a6624ca576
Cache topic/journal first rows in InfoTableProxyModel
2015-06-17 23:46:51 +03: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
Marc Zinnschlag
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
2015-06-14 12:50:10 +02:00
cc9cii
5b6984d8d8
Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656 .
2015-06-13 22:24:22 +10:00
Marc Zinnschlag
c560f8b8a2
Merge remote-tracking branch 'smbas/fix-regionmap-colors'
2015-06-13 11:33:12 +02:00
cc9cii
b81454d226
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668 .
2015-06-13 14:37:47 +10:00
Stanislav Bas
650e37dba1
RegionMap uses proper colors
2015-06-12 22:31:12 +03:00
Stanislav Bas
e516d37cbf
MapColourColumn::set() uses the correct color value
2015-06-12 22:03:47 +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
cc9cii
893ad11be1
Fix missing columns in tables. Should resolve Bug #2624 .
...
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
2015-06-08 08:04:18 +10:00
Marc Zinnschlag
d90aff4303
Merge remote-tracking branch 'smbas/feature-id-completion'
2015-06-07 08:52:44 +02:00
cc9cii
5c37079f0c
Include only the columns that are visible for sorting. Should resolve Bug #2611 .
2015-06-05 12:19:21 +10:00
Stanislav Bas
bd46ddcf47
Correct the return type in IdTree::data() for Display_Role
2015-06-03 15:51:34 +03:00
Stanislav Bas
b25cc6bc55
IdCompletionManager uses Display type instread of ColumnId for creating completers
2015-06-03 12:01:13 +03:00
Stanislav Bas
4e759370de
Change Display_String to the proper display type where appropriate
2015-06-03 00:02:53 +03:00
Stanislav Bas
f84c36b500
CommandDelegate: extract a display type from a model if it isn't specified
2015-06-03 00:00:39 +03:00
Stanislav Bas
2c4025ec72
Rename the method isCompleterExistFor() to hasCompleterFor()
2015-06-02 00:26:31 +03:00
Stanislav Bas
e636101725
Add missing new lines at the ends of files
2015-05-31 18:18:49 +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
994c6833bc
Add missing columns for the ID completion
2015-05-30 23:54:16 +03:00
Stanislav Bas
e943d17b29
Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes
2015-05-30 22:01:21 +03:00
Stanislav Bas
602f33bd91
Add ColumnId role to the IdTree data methods
2015-05-30 21:30:25 +03:00
Stanislav Bas
87a1f9f9aa
Add ID completion manager
2015-05-30 15:31:44 +03:00
cc9cii
b7044ac119
Fix crash loading some addon files. Should resolve Bug #2583 .
...
- This may be a bug within QSortFilterProxyModel
- It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers.
2015-05-27 10:27:57 +10:00
Marc Zinnschlag
ae1a606876
Merge remote-tracking branch 'cc9cii/selective-refresh'
2015-05-26 14:32:03 +02:00
cc9cii
f06ddd47c4
Return the correct range for a given topic. Should resolve Bug #2569 .
2015-05-26 17:38:22 +10:00
cc9cii
aafcaf32c5
Qualify the scope of Flag_Dialogue. (another one)
2015-05-26 16:12:54 +10:00
cc9cii
2f29c2c077
Qualify the scope of Flag_Dialogue.
2015-05-26 13:58:58 +10:00
cc9cii
ec808843c3
Do not rebuild the dialogue subview unless required. Should resolve Bug #2581 .
...
The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview. Changes in this commit include:
- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list
2015-05-26 13:35:10 +10:00
Marc Zinnschlag
5f41ef4809
Merge remote-tracking branch 'cc9cii/master'
2015-05-25 11:10:17 +02:00
cc9cii
3c82e6d034
Retrieve the correct index for the type of record being un-deleted.
2015-05-25 16:36:42 +10:00
cc9cii
e6d2821b78
Refresh table filters when the model is updated. Should resolve Bug #2579 .
2015-05-25 09:15:07 +10:00
Marc Zinnschlag
07ce7b95cf
Merge remote-tracking branch 'cc9cii/npc-additional-data'
2015-05-24 21:15:26 +02:00
cc9cii
c721e340d8
Merge branch 'master' into npc-additional-data
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-05-24 19:24:27 +10:00
cc9cii
21af1913e1
Ensure ColumnId names are unique.
2015-05-24 19:18:54 +10:00
Marc Zinnschlag
53b4c15d85
Merge remote-tracking branch 'smbas/master'
2015-05-23 16:02:09 +02:00
Marc Zinnschlag
b58b7a89ed
Merge remote-tracking branch 'rohit-n/reorder2'
2015-05-23 09:19:03 +02:00
Stanislav Bas
a5183aefbe
Add record state tracking to the ModifyCommand ( Fix #2555 )
2015-05-22 23:53:25 +03:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
Stanislav Bas
d27b92e9f1
Avoid gaps between local indexes in RefIdData after removal of records ( Fix #2545 )
2015-05-22 00:57:47 +03:00
cc9cii
aecd9a275e
Remove debugging comments.
2015-05-22 06:09:55 +10:00
cc9cii
2fc964ca73
Grey out disabled entries rather than hiding them.
2015-05-21 13:11:07 +10:00
cc9cii
1d0b8587a1
Use HasWater bit flag rather than mWaterInt bool.
2015-05-20 21:14:17 +10:00
cc9cii
b27a879352
Add the remaining Cell data for editing with dialogue subview. Should resolve Bug #2551 .
...
- NOTE: the interior water flag and water level logic needs reviewing
- does not automatically disable region names for interiors without mQuasiEx flag
- Colour values can't be entered as RGB
- Region names are not drop down menus
2015-05-19 22:01:40 +10:00
cc9cii
0ecfd9119f
Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546 .
2015-05-19 06:56:38 +10:00
cc9cii
7494340b66
Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547 .
2015-05-18 22:08:36 +10:00
cc9cii
538e550b2b
Fix for Bug #2543 . Spells magic effect id typo.
2015-05-13 10:30:44 +10:00
cc9cii
2b84598e85
Remove duplicated but reversed map.
2015-05-10 20:52:29 +10:00
cc9cii
ab21c0551c
Provide a default encoding when changing to "Function".
2015-05-10 13:34:45 +10:00
cc9cii
587efcfe9d
Use better initial value type. Fix exception while saving values.
2015-05-10 07:49:18 +10:00
cc9cii
5fb269336f
Don't use initializer list
2015-05-10 07:02:08 +10:00
cc9cii
d6ecc64168
Aggregate types can't be static - osx compiler appears to be more strict.
2015-05-10 06:17:57 +10:00
cc9cii
69317095be
For compiling with osx - try using a different syntax for initializing the static maps.
2015-05-10 05:55:50 +10:00
cc9cii
0c461f4424
Add TopicInfos special conditions table.
2015-05-09 21:21:16 +10:00
Marc Zinnschlag
1c334a01ce
one more referenceable that escaped the change into object
2015-05-04 19:04:06 +02:00
Marc Zinnschlag
048d7be87c
Adjusted terminology for references/referenceables in OpenMW-CS user-interface ( Fixes #2516 )
2015-05-03 16:35:10 +02:00
cc9cii
b04aeb6aad
Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.
2015-05-01 12:14:09 +10:00
cc9cii
7f2bd01f79
Handle plugins that has 0x00 for levelled list types, for example Ravenloft v5.02d, to use 0x01.
2015-04-29 12:08:11 +10:00
Marc Zinnschlag
f1c0847897
Merge remote-tracking branch 'cc9cii/moveref'
2015-04-28 14:07:18 +02:00
cc9cii
49884f54f7
Fix loading moved references.
2015-04-28 08:07:01 +10:00
cc9cii
889749a493
Allow non-empty mOriginalCell (case where a moved ref is moved again)
2015-04-26 15:44:40 +10:00
cc9cii
b54e5714c9
Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod.
2015-04-26 14:55:40 +10:00
cc9cii
7673be6d0f
Loading of moved refs complete.
2015-04-26 12:18:23 +10:00
cc9cii
74b98f7178
Fixed initial loading of moved refs.
2015-04-26 11:35:46 +10:00
cc9cii
2e2d6e04fe
gcc friendly version.
2015-04-25 17:43:29 +10:00
cc9cii
dcce59f76c
Pass MovedCellRef info to RefCollection. Still has debugging code.
2015-04-25 17:20:02 +10:00
cc9cii
932f1f9fbd
Alternative way of finding UniversalId without bloating IdTree.
2015-04-25 15:26:32 +10:00
cc9cii
acb800b8f9
Resolve merge issues and fix typos.
2015-04-25 09:39:37 +10:00
cc9cii
f1a58994c6
Merge branch 'master' into moveref
...
Conflicts:
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/ref.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
components/esm/cellref.hpp
2015-04-25 06:52:53 +10:00
cc9cii
8aaa74a983
Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand.
2015-04-25 06:06:11 +10:00
cc9cii
a6925683c6
Off by one error - can't delete the last element of a refid collection.
2015-04-25 06:04:39 +10:00
Marc Zinnschlag
6fcf4ea9e3
In ModifyCommand replace proxy model with the source model ( Fixes #2498 )
2015-04-23 14:24:43 +02:00
cc9cii
82bc666e00
Make AI package items to be editable when a new row is added.
2015-04-22 09:25:55 +10:00
cc9cii
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
2015-04-19 13:31:16 +10:00
