cc9cii
41f2ffdebb
Rationalise the use of ColumnIds
...
(cherry picked from commit c4a900ca2c
2015-11-01 20:28:13 +11:00
Marc Zinnschlag
5031d1fbcb
disable on-demand loading of land data (for now, maybe)
...
(cherry picked from commit 5be176ee85
2015-11-01 18:57:18 +11:00
Marc Zinnschlag
ce34daa64b
removed indirection in OpenMW-CS land record
...
(cherry picked from commit 85f6bb892b
2015-11-01 18:56:07 +11:00
Marc Zinnschlag
a2d4957d2a
merge land texture tables
...
(cherry picked from commit 890bbb6b11
2015-11-01 13:40:21 +11:00
Marc Zinnschlag
55dfe48ef7
copy meta data from game file when merging
...
(cherry picked from commit 47dd9505a9
2015-11-01 13:34:41 +11:00
Stanislav Bas
b53a77389b
Show race only when mesh type is Skin (in BodyParts table)
2015-09-08 06:47:34 +10:00
scrawl
f8f66bffb0
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-09-08 06:40:06 +10:00
scrawl
34561379bc
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
...
Conflicts:
apps/opencs/model/world/columns.hpp
2015-09-08 06:34:56 +10:00
cc9cii
5538f822f4
Initial support for Land and LandTexture tables. Updates Features #936 and #933 .
2015-08-01 07:50:56 +10:00
cc9cii
870bb491af
Fix for issue #6 ( https://github.com/cc9cii/openmw/issues/6 ) where dialogue subview for editing an NPC fails with an "invalid ID" exception.
...
* NPC autocalc code was looking for non-existent values of race and class, this is now validated first.
* Also took the opportunity to grey out the spells table when auto-calculated. The template specialisation is a bit ugly, though.
2015-07-31 09:05:26 +10:00
Stanislav Bas
8bf1b66ca2
Add the RecordType column to the MetaData table
2015-07-27 13:42:08 +10: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
a4c2c75d1f
fixed overwriting of meta data when loading project file
2015-06-26 16:22:06 +02:00
Marc Zinnschlag
1e033fa8fe
added meta data dialogue sub view
2015-06-26 16:11:00 +02:00
Marc Zinnschlag
1870b087e7
ported setting of meta data for saving to the new mechanism
2015-06-26 13:13:22 +02:00
Marc Zinnschlag
f3ff90e1fd
moved meta data into a new single-row table
2015-06-26 13:01:25 +02:00
cc9cii
3e29bb8a86
Fix undo for NPC autocalc changes. Fix the lack of refresh after race powers subtable.
2015-06-26 16:10:50 +10:00
cc9cii
78457a8234
Simplify npc data update and fix data copy when autocal flag changed.
2015-06-26 13:50:09 +10:00
cc9cii
8c39f2b376
Fix dereferencing a null pointer.
2015-06-26 08:52:39 +10:00
cc9cii
273ff1cccb
Address review comments.
2015-06-26 07:48:48 +10: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
7af43a1155
Address review feedback.
2015-06-25 13:32:22 +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
Marc Zinnschlag
197b8ec731
added severity attribute for operation messages ( Fixes #2717 )
2015-06-20 19:08:31 +02: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
4e759370de
Change Display_String to the proper display type where appropriate
2015-06-03 00:02:53 +03: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
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
0c461f4424
Add TopicInfos special conditions table.
2015-05-09 21:21:16 +10:00
cc9cii
49884f54f7
Fix loading moved references.
2015-04-28 08:07:01 +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
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
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
2015-04-19 13:31:16 +10:00
cc9cii
e00d7f72ac
Convert magic effects ID and Range columns in the nested tables to use enum delegate
2015-04-18 08:09:14 +10:00
cc9cii
befd6fe658
Convert magic effects Skills column in the nested tables to use enum delegates.
2015-04-18 07:15:40 +10:00
cc9cii
d6c2cff381
Convert magic effects Attribute column in the nested tables to use enum delegates.
2015-04-17 21:33:25 +10:00
cc9cii
c41b4b84a6
Cleanup post merge.
2015-04-17 13:45:45 +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
4b9c9bf095
Simplify and relocate nested column definitions.
2015-04-12 08:52:09 +10:00
cc9cii
8dab2f9b14
Use human friendly strings in magic effects subtable.
2015-04-12 07:46:32 +10:00
cc9cii
a460409555
Add Spells and Enchantment magic effects table to dialogue subview. The numbers are not yet converted to strings.
2015-04-11 21:43:25 +10:00
cc9cii
49fd5afdf6
Add birthsign spells table to dialogue subview.
2015-04-11 19:17:17 +10:00
