cc9cii
|
a19a1dabe2
|
Add a check for scale value of 0. Should resolve bug #2880.
(cherry picked from commit 819fecd08e)
|
2015-11-02 18:46:34 +11:00 |
|
Marc Zinnschlag
|
453c3ee760
|
fixed an indexing error
(cherry picked from commit 23fde87816)
|
2015-11-01 18:57:07 +11:00 |
|
Marc Zinnschlag
|
4aa6d7d1d1
|
various minor fixes
(cherry picked from commit 584a7a66b9)
|
2015-11-01 18:56:56 +11:00 |
|
Marc Zinnschlag
|
dcf1f1515a
|
handle missing land texture records properly during merge
(cherry picked from commit 09ec60fe2a)
|
2015-11-01 18:56:43 +11:00 |
|
Marc Zinnschlag
|
1784701b47
|
fixed a texture indexing bug (only affects the editor)
(cherry picked from commit 73f6efddcc)
|
2015-11-01 18:56:31 +11:00 |
|
Marc Zinnschlag
|
25952369ae
|
merge land tables
(cherry picked from commit a8dc1c1198)
|
2015-11-01 18:56: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
|
c4b34a077e
|
refactored loading of land data
(cherry picked from commit 69b9eadb52)
Conflicts:
apps/openmw/mwworld/scene.cpp
components/esmterrain/storage.cpp
|
2015-11-01 18:54:15 +11:00 |
|
Marc Zinnschlag
|
8cb1f4ffe9
|
additional safety check for land texture listing merge stage
(cherry picked from commit 69045d7ec9)
|
2015-11-01 13:40:45 +11:00 |
|
Marc Zinnschlag
|
a2d4957d2a
|
merge land texture tables
(cherry picked from commit 890bbb6b11)
|
2015-11-01 13:40:21 +11:00 |
|
Marc Zinnschlag
|
e5038cbece
|
fixed merge stage order; added proper initialisation
(cherry picked from commit b7983d08ba)
|
2015-11-01 13:40:07 +11:00 |
|
Marc Zinnschlag
|
73ab89bf70
|
merge references tables
(cherry picked from commit a97a632aa7)
|
2015-11-01 13:39:56 +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
|
72aa998261
|
simplifying merge stage
(cherry picked from commit 40753aa9a3)
|
2015-11-01 13:37:41 +11:00 |
|
Marc Zinnschlag
|
e33314ad81
|
made merge operation more fluent
(cherry picked from commit 16dda281ce)
|
2015-11-01 13:37:26 +11:00 |
|
Marc Zinnschlag
|
98cac624a9
|
added info tables and pathgrid table to merge operation
(cherry picked from commit 103073150e)
|
2015-11-01 13:37:14 +11:00 |
|
Marc Zinnschlag
|
024a5405e0
|
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
(cherry picked from commit c92898a5bc)
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
|
2015-11-01 13:37:01 +11:00 |
|
Marc Zinnschlag
|
973c65bc82
|
merge id collections
(cherry picked from commit 3902513e65)
|
2015-11-01 13:35:15 +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 |
|
Marc Zinnschlag
|
3eef192e4d
|
create merged document and open a view for it (document is still empty at this point)
(cherry picked from commit 1b663f01af)
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/documentmanager.cpp
|
2015-11-01 13:31:28 +11:00 |
|
Marc Zinnschlag
|
0b8e04d6a8
|
forgot to connect merge operation signals
(cherry picked from commit d8655f2ff8)
|
2015-11-01 13:25:59 +11:00 |
|
Marc Zinnschlag
|
e4381c3ec8
|
added merge operation (doesn't do anything yet)
(cherry picked from commit 904ad94952)
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
|
2015-11-01 13:25:34 +11: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 |
|
Stanislav Bas
|
f0982c87ba
|
Remove check for an empty Particle from Magic effects verifier
|
2015-09-08 06:20:59 +10:00 |
|
Stanislav Bas
|
ef02bc657f
|
Add magic effect verifier
|
2015-09-08 06:20:25 +10:00 |
|
Marc Zinnschlag
|
092204bd82
|
refactored mapping from message severity enum to string
|
2015-07-27 15:20:24 +10: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 |
|