cc9cii
12a8692cdb
Fix include file issue.
...
(cherry picked from commit 7f477e2fae
2015-11-02 18:50:02 +11:00
cc9cii
6d38d97470
Fix some sub-tables becoming uneditable since commit 80869d
...
(cherry picked from commit 4af469511d
2015-11-02 18:49:48 +11:00
cc9cii
a19a1dabe2
Add a check for scale value of 0. Should resolve bug #2880 .
...
(cherry picked from commit 819fecd08e
2015-11-02 18:46:34 +11:00
cc9cii
26195dc5fe
Rename a variable to make it less confusing.
...
(cherry picked from commit 7c007d9c6d
2015-11-02 18:46:21 +11:00
cc9cii
894f3a9418
Fix saving when only topic info was modified (topic itself unchanged)
...
(cherry picked from commit 78c735adc6
2015-11-02 18:46:04 +11:00
cc9cii
245357c9b2
Move TableEditModes enum inside a class scope.
...
(cherry picked from commit 107ccd84d4
2015-11-02 18:45:17 +11:00
cc9cii
0ec4af4210
Re-add mistakenly removed line and fix a silly typo.
...
(cherry picked from commit 77471d1592
2015-11-02 06:25:46 +11:00
cc9cii
f08680ebcd
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
...
(cherry picked from commit 80869d9bae
2015-11-02 06:25:31 +11:00
cc9cii
b595f2641c
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
...
(cherry picked from commit 972193c7eb
2015-11-01 23:09:06 +11:00
cc9cii
bb1a959c88
Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980 .
...
(cherry picked from commit 1a64b40725
2015-11-01 23:08:55 +11:00
cc9cii
30de5c1c59
Fix editing ingredient effects sub-table. Should resolve bug #2978 .
...
(cherry picked from commit 9f0e059a15
2015-11-01 23:08:42 +11:00
artemutin@yandex.ru
91c4afe78c
Fixed filter reapplication on Description column change and on State
...
column change.
Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.
(cherry picked from commit eae36f8005
2015-11-01 22:50:37 +11:00
artemutin@yandex.ru
437cabf778
If table dont use any filter, filter update now dont cause a reapply of empty filter
...
(cherry picked from commit 33e12a99fa
2015-11-01 22:50:21 +11:00
artemutin@yandex.ru
f44d7e97b0
Stream error handling, and other minor changes.
...
(cherry picked from commit 4ca7b26609
2015-11-01 22:49:05 +11:00
artemutin@yandex.ru
ba9190ed5e
Implemented line and col calculations in scriptsubview
...
(cherry picked from commit e7a3f059aa
2015-11-01 22:48:53 +11:00
cc9cii
71077fda6a
Disable toolbar context menu. Should resolve bug #2953 .
...
(cherry picked from commit 64821b0785
2015-11-01 22:48:01 +11:00
cc9cii
b3daa7d956
Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930 .
...
(cherry picked from commit 3bbcf6a916
2015-11-01 22:47:47 +11:00
cc9cii
9cc046ce4e
Further rationalise the use of ColumnIds
...
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
(cherry picked from commit 998348e606
2015-11-01 22:46:18 +11:00
artemutin@yandex.ru
c34d8c2a0d
Add StartScriptCreator to a factory manager.
...
(cherry picked from commit ecce3a1975
2015-11-01 22:37:25 +11:00
artemutin@yandex.ru
7f46bc155a
add getIdValidatorResult method to GenericCreator, for use in subclass
...
StartScriptCreator
(cherry picked from commit 903cd3322b
2015-11-01 22:35:12 +11:00
artemutin@yandex.ru
b0018aa791
Fix namespace, add file to CMakeLists.txt
...
(cherry picked from commit e672880f64
2015-11-01 22:34:49 +11:00
artemutin@yandex.ru
cb6198a843
Added StartScriptCreator class with redefined getErrors method.
...
(cherry picked from commit 3f27c85630
2015-11-01 22:34:36 +11:00
Marc Zinnschlag
69e6328507
fixed local variable caching issue in automatic error checking ( Fixes #2927 )
...
(cherry picked from commit 7bef97bf33
2015-11-01 21:36:14 +11:00
Marc Zinnschlag
14708e181c
more cleanup
...
(cherry picked from commit 659b87b25f
2015-11-01 21:35:43 +11:00
Marc Zinnschlag
6f294d0d25
removed some left-over signal slot stuff that shouldn't have been there in the first place
...
(cherry picked from commit b3b4fb3efb
2015-11-01 21:35:09 +11:00
scrawl
fcb9068c19
Fix tab indentations in apps/ and components/
...
(cherry picked from commit a47617c21f
2015-11-01 21:34:23 +11:00
cc9cii
ae1439f223
Fix typo.
...
(cherry picked from commit 1365b8edd1
2015-11-01 21:33:12 +11:00
cc9cii
2f76a1510e
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
...
(cherry picked from commit 45aee1b508
2015-11-01 21:32:34 +11:00
cc9cii
f7eb502493
Add missing fields for editing creatures.
...
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)
(cherry picked from commit 5a5e1a3b22
2015-11-01 20:36:24 +11:00
cc9cii
41f2ffdebb
Rationalise the use of ColumnIds
...
(cherry picked from commit c4a900ca2c
2015-11-01 20:28:13 +11:00
cc9cii
496cdcb51b
Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.
...
(cherry picked from commit 258b2ba29a
2015-11-01 20:14:11 +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
453c3ee760
fixed an indexing error
...
(cherry picked from commit 23fde87816
2015-11-01 18:57:07 +11:00
Marc Zinnschlag
4aa6d7d1d1
various minor fixes
...
(cherry picked from commit 584a7a66b9
2015-11-01 18:56:56 +11:00
Marc Zinnschlag
dcf1f1515a
handle missing land texture records properly during merge
...
(cherry picked from commit 09ec60fe2a
2015-11-01 18:56:43 +11:00
Marc Zinnschlag
1784701b47
fixed a texture indexing bug (only affects the editor)
...
(cherry picked from commit 73f6efddcc
2015-11-01 18:56:31 +11:00
Marc Zinnschlag
25952369ae
merge land tables
...
(cherry picked from commit a8dc1c1198
2015-11-01 18:56: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
c4b34a077e
refactored loading of land data
...
(cherry picked from commit 69b9eadb52
2015-11-01 18:54:15 +11:00
cc9cii
4f24c6a7c8
more const-ness fixes
2015-11-01 17:07:40 +11:00
Marc Zinnschlag
44020df65f
made return type of ESMTerrain::Storage::getLand const
...
(cherry picked from commit febf611c82
2015-11-01 13:40:56 +11:00
Marc Zinnschlag
8cb1f4ffe9
additional safety check for land texture listing merge stage
...
(cherry picked from commit 69045d7ec9
2015-11-01 13:40:45 +11:00
Marc Zinnschlag
a2d4957d2a
merge land texture tables
...
(cherry picked from commit 890bbb6b11
2015-11-01 13:40:21 +11:00
Marc Zinnschlag
e5038cbece
fixed merge stage order; added proper initialisation
...
(cherry picked from commit b7983d08ba
2015-11-01 13:40:07 +11:00
Marc Zinnschlag
73ab89bf70
merge references tables
...
(cherry picked from commit a97a632aa7
2015-11-01 13:39:56 +11:00
Marc Zinnschlag
62daecadf5
fixed record state issues after merge
...
(cherry picked from commit 845cafd61c
2015-11-01 13:39:44 +11:00
Marc Zinnschlag
9230c62884
merge referenceables table
...
(cherry picked from commit f95950e8d8
2015-11-01 13:39:30 +11:00
Marc Zinnschlag
81188a3456
silenced a warning
...
(cherry picked from commit 9cf793c0b5
2015-11-01 13:39:18 +11:00
Marc Zinnschlag
72aa998261
simplifying merge stage
...
(cherry picked from commit 40753aa9a3
2015-11-01 13:37:41 +11:00
Marc Zinnschlag
e33314ad81
made merge operation more fluent
...
(cherry picked from commit 16dda281ce
2015-11-01 13:37:26 +11:00
