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

1282 commits

Author SHA1 Message Date
Marc Zinnschlag
16dda281ce made merge operation more fluent 2015-08-23 13:04:42 +02:00
Marc Zinnschlag
103073150e added info tables and pathgrid table to merge operation 2015-08-23 12:58:49 +02:00
Marc Zinnschlag
c92898a5bc flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first) 2015-08-23 12:37:45 +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
scrawl
031d64d0d3 Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records 2015-08-22 12:57:39 +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
Marc Zinnschlag
3902513e65 merge id collections 2015-08-21 14:02:32 +02: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
Marc Zinnschlag
1b663f01af create merged document and open a view for it (document is still empty at this point) 2015-08-16 15:24:48 +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
Marc Zinnschlag
d8655f2ff8 forgot to connect merge operation signals 2015-08-13 14:49:32 +02:00
Marc Zinnschlag
904ad94952 added merge operation (doesn't do anything yet) 2015-08-13 12:03:20 +02:00
Marc Zinnschlag
23ccee0124 Merge remote-tracking branch 'dieho/master' 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-08-08 11:00:44 +02:00
Marc Zinnschlag
7f10a7f24f Merge remote-tracking branch 'smbas/feature-mgef-verifier' 2015-08-08 10:50:38 +02:00
Stanislav Bas
ff2dab8d56 Remove check for an empty Particle from Magic effects verifier 2015-08-06 14:17:42 +03:00
Marc Zinnschlag
b83f9445a9 added UI for merge tool (merge tool itself is still missing) 2015-08-06 12:52:10 +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
0ea4d1981a Add magic effect verifier 2015-08-03 19:08:01 +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
6a9218ee07 replaced State_Compiling (not requried anymore) with State_Merging 2015-07-30 11:49:24 +02:00
Marc Zinnschlag
2c1cee38b4 Merge remote-tracking branch 'smbas/feature-extended-configurator' 2015-07-28 07:56:12 +02:00
Stanislav Bas
03c2e11961 Update to upstream/master. Resolve merge conflicts 2015-07-27 13:54:13 +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
Marc Zinnschlag
cdfa3006a3 incorrect sBribe GMSTs for new omwgame files (Fixes #2785) 2015-07-18 17:47:50 +02:00
Marc Zinnschlag
b2ab0122ab Merge branch 'scriptbuttons' 2015-07-18 17:37:43 +02:00
Marc Zinnschlag
8763a3b3c3 make compilation delay configurable via a user setting 2015-07-18 15:32:38 +02:00
scrawl
58720e6a28 Fix the OpenCS rendering crash on exit (Fixes #2735) 2015-07-18 03:52:48 +02:00
Marc Zinnschlag
9b12b4f1e2 refactored mapping from message severity enum to string 2015-07-16 14:46:02 +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
Marc Zinnschlag
fc6c14614b added user settings option to toggle toolbars in single-record subviews 2015-07-13 12:52:18 +02:00
Stanislav Bas
71e5fc7f04 Remove INAM handling from InfoCollection 2015-07-13 11:27:32 +03:00
Marc Zinnschlag
749eff5259 renaming a few user settings categories 2015-07-13 09:42:16 +02: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
ceb3dea55c Rewording of the user setting for extended configuration 2015-07-05 20:11:21 +03:00
Stanislav Bas
6162a46fbe Update to upstream/master. Resolve the merge conflict 2015-07-05 16:15:48 +03: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
fcf69555f4 Add the user setting for enabling the configuration of extended commands 2015-07-02 20:41:32 +03: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
Marc Zinnschlag
e27a75bd10 added user setting for cyclic prev/next 2015-06-27 15:56:41 +02: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
2dada1a162 Merge branch 'meta' 2015-06-26 18:37:39 +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
Marc Zinnschlag
8fbc799655 Merge remote-tracking branch 'cc9cii/master' 2015-06-25 14:06:22 +02:00
cc9cii
c0f3d70f06 Use the new severity message attribute. 2015-06-25 20:23:43 +10:00
cc9cii
71f3b7ed4f Fix crash when user preference is missing. 2015-06-25 20:21:51 +10:00
Marc Zinnschlag
6fbdbb11d5 added refrash menu item to report table (Fixes #2620) 2015-06-25 12:03:40 +02: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
c644f15167 calm down travis 2015-06-20 19:46:38 +02:00
Marc Zinnschlag
b9f6baf317 add normal script warnings mode (Fixes #2642) 2015-06-20 19:16:15 +02:00
Marc Zinnschlag
197b8ec731 added severity attribute for operation messages (Fixes #2717) 2015-06-20 19:08:31 +02:00
Marc Zinnschlag
8791832c86 standarised on the use of the Message struct when passing operations messages around 2015-06-20 17:56:42 +02:00
Marc Zinnschlag
0e21c61297 replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct 2015-06-20 16:55:34 +02:00