mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-26 17:39:45 +00:00
Code Issues Releases Wiki Activity
14101 commits 108 branches 68 tags 135 MiB
Commit graph

842 commits

Author SHA1 Message Date
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
Stanislav Bas
77d5476d46 Proper index creation for nested data 2015-07-27 15:24:01 +10:00
Stanislav Bas
1041c3babb IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-27 15:23:31 +10:00
Stanislav Bas
ca67e4ea3a Proper sorting of columns with enum values 2015-07-27 15:23:30 +10:00
Stanislav Bas
fb395e4dc9 Count of nested columns can be retrieved for a collection with no records 2015-07-27 14:25:02 +10:00
Stanislav Bas
8bf1b66ca2 Add the RecordType column to the MetaData table 2015-07-27 13:42:08 +10:00
Stanislav Bas
0420f21462 Add the ability to add nested values to the Create command 2015-07-27 13:11:07 +10:00
Stanislav Bas
5602992b86 Add the ability to search a nested column index 
Conflicts:
	apps/opencs/model/world/idtree.cpp
	apps/opencs/model/world/idtree.hpp
 2015-07-27 13:10:52 +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
6d5823e8aa killed some tabs 2015-06-26 18:54:49 +02:00
Marc Zinnschlag
fdf6645dbc Merge remote-tracking branch 'smbas/fix-info-tables' 2015-06-26 18:47:16 +02:00
Marc Zinnschlag
4487bda702 size limits for meta data strings 2015-06-26 18:19:00 +02: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
5a37530c1c added missing MetaData table UniversalId type 2015-06-26 15:17:18 +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
Stanislav Bas
ea97b0a20c Refine InfoTableProxyModel::getFirstInfoRow() code 2015-06-25 20:08:42 +03:00
Stanislav Bas
844e5c504d Fix conversion to QString 2015-06-25 19:41:26 +03: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
66877cbfe7 Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/util.cpp
 2015-06-25 13:39:59 +10:00
cc9cii
7af43a1155 Address review feedback. 2015-06-25 13:32:22 +10:00
Stanislav Bas
21f0b586ec Rows with the same topic but in different letter case can be reordered 2015-06-24 20:01:29 +03:00
Marc Zinnschlag
b0aad9c8cb Merge remote-tracking branch 'smbas/feature-improved-dragndrop' 2015-06-24 17:20:43 +02:00
cc9cii
e5e4a04f8b Remove more c++11 dependencies. 2015-06-24 22:19:27 +10:00
Stanislav Bas
d1339a643a Fix for NestedTableProxyModel::forwardDataChanged() 2015-06-24 15:07:09 +03:00
cc9cii
0cf9832017 Add missing files for autocalc. Remove c++11 dependency. 2015-06-24 21:58:28 +10:00
cc9cii
18ec0d3e65 Add missing files for autocalc. 2015-06-24 21:21:35 +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
Stanislav Bas
dc37aea8eb Add missing mappings to TableMimeData 2015-06-20 21:00:15 +03:00
Marc Zinnschlag
197b8ec731 added severity attribute for operation messages (Fixes #2717) 2015-06-20 19:08:31 +02:00
Stanislav Bas
ced4e237a8 Fix the sorting of Info tables when new row are added 2015-06-20 12:43:53 +03:00
Stanislav Bas
f1a38ffe93 InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row 2015-06-20 11:29:15 +03:00
Stanislav Bas
170692b480 InfoTableProxyModel: invalidate first row cache after row insertion/deletion 2015-06-19 19:24:06 +03:00
Stanislav Bas
581ba55db9 Add Topic/Journal Id completion to InfoCreator 2015-06-19 12:51:50 +03:00
Marc Zinnschlag
d5bc561d17 Merge remote-tracking branch 'smbas/feature-color-picking' 2015-06-18 16:37:49 +02:00
cc9cii
ccf840da2b Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-06-18 22:08:27 +10: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
a6624ca576 Cache topic/journal first rows in InfoTableProxyModel 2015-06-17 23:46:51 +03:00
Stanislav Bas
2e40b68862 Add a custom proxy model for Info tables 2015-06-17 22:47:39 +03:00
Stanislav Bas
850f612c8b Merge branch 'master' into feature-color-picking 2015-06-16 22:39:12 +03:00
Marc Zinnschlag
e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 2015-06-14 12:50:10 +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
Marc Zinnschlag
c560f8b8a2 Merge remote-tracking branch 'smbas/fix-regionmap-colors' 2015-06-13 11:33:12 +02: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
Stanislav Bas
650e37dba1 RegionMap uses proper colors 2015-06-12 22:31:12 +03:00
Stanislav Bas
e516d37cbf MapColourColumn::set() uses the correct color value 2015-06-12 22:03:47 +03:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
cc9cii
893ad11be1 Fix missing columns in tables. Should resolve Bug #2624. 
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
 2015-06-08 08:04:18 +10:00
cc9cii
92ab61f72f Merge branch 'master' into pathgrid-edit 2015-06-07 20:15:58 +10:00
Marc Zinnschlag
d90aff4303 Merge remote-tracking branch 'smbas/feature-id-completion' 2015-06-07 08:52:44 +02:00
cc9cii
5c37079f0c Include only the columns that are visible for sorting. Should resolve Bug #2611. 2015-06-05 12:19:21 +10:00
Stanislav Bas
bd46ddcf47 Correct the return type in IdTree::data() for Display_Role 2015-06-03 15:51:34 +03:00
Stanislav Bas
b25cc6bc55 IdCompletionManager uses Display type instread of ColumnId for creating completers 2015-06-03 12:01:13 +03:00
Stanislav Bas
4e759370de Change Display_String to the proper display type where appropriate 2015-06-03 00:02:53 +03:00
Stanislav Bas
f84c36b500 CommandDelegate: extract a display type from a model if it isn't specified 2015-06-03 00:00:39 +03:00
Stanislav Bas
2c4025ec72 Rename the method isCompleterExistFor() to hasCompleterFor() 2015-06-02 00:26:31 +03:00
Stanislav Bas
e636101725 Add missing new lines at the ends of files 2015-05-31 18:18:49 +03:00
Stanislav Bas
9e405b69fa Create the custom completer popup to avoid the problem with the wrong height of the default popup 2015-05-31 16:43:28 +03:00
cc9cii
a02448f0ba Merge branch 'master' into pathgrid-edit 
Conflicts:
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
 2015-05-31 11:12:39 +10:00