mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-11 18:37:08 +00:00
Code Issues Projects Releases Wiki Activity
14,759 Commits 17 Branches 65 Tags 493 MiB
a445683312
Commit Graph

208 Commits

Author SHA1 Message Date
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
23fde87816 fixed an indexing error 2015-09-11 10:50:19 +02:00
Marc Zinnschlag
584a7a66b9 various minor fixes 2015-09-10 12:41:31 +02:00
Marc Zinnschlag
09ec60fe2a handle missing land texture records properly during merge 2015-09-08 16:01:34 +02:00
Marc Zinnschlag
73f6efddcc fixed a texture indexing bug (only affects the editor) 2015-09-08 15:33:15 +02:00
Marc Zinnschlag
a8dc1c1198 merge land tables 2015-09-03 16:15:00 +02:00
Marc Zinnschlag
85f6bb892b removed indirection in OpenMW-CS land record 2015-08-31 18:13:27 +02:00
Marc Zinnschlag
69b9eadb52 refactored loading of land data 2015-08-31 16:13:26 +02:00
Marc Zinnschlag
69045d7ec9 additional safety check for land texture listing merge stage 2015-08-31 11:10:58 +02:00
Marc Zinnschlag
890bbb6b11 merge land texture tables 2015-08-30 14:27:22 +02:00
Marc Zinnschlag
b7983d08ba fixed merge stage order; added proper initialisation 2015-08-30 11:08:56 +02:00
Marc Zinnschlag
a97a632aa7 merge references tables 2015-08-26 17:21:24 +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
40753aa9a3 simplifying merge stage 2015-08-25 08:43:03 +02:00
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
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
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
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
Stanislav Bas
ff2dab8d56 Remove check for an empty Particle from Magic effects verifier 2015-08-06 14:17:42 +03:00
Stanislav Bas
0ea4d1981a Add magic effect verifier 2015-08-03 19:08:01 +03:00
Marc Zinnschlag
9b12b4f1e2 refactored mapping from message severity enum to string 2015-07-16 14:46:02 +02: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
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
Marc Zinnschlag
9a102f81c8 added setting for controlling script compiler warnings 2015-06-20 16:21:04 +02:00
Marc Zinnschlag
675884ba30 Merge remote-tracking branch 'smbas/feature-soundgen-verifier' 2015-06-15 16:25:11 +02:00
Stanislav Bas
281088c93b Add check for an empty sound field to SoundGens verifier 2015-06-13 19:47:39 +03:00
Stanislav Bas
2c15ad5e0c Add SoundGens verifier 2015-06-13 19:08:31 +03: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
cc9cii
c4aa3d3ee3 Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained. 2015-05-30 21:12:47 +10:00
cc9cii
01eba7b721 Extra check for thread affinity. 2015-05-30 19:17:42 +10:00
cc9cii
76196d815d Update user preference setting value via an event message queue. 2015-05-30 18:58:33 +10:00
cc9cii
393cee406f Use signals for user preference setting updates. 2015-05-29 19:28:25 +10:00
cc9cii
734e52d1c8 Move the user preference check to the preparation step before the running of the operation. 2015-05-29 06:40:40 +10:00
cc9cii
00c165d3a5 Add user preference option to check unused or redundant pathgrid points. Also resolve namespace clash issue in osx. 2015-05-28 08:44:17 +10:00
Marc Zinnschlag
baaf801521 Merge remote-tracking branch 'cc9cii/loadcell-fix' 2015-05-27 19:31:25 +02:00
cc9cii
674a124bc6 Don't use local type as a template parameter. 2015-05-27 22:27:32 +10:00
cc9cii
3a31468af0 Pathgrid record verifier. Feature #2000. 2015-05-27 22:12:11 +10:00
cc9cii
6966555377 Object verifier check to see if the script used by that object actually exists. Should resolve Bug #2582. 2015-05-27 15:55:00 +10:00