scrawl
c4d38bb42d
Fix clang analyzer warnings
2016-02-16 19:17:04 +01:00
scrawl
daa94cc50e
Fix cppcheck warnings
2016-01-03 20:19:38 +01:00
cc9cii
7f477e2fae
Fix include file issue.
2015-11-02 06:57:24 +11:00
cc9cii
107ccd84d4
Move TableEditModes enum inside a class scope.
2015-10-28 23:33:24 +11:00
cc9cii
80869d9bae
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
2015-10-28 20:30:30 +11:00
cc9cii
1a64b40725
Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980 .
2015-10-28 11:30:36 +11:00
cc9cii
9f0e059a15
Fix editing ingredient effects sub-table. Should resolve bug #2978 .
2015-10-28 11:18:48 +11:00
cc9cii
5a5e1a3b22
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)
2015-09-12 10:00:23 +10:00
cc9cii
c4a900ca2c
Rationalise the use of ColumnIds
2015-09-12 09:33:11 +10:00
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
2015-06-14 16:32:13 +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
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
scrawl
958b34771a
Fix clang warnings about 'typename' outside of a template
2015-06-04 20:42:05 +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
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05: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
7494340b66
Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547 .
2015-05-18 22:08:36 +10:00
cc9cii
513c3a47cb
Add clothing/armor part reference table to dialogue subview.
2015-04-13 21:08:23 +10:00
cc9cii
a976dca27b
Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...
2015-04-13 06:39:38 +10:00
cc9cii
7ccf53e750
Changed over inventory adapters. Fixed a few places where modified records were not set properly.
2015-04-12 20:03:55 +10:00
cc9cii
25261a60e5
Add potion magic effects table to dialogue subview. Integration of the adapters to RefIdCollection is incomplete.
2015-04-12 18:29:42 +10:00
cc9cii
860754e460
Minor formatting cleanup and comments.
2015-04-09 19:33:42 +10:00
cc9cii
fb2ba7610c
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
2015-03-04 11:22:42 +11:00
Thoronador
44e01d0eaa
remove redundant initialization statement
...
See https://github.com/OpenMW/openmw/pull/423#discussion_r22403388
2015-01-02 02:23:10 +01:00
Thoronador
17fb7aa598
uninitialized stuff
2015-01-01 23:18:30 +01:00
Marek Kochanowicz
ade27293be
handling destination for guides
2014-07-25 17:11:18 +02:00
Marek Kochanowicz
24eb034ba3
major refactorisation
2014-07-22 10:27:45 +02:00
Marek Kochanowicz
dcd90faaef
moved add nested to the helper
2014-07-21 14:58:45 +02:00
Marek Kochanowicz
427d6efd19
Moved removeNestedRow responsibility to the helper.
2014-07-21 14:49:47 +02:00
Marek Kochanowicz
c018ca43ac
getting rid of the asserts
2014-07-21 14:44:48 +02:00
Marek Kochanowicz
cb004936e0
moved setNestedData to the helper as well
2014-07-21 14:34:48 +02:00
Marek Kochanowicz
6573e3f319
moved responsibility for getNestedData to the inventory helper
2014-07-21 14:24:54 +02:00
Marek Kochanowicz
c4598d6200
added inventory helper (since npc and containers share same way of
...
handling items)
2014-07-21 14:10:04 +02:00
Marek Kochanowicz
4d79034dbf
correctly handling the nestedTable for undo (but removing and adding
...
rows in proper QT way is still TODO)
2014-07-20 18:52:35 +02:00
Marek Kochanowicz
0017fc68ef
fixed ctor of nestedwrapper (missing initialization of member data field)
2014-07-19 13:08:28 +02:00
Marek Kochanowicz
1ff8abb240
store whole container representing the nested table inside of the
...
command
Static nature of C++ forced me to use templates. Bit frustraiting.
2014-07-18 18:26:22 +02:00
Marek Kochanowicz
f0c6ef185e
Nest columns directly, created NestedColumn class and NestColumn.
2014-07-16 13:13:22 +02:00
Marek Kochanowicz
4b4a72c3b6
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
2014-07-13 10:52:39 +02:00
Marc Zinnschlag
4f08efc4d7
added missing combat, magic and stealth columns for creatures (Feature #1312 )
2014-06-30 19:51:59 +02:00
Marek Kochanowicz
7b5bf637ab
Changes needed to add new nested row.
2014-06-24 19:03:29 +02:00
Marek Kochanowicz
c45061614b
Added code to delete nestedRows
2014-06-24 12:21:40 +02:00
Marek Kochanowicz
88c5288eaf
Create removeNestedRow (for deleting rows of nested columns)
2014-06-24 10:22:42 +02:00
Marek Kochanowicz
defd0b1754
Merge branch 'dialog-fix' into NonTableFields
...
TODO stop failing epicly with git
2014-06-17 14:08:59 +02:00
Marek Kochanowicz
21a1f6f4ae
working on the issue
2014-06-09 10:35:39 +02:00
Marek Kochanowicz
55d451febe
changes in the model (idtable) to support nested data
2014-06-02 20:41:37 +02:00
Marek Kochanowicz
6720d85a04
fixed compilation, thanks greye
2014-05-27 14:50:21 +02:00
Marek Kochanowicz
41db48720d
does not compile
2014-05-27 14:01:15 +02:00
Marek Kochanowicz
befc7a4078
adding column for the content of the container
2014-05-25 17:02:40 +02:00
Marc Zinnschlag
ca33d66ed9
added missing columns for weapon records
2013-05-19 14:44:41 +02:00
