cc9cii
19af94b73e
Reduce copying further by adding move constructors and move assignment operators to CellRef structs.
2015-12-06 15:20:45 +11:00
cc9cii
23e7e3c165
Use std::unique_ptr to store records in collections, RefidCollection and RefIdData.
...
- std::move support required (C++11)
- MSVC 2013 or later should be fine
2015-12-06 15:14:05 +11:00
cc9cii
257126ed69
Call push_back() if inserting to the end of the vector. It seems MSVC may be generating different code compared to insert().
2015-12-05 20:50:47 +11:00
cc9cii
77394fce99
Fix table being sorted twice (at least it appeared that way according to the sample profiler)
...
- Quoting Qt-4.8: "Note: . Setting the property to true with setSortingEnabled() immediately triggers a call to sortByColumn() with the current sort section and order."
2015-12-05 20:38:09 +11:00
cc9cii
f029682057
Merge branch 'cc9cii' into minor-enhancements
...
Conflicts:
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/refidcollection.cpp
2015-12-05 19:55:32 +11:00
cc9cii
91bf42874f
Merge pull request #13 from cc9cii/master-cherry-pick-4
...
Merge master (cherry pick 4)
2015-12-05 19:35:39 +11:00
scrawl
3c02703876
Not found Land Textures are no longer a fatal error (Bug #3037 )
...
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
(cherry picked from commit 35fa1f5865
2015-12-05 18:14:55 +11:00
scrawl
a1939ae05f
StringUtils: use the locale-unaware tolower function
...
There is no change in behaviour since we were using the C locale.
The locale-aware tolower is much slower than the locale-unaware one. At least on Linux/GCC it calls dynamic_cast's, and is overall slower by an order of magnitude.
(cherry picked from commit 27e669296e
2015-12-05 18:11:21 +11:00
Marc Zinnschlag
ec00bd2c98
make initial size of script error panel configurable ( Fixes #2996 )
...
(cherry picked from commit 99500f4021
2015-12-05 17:45:58 +11:00
Marc Zinnschlag
8c4d414635
remember script error panel height per scriptsubview
...
(cherry picked from commit f5c61ee616
2015-12-05 17:45:45 +11:00
Marc Zinnschlag
8da783d877
do not adjust error panel height if panal was already open
...
(cherry picked from commit 26640d17eb
2015-12-05 17:45:32 +11:00
Marc Zinnschlag
2c5f0bf6c5
hide script error list when there are no errors ( Fixes #2867 )
...
(cherry picked from commit 1093a53cf9
2015-12-05 17:45:16 +11:00
Marc Zinnschlag
0366a05649
Removed validator for filenames in OpenMW-CS ( Fixes #2918 )
...
(cherry picked from commit b74b274ac0
2015-12-05 17:44:59 +11:00
Marc Zinnschlag
30b28bfd07
adjusted startup warning message for recent improvements regarding loading/saving
...
(cherry picked from commit e0e9e7f8c2
2015-12-05 17:44:40 +11:00
scrawl
0eca29eb62
Ignore Creature INDX subrecords
...
Found in some .ess files, not sure what they mean.
(cherry picked from commit 0bdfd1b0d7
2015-12-05 17:42:58 +11:00
scrawl
ebf9ffd1da
Fix double writing of Dialogue NAME in OpenCS
...
(cherry picked from commit af4923577b
2015-12-05 17:33:13 +11:00
scrawl
d3caeaf898
Remove unused SOUND_INPUT_INCLUDES cmake variable.
...
(cherry picked from commit 0220e82259
2015-12-05 17:32:55 +11:00
Alexander "Ace" Olofsson
940e982d65
Add FFMPEG to include path for OpenMW
...
I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
(cherry picked from commit d2a4175804
2015-12-05 17:29:12 +11:00
cc9cii
1334091613
Resolve merge issues.
2015-12-05 17:28:32 +11:00
scrawl
33c0db1d9a
Adjust tests to work with esm_rewrite branch.
...
(cherry picked from commit aae1aa3708
2015-12-05 11:27:12 +11:00
scrawl
0d9ffe8119
Tests: add record overwrite test
...
(cherry picked from commit f91aae2350
2015-12-05 11:27:00 +11:00
scrawl
d3ada38f01
Tests: add record deletion test
...
(cherry picked from commit 1e817a976f
2015-12-05 11:26:49 +11:00
scrawl
c3031da20e
Tests: add content_diagnostics_test (requires some data files)
...
(cherry picked from commit 771193bae8
2015-12-05 11:26:37 +11:00
scrawl
c221be76dc
Tests: add dialogue_merging_test (requires some data files)
...
(cherry picked from commit 38c155c579
2015-12-05 11:26:24 +11:00
scrawl
f9e12d6fbd
Delete empty test
...
(cherry picked from commit d0d8c2eded
2015-12-05 11:26:11 +11:00
scrawl
25bb8a59ef
esmtool fix
...
(cherry picked from commit 9116c701d5
2015-12-05 11:25:59 +11:00
scrawl
41ee50c2b7
Move common subrecord definitions (NAME, DELE) to defs.hpp
...
(cherry picked from commit fc8e40889d
2015-12-05 11:25:14 +11:00
Stanislav Bas
d789d9369c
Make saving of deleted ESM records more consistent
...
(cherry picked from commit f9b0b7ede5
2015-12-05 11:24:21 +11:00
Stanislav Bas
3821bffbfa
Fix missing break in switch statement
...
(cherry picked from commit 9a8ca81907
2015-12-05 11:24:09 +11:00
Stanislav Bas
2abdeef2e0
Remove unused includes
...
(cherry picked from commit daaff1284e
2015-12-05 11:23:57 +11:00
Stanislav Bas
38e99c9cd4
Load methods (for ESM records) accept a deleted flag in ESSImporter
...
(cherry picked from commit 0c6ab6cc94
2015-12-05 11:23:24 +11:00
Stanislav Bas
0c4dd48394
Load methods (for ESM records) accept a deleted flag in ESMTool
...
(cherry picked from commit 8243fb2479
2015-12-05 11:23:12 +11:00
Stanislav Bas
f4587e48f3
Load methods (for ESM records) accept a deleted flag in OpenCS
...
(cherry picked from commit 13bb6be238
2015-12-05 11:22:51 +11:00
Stanislav Bas
0c002dd6de
Load/read methods (for ESM records) accept a deleted flag in OpenMW
...
(cherry picked from commit 67c8f95c4e
2015-12-05 11:20:55 +11:00
Stanislav Bas
82363bf318
Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records
...
(cherry picked from commit 4a16eba716
2015-12-05 11:20:31 +11:00
Stanislav Bas
7013ba751c
Fix build errors & warnings
...
(cherry picked from commit 1e8182220a
2015-12-05 11:19:22 +11:00
Stanislav Bas
d12f784e7e
Remove <cstdint> include file from loaddial.cpp
...
(cherry picked from commit f5745749a6
2015-12-05 11:19:11 +11:00
Stanislav Bas
a3d48fd482
Rework ESS importer code. Remove explicit NAME handling for ESM records
...
(cherry picked from commit 6b21da7f8e
2015-12-05 11:18:57 +11:00
Stanislav Bas
459fe3da52
Rework EsmTool code. Remove explicit NAME handling
...
(cherry picked from commit ede4bfcf52
2015-12-05 11:18:46 +11:00
Stanislav Bas
0277a4e8c4
Implement saving of deleted records
...
(cherry picked from commit 8e6a7be6f5
2015-12-05 11:18:15 +11:00
Stanislav Bas
a120bb2b54
Delete infos of deleted dialogue when loading a content file
...
(cherry picked from commit e04e32bcff
2015-12-05 09:46:53 +11:00
Stanislav Bas
9a803739ff
Add a separate method to check whether a record is deleted or not for IdCollection
...
(cherry picked from commit a4d3e59e5c
2015-12-05 09:46:40 +11:00
Stanislav Bas
696f7a942b
Some refactoring. Remove unused code
...
(cherry picked from commit 5fd48efd28
2015-12-05 09:46:20 +11:00
Stanislav Bas
b5c958c62a
More ESM records have DELE handling.
...
Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter
(cherry picked from commit e65ff723ce
2015-12-05 09:17:40 +11:00
Stanislav Bas
8b7b3d2a4e
Refine DELE handling in ESM records. Add position-independent DELE search
...
(cherry picked from commit ad353e6dd0
2015-12-05 07:20:36 +11:00
Stanislav Bas
4e199697cc
Handle deleted records in RefCollection
...
(cherry picked from commit 3ba73f5fd9
2015-12-05 07:20:22 +11:00
Stanislav Bas
3686c1e32d
Move DELE handling to CellRef record
...
(cherry picked from commit e8a9567be3
2015-12-05 07:20:09 +11:00
Stanislav Bas
9503104129
Return a correct index for a loaded record that was deleted
...
(cherry picked from commit a1389b87ba
2015-12-05 07:19:55 +11:00
Stanislav Bas
0979d88b0c
Rework RefIdData code. Update the index map when a new record is loaded
...
(cherry picked from commit 5e623a2a1d
2015-12-05 07:19:43 +11:00
Stanislav Bas
82e1b0563c
Add NAME handling to DebugProfile and Filter records
...
(cherry picked from commit b55a4999ca
2015-12-05 07:19:32 +11:00
