Commit Graph

14092 Commits (226f7b69281b84d78d6aaef2be0ce7ef03d518dd)
 

Author SHA1 Message Date
cc9cii 226f7b6928 Suppress additional MSVC warnings after Update 1 9 years ago
cc9cii 76e9a03596 More efficient implementation of an earlier fix so that id is searched only once
- see commit 306bfcbdf2
9 years ago
cc9cii 477e0ee912 Convert std::to_string() calls to snprintf() for cell references.
- Profiling indicates snprintf() is more efficient when using MSVC (not tested with linux)
9 years ago
cc9cii f6d6138f46 Minor formatting change. 9 years ago
cc9cii de5ce7059e Use load message system for moved ref target cell error logging. 9 years ago
cc9cii 47b5fa9dae Convert some of ostringstream << operations to std::to_sting() calls.
- At least with MSVC the latter is more efficient.
- There are many more, but leave them until they show up during profiling (so far only loading was profiled, and mainly cell references)
9 years ago
cc9cii 86945d1912 Convert the CellRef record index lookup maps to use integer keys rather than strings.
- Morrowind load over 300,000 references, so even small inefficiencies add up to longer loading times.
- std::map is used, but should try others, std::unordered_map or even std::vector
9 years ago
cc9cii 0de223c637 Fix bug (#3067) where content file number was being ignored while searching for already loaded cell references.
- Introduced by commits 49884f54f7 and 896ab44d1e.
- Also see https://github.com/OpenMW/openmw/pull/557
9 years ago
cc9cii 306bfcbdf2 Fix exception when deleting a record while dialogue subview for that record is open. 9 years ago
cc9cii 68e16b6cee Convert RefNum index map to use find(). 9 years ago
cc9cii a967418a5a Fix Preview and Unpaged World subviews not rendering. Not sure if this is related to a later version of Ogre being used. 9 years ago
cc9cii ff072441fd Change the loader's top progress bar to show total number of records processed rather than the number of files. 9 years ago
cc9cii 65df15a89d Suppress MSVC 2015 warnings about hidden/deleted base class move constructors and move assignment operators. 9 years ago
cc9cii 19af94b73e Reduce copying further by adding move constructors and move assignment operators to CellRef structs. 9 years ago
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
9 years ago
cc9cii 257126ed69 Call push_back() if inserting to the end of the vector. It seems MSVC may be generating different code compared to insert(). 9 years ago
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."
9 years ago
cc9cii f029682057 Merge branch 'cc9cii' into minor-enhancements
Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/refidcollection.cpp
9 years ago
cc9cii 91bf42874f Merge pull request #13 from cc9cii/master-cherry-pick-4
Merge master (cherry pick 4)
9 years ago
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)
9 years ago
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)
9 years ago
Marc Zinnschlag ec00bd2c98 make initial size of script error panel configurable (Fixes #2996)
(cherry picked from commit 99500f4021)
9 years ago
Marc Zinnschlag 8c4d414635 remember script error panel height per scriptsubview
(cherry picked from commit f5c61ee616)
9 years ago
Marc Zinnschlag 8da783d877 do not adjust error panel height if panal was already open
(cherry picked from commit 26640d17eb)
9 years ago
Marc Zinnschlag 2c5f0bf6c5 hide script error list when there are no errors (Fixes #2867)
(cherry picked from commit 1093a53cf9)
9 years ago
Marc Zinnschlag 0366a05649 Removed validator for filenames in OpenMW-CS (Fixes #2918)
(cherry picked from commit b74b274ac0)
9 years ago
Marc Zinnschlag 30b28bfd07 adjusted startup warning message for recent improvements regarding loading/saving
(cherry picked from commit e0e9e7f8c2)
9 years ago
scrawl 0eca29eb62 Ignore Creature INDX subrecords
Found in some .ess files, not sure what they mean.

(cherry picked from commit 0bdfd1b0d7)
9 years ago
scrawl ebf9ffd1da Fix double writing of Dialogue NAME in OpenCS
(cherry picked from commit af4923577b)
9 years ago
scrawl d3caeaf898 Remove unused SOUND_INPUT_INCLUDES cmake variable.
(cherry picked from commit 0220e82259)

Conflicts:
	apps/openmw/CMakeLists.txt
9 years ago
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)
9 years ago
cc9cii 1334091613 Resolve merge issues. 9 years ago
scrawl 33c0db1d9a Adjust tests to work with esm_rewrite branch.
(cherry picked from commit aae1aa3708)
9 years ago
scrawl 0d9ffe8119 Tests: add record overwrite test
(cherry picked from commit f91aae2350)
9 years ago
scrawl d3ada38f01 Tests: add record deletion test
(cherry picked from commit 1e817a976f)
9 years ago
scrawl c3031da20e Tests: add content_diagnostics_test (requires some data files)
(cherry picked from commit 771193bae8)
9 years ago
scrawl c221be76dc Tests: add dialogue_merging_test (requires some data files)
(cherry picked from commit 38c155c579)
9 years ago
scrawl f9e12d6fbd Delete empty test
(cherry picked from commit d0d8c2eded)
9 years ago
scrawl 25bb8a59ef esmtool fix
(cherry picked from commit 9116c701d5)

Conflicts:
	apps/esmtool/record.cpp
9 years ago
scrawl 41ee50c2b7 Move common subrecord definitions (NAME, DELE) to defs.hpp
(cherry picked from commit fc8e40889d)
9 years ago
Stanislav Bas d789d9369c Make saving of deleted ESM records more consistent
(cherry picked from commit f9b0b7ede5)
9 years ago
Stanislav Bas 3821bffbfa Fix missing break in switch statement
(cherry picked from commit 9a8ca81907)
9 years ago
Stanislav Bas 2abdeef2e0 Remove unused includes
(cherry picked from commit daaff1284e)

Conflicts:
	apps/openmw/mwworld/store.cpp
	components/esm/util.hpp
9 years ago
Stanislav Bas 38e99c9cd4 Load methods (for ESM records) accept a deleted flag in ESSImporter
(cherry picked from commit 0c6ab6cc94)
9 years ago
Stanislav Bas 0c4dd48394 Load methods (for ESM records) accept a deleted flag in ESMTool
(cherry picked from commit 8243fb2479)

Conflicts:
	apps/esmtool/record.cpp
9 years ago
Stanislav Bas f4587e48f3 Load methods (for ESM records) accept a deleted flag in OpenCS
(cherry picked from commit 13bb6be238)

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
9 years ago
Stanislav Bas 0c002dd6de Load/read methods (for ESM records) accept a deleted flag in OpenMW
(cherry picked from commit 67c8f95c4e)

Conflicts:
	apps/openmw/mwworld/store.cpp
9 years ago
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)

Conflicts:
	components/esm/loadland.cpp
	components/esm/loadland.hpp
9 years ago
Stanislav Bas 7013ba751c Fix build errors & warnings
(cherry picked from commit 1e8182220a)
9 years ago
Stanislav Bas d12f784e7e Remove <cstdint> include file from loaddial.cpp
(cherry picked from commit f5745749a6)
9 years ago