scrawl
368dd9bd8d
Compiler: remove unused mNameStartingWithDigit
...
(cherry picked from commit f7d0d06134
2015-12-05 06:34:32 +11:00
cc9cii
19eed6f4c4
Fix warning C4458 (declaration of 'data' hides class member)
2015-11-22 19:23:11 +11:00
cc9cii
4290751010
Fix warning C4457 (declaration hides function parameter)
2015-11-22 19:17:10 +11:00
cc9cii
d70064efe4
Fix warning C4456 (declaration hides previous local declaration)
2015-11-22 19:15:06 +11:00
cc9cii
cc984497d7
Fix warning C4838 (conversion from 'double' to 'const float' requires a narrowing conversion)
2015-11-22 18:49:58 +11:00
cc9cii
f68e423c33
Add missing Ogre headers.
2015-11-22 18:43:44 +11:00
cc9cii
a38881e4cf
Further clean up of moving out NpcAutoCalc from Data.
2015-11-08 09:45:12 +11:00
cc9cii
04c5c0d82a
Move NPC autocal code out to a separate class.
2015-11-08 06:02:53 +11:00
cc9cii
c7c0023ed2
Merge pull request #12 from cc9cii/Feature-1278
...
Feature #1278 - part 1
2015-11-07 15:20:13 +11:00
cc9cii
9716b671f1
Merge branch 'cc9cii' into Feature-1278
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/nestedcoladapterimp.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/worldspacewidget.cpp
2015-11-07 12:04:09 +11:00
cc9cii
f7598a67f4
Merge branch 'pathgrid-edit' into Feature-1278
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
2015-11-07 11:56:34 +11:00
cc9cii
5b1373f3fd
Merge pull request #11 from cc9cii/jump-to-modified
...
Feature #2554
2015-11-07 07:46:07 +11:00
cc9cii
007c733578
Resolve merge issues and add back user preference setting for auto selecting a modified record.
...
(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)
Conflicts:
apps/opencs/model/settings/usersettings.cpp
2015-11-07 07:17:46 +11:00
cc9cii
fb3015c9b8
Merge branch 'cc9cii' into jump-to-modified
...
Conflicts:
apps/opencs/view/world/table.cpp
apps/opencs/view/world/table.hpp
apps/opencs/view/world/tablesubview.cpp
2015-11-07 06:30:46 +11:00
cc9cii
9f4ecc2f8e
Merge pull request #10 from cc9cii/master-cherry-pick-3
...
Merge master (cherry pick 3)
2015-11-05 20:35:10 +11:00
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
Marc Zinnschlag
aa31704d5d
deal with script execution from within a script ( Fixes #2964 )
...
(cherry picked from commit 8eb6d337d5
2015-11-01 22:48:38 +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
Marc Zinnschlag
8fffbb3f9b
updated credits file
...
(cherry picked from commit 64902bf221
2015-11-01 22:37:58 +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
4677560859
adjusted a workaround for names starting with digits that interfered with some numerical expressions written without spaces
...
(cherry picked from commit 435e52306a
2015-11-01 21:37:30 +11:00
Marc Zinnschlag
c5235ea794
removed a redundant else and made unary + work also in the console
...
(cherry picked from commit ae54f34f25
2015-11-01 21:37:14 +11:00
Emmanuel Anne
890405bdb1
scripts: recognize '+' also as a unary operator
...
it fixes the armor sorter in "Blades safe house.esp"
(cherry picked from commit dace7ab706
2015-11-01 21:37:01 +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
Marc Zinnschlag
46c6092e99
updated credits file
...
(cherry picked from commit 56163dcb2a
2015-11-01 21:34:56 +11:00
scrawl
9179782002
Add travis-ci script to detect tab characters in the code
...
(cherry picked from commit ab97a90c76
2015-11-01 21:34:36 +11:00
scrawl
fcb9068c19
Fix tab indentations in apps/ and components/
...
(cherry picked from commit a47617c21f
2015-11-01 21:34:23 +11:00
Marc Zinnschlag
a2294117cd
replaced context-sensitive implementation of allowing digits at the beginning of names with a more general implementation ( Fixes #1730 )
...
(cherry picked from commit 4d94f38f4b
2015-11-01 21:33:37 +11:00
cc9cii
ae1439f223
Fix typo.
...
(cherry picked from commit 1365b8edd1
2015-11-01 21:33:12 +11:00
