1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 08:45:36 +00:00
Commit graph

808 commits

Author SHA1 Message Date
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
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
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
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)

Conflicts:
	apps/opencs/model/world/refidadapterimp.hpp
2015-11-02 18:49:48 +11:00
cc9cii
245357c9b2 Move TableEditModes enum inside a class scope.
(cherry picked from commit 107ccd84d4)

Conflicts:
	apps/opencs/model/world/refidadapterimp.cpp
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)

Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/nestedtable.hpp
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
cc9cii
b3daa7d956 Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930.
(cherry picked from commit 3bbcf6a916)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
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
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
scrawl
fcb9068c19 Fix tab indentations in apps/ and components/
(cherry picked from commit a47617c21f)

Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwphysics/physicssystem.cpp
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)

Conflicts:
	apps/opencs/model/world/refidadapterimp.hpp
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)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
2015-11-01 20:36:24 +11:00
cc9cii
41f2ffdebb Rationalise the use of ColumnIds
(cherry picked from commit c4a900ca2c)

Conflicts:
	apps/opencs/model/world/refidcollection.cpp
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
ce34daa64b removed indirection in OpenMW-CS land record
(cherry picked from commit 85f6bb892b)

Conflicts:
	apps/opencs/view/render/cell.cpp
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
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
55dfe48ef7 copy meta data from game file when merging
(cherry picked from commit 47dd9505a9)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/data.cpp
2015-11-01 13:34:41 +11:00
Stanislav Bas
ca14d6a8a8 Add missing includes to columnimp.hpp 2015-09-08 06:48:04 +10:00
Stanislav Bas
859ba93739 Inform about State change (not a whole row) when modifying a table value 2015-09-08 06:47:50 +10:00
Stanislav Bas
b53a77389b Show race only when mesh type is Skin (in BodyParts table) 2015-09-08 06:47:34 +10:00
Stanislav Bas
3a41fe5024 Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData() 2015-09-08 06:46:32 +10:00
Stanislav Bas
8c07d7f252 Remove enum names for AiWanderRepeat column 2015-09-08 06:46:10 +10:00
Stanislav Bas
214f3e5b9b ModifyCommand uses a proper name of a modified nested value 2015-09-08 06:45:58 +10:00
scrawl
402f1ff5d8 Fix the ESM::LandTexture NAME being discarded on loading 2015-09-08 06:42:45 +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
dae2588c88 Editor: fix a typo in ESM::Light flag mappings 2015-09-08 06:37:31 +10:00
scrawl
1d2f4c8cfe Editor: remove creature flag of unknown purpose from the UI 2015-09-08 06:35:58 +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
2f372a79b9 Remove additional instance of Display_YesNo (in cc9cii branch but not in master) 2015-09-08 06:31:38 +10:00
taras.kudryavtsev
0f2ea57648 #2730 and #2725
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
2015-09-08 06:29:25 +10:00
Stanislav Bas
bc48ed94bc Correct comparison of enum values in IdTableProxyModel 2015-09-08 05:56:37 +10:00
Stanislav Bas
bba3d6bec5 Restore Modified status of a record when adding/removing nested rows 2015-09-08 05:45:17 +10:00
Stanislav Bas
4366bdb4a8 Inform about Modified status change when modifying a value of a model 2015-09-08 05:44:58 +10:00
Stanislav Bas
ec98a1220f Proper index for Modified column in ModifyCommand 2015-09-08 05:44:35 +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
3280aade39 Don't inform about a nested row addition in proxy models for top-level tables 2015-07-30 09:14:03 +10:00
Stanislav Bas
9461baa2ea Inform about a row addition after re-sorting in InfoTableProxyModel 2015-07-30 08:14:36 +10:00
Stanislav Bas
f24b293c13 Create a custom signal to inform about a row addition in IdTableProxyModel 2015-07-30 08:14:20 +10:00
scrawl
6c8862e542 Fix a typo 2015-07-27 17:39:23 +10:00