mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 02:49:55 +00:00
Code Issues Releases Wiki Activity
25216 commits 38 branches 54 tags 122 MiB
Commit graph

1057 commits

Author SHA1 Message Date
Aesylwinn
799ed300ea Use cell coordinates class, fix undo description. 2016-05-21 14:36:07 -04:00
scrawl
703dba902b Set the shader path in OpenCS 2016-05-20 00:40:59 +02:00
Aesylwinn
b86250036c Add ability to add pathgrids. 2016-05-19 18:33:15 -04:00
Marc Zinnschlag
64fdc5a21a Merge remote-tracking branch 'rcutmore/bug-3331' 2016-05-09 09:18:48 +02:00
Rob Cutmore
e6863c8f79 Editor: Undo editable column check in record add 2016-05-08 06:05:52 -04:00
Roman Proskuryakov
d5dfa89060 Rewrite NAME_T into FIXED_STRING. 2016-05-07 23:27:33 +03:00
Rob Cutmore
307f04f827 Editor: Fix issue adding start script (Bug #3331) 
Updated to verify column is editable when adding a new record.
 2016-05-06 08:04:15 -04:00
Rob Cutmore
c9ada852aa Undo including pathgrids in ID check 2016-05-03 06:19:47 -04:00
Rob Cutmore
5580f803fd Editor: Prevent duplicate pathgrids (Bug #3342) 2016-05-02 07:28:32 -04:00
Marc Zinnschlag
a5bc561c7d Merge remote-tracking branch 'origin/master' 2016-04-08 09:35:39 +02:00
Bret Curtis
2c90b0b78d fix a few spelling mistakes 2016-04-07 11:55:49 +02:00
Aesylwinn
7d89c82f08 Revert "Fix indentation." 
This reverts commit 9a495042cc.
 2016-04-06 10:23:12 -04:00
Aesylwinn
8c35836883 Fix misnamed identifier. 2016-04-06 03:12:10 -04:00
Aesylwinn
9a495042cc Fix indentation. 2016-04-06 02:39:33 -04:00
Aesylwinn
5e38fcac36 Add ability to edit region weather probabilities. 2016-04-06 02:18:19 -04:00
Marc Zinnschlag
1774f6d9bf moved ref num assingment from instance creation to save procedure 2016-03-24 11:12:05 +01:00
Marc Zinnschlag
d5067201d0 Merge branch 'move' 2016-03-12 13:27:00 +01:00
Marc Zinnschlag
d6b8033b46 handle cell transitions when moving objects 2016-03-12 13:19:51 +01:00
scrawl
97526284f5 Allow setting the water level of an interior cell with sky (Fixes #3244) 2016-03-11 22:10:59 +01:00
Marc Zinnschlag
b2181fae20 safer handling of command macros 2016-03-08 10:48:44 +01:00
Marc Zinnschlag
7d8bd56e11 create new records with basic data in the same step without updates inbetween (Fixes #3207) 2016-03-01 11:21:06 +01:00
Marc Zinnschlag
9f14247562 Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements' 2016-02-24 13:37:16 +01:00
Aesylwinn
f4ed389496 InfoCondition autocompletion 2016-02-22 15:48:25 -05:00
Aesylwinn
20942e6658 Fixes to testing if condition is always or never true 2016-02-19 14:10:47 -05:00
Aesylwinn
5315866f61 Corrections to condition ranges and several other minor fixes 2016-02-19 03:03:10 -05:00
Aesylwinn
9d392487a9 Fix names to be unique and condition values to be set to 0 2016-02-19 02:59:19 -05:00
Aesylwinn
bdc99048bb Missing header 2016-02-17 19:01:22 -05:00
Aesylwinn
8668eccd0b Topic Info verifier with fixes to InfoSelectWrapper class 2016-02-17 15:38:30 -05:00
Aesylwinn
e89609e5b0 Changes to how Info Conditions are edited 2016-02-17 14:15:57 -05:00
scrawl
c4d38bb42d Fix clang analyzer warnings 2016-02-16 19:17:04 +01:00
Aesylwinn
3f40346636 Implemented a wrapper for DialInfo::SelectStruct 2016-02-15 19:49:54 -05:00
scrawl
b0431833a1 Fix some defects reported by Coverity CI 2016-01-21 16:08:04 +01:00
Aesylwinn
bbda5fe634 Removed hints from error messages and fixed naming to match conventions 2016-01-18 12:34:33 -05:00
Aesylwinn
1d86f705ba gmst verifier 2016-01-17 21:55:03 -05:00
scrawl
fb849014bd Pass the fallback map to CSMWorld::Data 2016-01-11 23:10:16 +01:00
scrawl
daa94cc50e Fix cppcheck warnings 2016-01-03 20:19:38 +01:00
Marc Zinnschlag
6b626c2954 spelling fixes 2015-12-17 13:06:37 +01:00
scrawl
fb9f5f8fe8 Fix typo 2015-12-14 01:36:53 +01:00
scrawl
07b064f616 Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
scrawl
4dd4c5394b Broken lower-casing fix 2015-12-07 22:30:37 +01:00
scrawl
42d68eb7fb Build fix 2015-12-07 22:29:57 +01:00
scrawl
eb2f16d682 Support for loading .osg mesh format 2015-11-16 23:26:43 +01:00
scrawl
b8e11cf197 Merge commit 'pull/upstream/678' into HEAD 
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
 2015-11-13 01:34:36 +01:00
cc9cii
7f477e2fae Fix include file issue. 2015-11-02 06:57:24 +11:00
cc9cii
4af469511d Fix some sub-tables becoming uneditable since commit 80869d 2015-11-02 06:43:20 +11:00
cc9cii
107ccd84d4 Move TableEditModes enum inside a class scope. 2015-10-28 23:33:24 +11:00
cc9cii
77471d1592 Re-add mistakenly removed line and fix a silly typo. 2015-10-28 20:52:07 +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
972193c7eb Fix issue where mandatory effects field was allowed to be empty (and vice versa) 2015-10-28 11:49:24 +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
Marc Zinnschlag
3f9db7ba3c more reliable method of obtaining the cell coordinates in CSVRender::Cell 2015-10-12 18:00:44 +02:00
cc9cii
3bbcf6a916 Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930. 2015-10-08 12:47:23 +11:00
cc9cii
998348e606 Further rationalise the use of ColumnIds 
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
 2015-10-08 12:35:09 +11:00
Marc Zinnschlag
7bef97bf33 fixed local variable caching issue in automatic error checking (Fixes #2927) 2015-09-22 15:36:00 +02:00
scrawl
a47617c21f Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
cc9cii
1365b8edd1 Fix typo. 2015-09-12 11:18:07 +10:00
cc9cii
45aee1b508 Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879. 2015-09-12 10:15:32 +10: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
cc9cii
258b2ba29a Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique. 2015-09-12 09:04:43 +10:00
Marc Zinnschlag
a445683312 Merge branch 'mergetool' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 2015-09-11 13:22:15 +02:00
Marc Zinnschlag
5be176ee85 disable on-demand loading of land data (for now, maybe) 2015-09-11 13:02:24 +02:00
Marc Zinnschlag
85f6bb892b removed indirection in OpenMW-CS land record 2015-08-31 18:13:27 +02:00
Marc Zinnschlag
890bbb6b11 merge land texture tables 2015-08-30 14:27:22 +02:00
Marc Zinnschlag
845cafd61c fixed record state issues after merge 2015-08-25 12:40:40 +02:00
Marc Zinnschlag
f95950e8d8 merge referenceables table 2015-08-25 11:54:16 +02:00
Marc Zinnschlag
e76401d5ea Merge remote-tracking branch 'smbas/fix-opencs-bugs' 2015-08-23 12:15:19 +02:00
Stanislav Bas
ba4b7df99d Add missing includes to columnimp.hpp 2015-08-22 16:35:00 +03:00
Stanislav Bas
720aca8f3d Inform about State change (not a whole row) when modifying a table value 2015-08-22 16:34:57 +03:00
Stanislav Bas
4d24eff859 Show race only when mesh type is Skin (in BodyParts table) 2015-08-22 16:34:54 +03:00
Stanislav Bas
6d81ca07b5 Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData() 2015-08-22 16:34:45 +03:00
scrawl
32ad8c86bf Fix the ESM::LandTexture NAME being discarded on loading 2015-08-22 13:10:54 +02:00
Stanislav Bas
aeb1acca51 Remove enum names for AiWanderRepeat column 2015-08-21 22:05:40 +03:00
Stanislav Bas
e14aedc7cd ModifyCommand uses a proper name of a modified nested value 2015-08-21 21:47:29 +03:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
scrawl
d1e1c0f38b Editor: fix a typo in ESM::Light flag mappings 2015-08-16 23:42:08 +02:00
Marc Zinnschlag
47dd9505a9 copy meta data from game file when merging 2015-08-16 18:27:17 +02:00
scrawl
e36ebc77d5 Editor: remove creature flag of unknown purpose from the UI 2015-08-15 18:39:00 +02:00
scrawl
c07ced4c8f Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range 2015-08-13 17:01:25 +02:00
taras.kudryavtsev
8ae7c63c45 #2730 and #2725 2015-08-04 16:58:44 +03:00
Stanislav Bas
8da9eecea7 Correct comparison of enum values in IdTableProxyModel 2015-08-03 19:24:00 +03:00
Stanislav Bas
33042c1464 Restore Modified status of a record when adding/removing nested rows 2015-08-02 21:52:55 +03:00
Stanislav Bas
25b653e316 Inform about Modified status change when modifying a value of a model 2015-08-02 15:06:56 +03:00
Stanislav Bas
afb36b73eb Proper index for Modified column in ModifyCommand 2015-08-02 15:03:27 +03:00
Marc Zinnschlag
420503d5fc Merge remote-tracking branch 'smbas/fix-bug-2728' 2015-07-27 11:23:49 +02:00
Marc Zinnschlag
bafa86d3e9 Merge remote-tracking branch 'scrawl/master' 2015-07-27 11:10:16 +02:00
Stanislav Bas
812fffbadc Don't inform about a nested row addition in proxy models for top-level tables 2015-07-26 20:25:46 +03:00
Stanislav Bas
86b7d2a43d Inform about a row addition after re-sorting in InfoTableProxyModel 2015-07-26 20:07:36 +03:00
Stanislav Bas
37fd733deb Create a custom signal to inform about a row addition in IdTableProxyModel 2015-07-26 20:06:30 +03:00
Stanislav Bas
c088cd4fa9 Proper index creation for nested data 2015-07-25 18:32:13 +03:00
scrawl
b3f5ac5dbb Include cleanup 2015-07-25 02:11:49 +02:00
Stanislav Bas
f5b1447c92 IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-23 21:05:00 +03:00
Stanislav Bas
a7b3248ee7 Proper sorting of columns with enum values 2015-07-23 20:35:16 +03:00
Stanislav Bas
daaff1284e Remove unused includes 2015-07-22 22:18:26 +03:00
Stanislav Bas
13bb6be238 Load methods (for ESM records) accept a deleted flag in OpenCS 2015-07-22 22:17:26 +03:00
Stanislav Bas
1e8182220a Fix build errors & warnings 2015-07-19 23:44:16 +03:00
Stanislav Bas
8e6a7be6f5 Implement saving of deleted records 2015-07-19 14:58:20 +03:00
Stanislav Bas
e04e32bcff Delete infos of deleted dialogue when loading a content file 2015-07-19 14:58:18 +03:00
Stanislav Bas
a4d3e59e5c Add a separate method to check whether a record is deleted or not for IdCollection 2015-07-19 14:58:16 +03:00
scrawl
58720e6a28 Fix the OpenCS rendering crash on exit (Fixes #2735) 2015-07-18 03:52:48 +02:00
Stanislav Bas
3ba73f5fd9 Handle deleted records in RefCollection 2015-07-15 21:14:00 +03:00
Stanislav Bas
a1389b87ba Return a correct index for a loaded record that was deleted 2015-07-14 23:31:16 +03:00
Stanislav Bas
5e623a2a1d Rework RefIdData code. Update the index map when a new record is loaded 2015-07-14 20:54:24 +03:00
Stanislav Bas
71e5fc7f04 Remove INAM handling from InfoCollection 2015-07-13 11:27:32 +03:00
Stanislav Bas
74a055f3cc Remove NAME and DELE handling from IdCollection 2015-07-13 10:40:11 +03:00
Stanislav Bas
42f9136141 Remove DELE and NAME handling from RefIdCollection and RefIdData 2015-07-12 15:22:51 +03:00
Marc Zinnschlag
6c5dc5c7a0 Merge remote-tracking branch 'smbas/fix-cell-creating' 2015-07-05 20:43:59 +02:00
Stanislav Bas
3ffa0aa185 Count of nested columns can be retrieved for a collection with no records 2015-07-05 15:36:41 +03:00
scrawl
2385938485 Fix a typo 2015-07-03 02:42:40 +02:00
Stanislav Bas
1afa22f443 Add the RecordType column to the MetaData table 2015-07-01 21:36:17 +03:00
Marc Zinnschlag
d3bcf0711c Merge remote-tracking branch 'smbas/feature-cloning-enhancements' 2015-06-30 10:40:28 +02:00
scrawl
1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-06-28 00:38:39 +02:00
Stanislav Bas
9d274ee156 Merge branch 'master' into feature-cloning-enhancements 2015-06-27 22:02:31 +03:00
Stanislav Bas
f3bb00e3d9 Add the ability to add nested values to the Create command 2015-06-26 22:16:12 +03:00
Stanislav Bas
a7f31988d1 Add the ability to search a nested column index 2015-06-26 22:14:11 +03: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
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
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
Stanislav Bas
d1339a643a Fix for NestedTableProxyModel::forwardDataChanged() 2015-06-24 15:07:09 +03:00
scrawl
a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
 2015-06-22 20:09:02 +02: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
scrawl
c719b7038e Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-18 15:00:21 +02: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
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
Marc Zinnschlag
e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 2015-06-14 12:50:10 +02:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +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
scrawl
e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-06-07 15:23:54 +02: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
scrawl
958b34771a Fix clang warnings about 'typename' outside of a template 2015-06-04 20:42:05 +02: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
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02: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
Stanislav Bas
994c6833bc Add missing columns for the ID completion 2015-05-30 23:54:16 +03:00
Stanislav Bas
e943d17b29 Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes 2015-05-30 22:01:21 +03:00
Stanislav Bas
602f33bd91 Add ColumnId role to the IdTree data methods 2015-05-30 21:30:25 +03:00
Stanislav Bas
87a1f9f9aa Add ID completion manager 2015-05-30 15:31:44 +03:00
cc9cii
b7044ac119 Fix crash loading some addon files. Should resolve Bug #2583. 
- This may be a bug within QSortFilterProxyModel
- It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers.
 2015-05-27 10:27:57 +10:00
Marc Zinnschlag
ae1a606876 Merge remote-tracking branch 'cc9cii/selective-refresh' 2015-05-26 14:32:03 +02:00
cc9cii
f06ddd47c4 Return the correct range for a given topic. Should resolve Bug #2569. 2015-05-26 17:38:22 +10:00
cc9cii
aafcaf32c5 Qualify the scope of Flag_Dialogue. (another one) 2015-05-26 16:12:54 +10:00
cc9cii
2f29c2c077 Qualify the scope of Flag_Dialogue. 2015-05-26 13:58:58 +10:00
cc9cii
ec808843c3 Do not rebuild the dialogue subview unless required. Should resolve Bug #2581. 
The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview.  Changes in this commit include:

- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list
 2015-05-26 13:35:10 +10:00
Marc Zinnschlag
5f41ef4809 Merge remote-tracking branch 'cc9cii/master' 2015-05-25 11:10:17 +02:00
cc9cii
3c82e6d034 Retrieve the correct index for the type of record being un-deleted. 2015-05-25 16:36:42 +10:00
cc9cii
e6d2821b78 Refresh table filters when the model is updated. Should resolve Bug #2579. 2015-05-25 09:15:07 +10:00
Marc Zinnschlag
07ce7b95cf Merge remote-tracking branch 'cc9cii/npc-additional-data' 2015-05-24 21:15:26 +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
cc9cii
21af1913e1 Ensure ColumnId names are unique. 2015-05-24 19:18:54 +10:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
Marc Zinnschlag
53b4c15d85 Merge remote-tracking branch 'smbas/master' 2015-05-23 16:02:09 +02:00
Marc Zinnschlag
b58b7a89ed Merge remote-tracking branch 'rohit-n/reorder2' 2015-05-23 09:19:03 +02:00
Stanislav Bas
a5183aefbe Add record state tracking to the ModifyCommand (Fix #2555) 2015-05-22 23:53:25 +03:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
Stanislav Bas
d27b92e9f1 Avoid gaps between local indexes in RefIdData after removal of records (Fix #2545) 2015-05-22 00:57:47 +03: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
1d0b8587a1 Use HasWater bit flag rather than mWaterInt bool. 2015-05-20 21:14:17 +10:00
cc9cii
b27a879352 Add the remaining Cell data for editing with dialogue subview. Should resolve Bug #2551. 
- NOTE: the interior water flag and water level logic needs reviewing
- does not automatically disable region names for interiors without mQuasiEx flag
- Colour values can't be entered as RGB
- Region names are not drop down menus
 2015-05-19 22:01:40 +10:00
cc9cii
0ecfd9119f Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546. 2015-05-19 06:56:38 +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
538e550b2b Fix for Bug #2543. Spells magic effect id typo. 2015-05-13 10:30:44 +10:00
cc9cii
2b84598e85 Remove duplicated but reversed map. 2015-05-10 20:52:29 +10:00
cc9cii
ab21c0551c Provide a default encoding when changing to "Function". 2015-05-10 13:34:45 +10:00
cc9cii
587efcfe9d Use better initial value type. Fix exception while saving values. 2015-05-10 07:49:18 +10:00
cc9cii
5fb269336f Don't use initializer list 2015-05-10 07:02:08 +10:00
cc9cii
d6ecc64168 Aggregate types can't be static - osx compiler appears to be more strict. 2015-05-10 06:17:57 +10:00
cc9cii
69317095be For compiling with osx - try using a different syntax for initializing the static maps. 2015-05-10 05:55:50 +10:00
cc9cii
0c461f4424 Add TopicInfos special conditions table. 2015-05-09 21:21:16 +10:00
Marc Zinnschlag
1c334a01ce one more referenceable that escaped the change into object 2015-05-04 19:04:06 +02:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 2015-05-04 02:41:50 +02:00
Marc Zinnschlag
048d7be87c Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516) 2015-05-03 16:35:10 +02:00
cc9cii
b04aeb6aad Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview. 2015-05-01 12:14:09 +10:00
cc9cii
7f2bd01f79 Handle plugins that has 0x00 for levelled list types, for example Ravenloft v5.02d, to use 0x01. 2015-04-29 12:08:11 +10:00
Marc Zinnschlag
f1c0847897 Merge remote-tracking branch 'cc9cii/moveref' 2015-04-28 14:07:18 +02:00
cc9cii
49884f54f7 Fix loading moved references. 2015-04-28 08:07:01 +10:00
cc9cii
889749a493 Allow non-empty mOriginalCell (case where a moved ref is moved again) 2015-04-26 15:44:40 +10:00
cc9cii
b54e5714c9 Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod. 2015-04-26 14:55:40 +10:00
cc9cii
7673be6d0f Loading of moved refs complete. 2015-04-26 12:18:23 +10:00
cc9cii
74b98f7178 Fixed initial loading of moved refs. 2015-04-26 11:35:46 +10:00
cc9cii
2e2d6e04fe gcc friendly version. 2015-04-25 17:43:29 +10:00
cc9cii
dcce59f76c Pass MovedCellRef info to RefCollection. Still has debugging code. 2015-04-25 17:20:02 +10:00
cc9cii
932f1f9fbd Alternative way of finding UniversalId without bloating IdTree. 2015-04-25 15:26:32 +10:00
cc9cii
acb800b8f9 Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
cc9cii
f1a58994c6 Merge branch 'master' into moveref 
Conflicts:
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/ref.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
	components/esm/cellref.hpp
 2015-04-25 06:52:53 +10:00
cc9cii
8aaa74a983 Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand. 2015-04-25 06:06:11 +10:00
cc9cii
a6925683c6 Off by one error - can't delete the last element of a refid collection. 2015-04-25 06:04:39 +10:00
Marc Zinnschlag
6fcf4ea9e3 In ModifyCommand replace proxy model with the source model (Fixes #2498) 2015-04-23 14:24:43 +02:00
cc9cii
82bc666e00 Make AI package items to be editable when a new row is added. 2015-04-22 09:25:55 +10:00
cc9cii
18162557b0 TopicInfos result script are now displayed in dialogue subviews. 2015-04-19 13:31:16 +10:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-19 02:29:16 +02:00
cc9cii
8b1ac451ac More warning fixes. 2015-04-19 09:42:44 +10:00
cc9cii
dd1e4e8b69 Remove gcc/clang warnings. 2015-04-19 08:58:52 +10:00
cc9cii
7561b195ab Revert auto expansion of enums as it was interfering with row based operations. Fix default values of magic effect skill & attributes. 2015-04-18 15:28:34 +10:00
cc9cii
f88be67556 Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate 2015-04-18 09:37:19 +10:00
cc9cii
e241fb0104 Convert clothing/armour part reference type column in the nested tables to use enum delegates. 2015-04-18 08:31:08 +10:00
cc9cii
e00d7f72ac Convert magic effects ID and Range columns in the nested tables to use enum delegate 2015-04-18 08:09:14 +10:00
cc9cii
befd6fe658 Convert magic effects Skills column in the nested tables to use enum delegates. 2015-04-18 07:15:40 +10:00
cc9cii
d6c2cff381 Convert magic effects Attribute column in the nested tables to use enum delegates. 2015-04-17 21:33:25 +10:00
cc9cii
c41b4b84a6 Cleanup post merge. 2015-04-17 13:45:45 +10:00
cc9cii
47d5eac290 Merge branch 'master' into NonTableFields 
Conflicts:
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/idtable.hpp
 2015-04-17 12:37:34 +10:00
cc9cii
32e73c3deb Add creature/item levelled lists (non table items) to dialogue subview. 2015-04-17 11:50:19 +10:00
cc9cii
a2d824bfa6 Changes to support dialogue only items but in a list view via QDataWidgetMapper. 2015-04-17 01:27:36 +10:00
cc9cii
1c7ed795c2 Add creature/item levelled lists to dialogue subview. 2015-04-13 22:21:27 +10:00
cc9cii
513c3a47cb Add clothing/armor part reference table to dialogue subview. 2015-04-13 21:08:23 +10:00
cc9cii
526b53fce0 Add AI packages table to dialogue subview. Also minor bug fixes. 2015-04-13 14:14:00 +10:00
cc9cii
60e5ff8811 Remove duplicated checks and exceptions. 2015-04-13 08:03:30 +10:00
cc9cii
221c57adee Fix template syntax and travis warnings. 2015-04-13 07:05:06 +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
ef84e553be Renamed some stuff. 2015-04-12 13:48:23 +10:00
cc9cii
41b368a759 Moved templated code around a bit. 2015-04-12 10:52:01 +10:00
cc9cii
4b9c9bf095 Simplify and relocate nested column definitions. 2015-04-12 08:52:09 +10:00
cc9cii
8dab2f9b14 Use human friendly strings in magic effects subtable. 2015-04-12 07:46:32 +10:00
cc9cii
a460409555 Add Spells and Enchantment magic effects table to dialogue subview. The numbers are not yet converted to strings. 2015-04-11 21:43:25 +10:00
cc9cii
49fd5afdf6 Add birthsign spells table to dialogue subview. 2015-04-11 19:17:17 +10:00
cc9cii
f939648736 Add race spells table to dialogue subview. 2015-04-11 19:05:03 +10:00
cc9cii
9c75dad1ac Why is gcc so unkind? 2015-04-11 18:21:08 +10:00