mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 03:32:36 +00:00
Code Issues Projects Releases Wiki Activity
14,095 Commits 18 Branches 66 Tags
Commit Graph

14095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cc9cii
003b0d48be Move resource names listing code out of CSMWorld::Resources ctor in order to avoid multiple scan of the same resources. 
- The resources are still scanned twice, once when the archive/directory is added and another time when the names are listed.
 2015-12-19 17:39:02 +11:00
cc9cii
06f9922822 Performance improvements for loading Info records. 
- The order of info records with the same topic are maintained in Collection::mRecords
- The index lookup data structure are not ordered.  The topic string is hashed.  The infos for the topic are simply placed in a vector.
- The index values for appending or inserting a record takes prev/next values (if exist)
- FIXME: prev/next values are not adjusted for adding or removing records
- FIXME: undo after reordering does not reset the modified flag
 2015-12-19 17:30:55 +11:00
cc9cii
edf4e6ff95 Fix crash when repeatedly performing delete/undo due to empty moved record. 
- introduced in commit 23e7e3c165bb2631f9d8eb298f86da862e91cefa
 2015-12-19 17:22:09 +11:00
cc9cii
226f7b6928 Suppress additional MSVC warnings after Update 1 2015-12-18 19:42:19 +11:00
cc9cii
76e9a03596 More efficient implementation of an earlier fix so that id is searched only once 
- see commit 306bfcbdf21a0292775b644e57a0c1f8606d7226
 2015-12-18 19:41:19 +11:00
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)
 2015-12-18 19:39:40 +11:00
cc9cii
f6d6138f46 Minor formatting change. 2015-12-11 22:39:03 +11:00
cc9cii
de5ce7059e Use load message system for moved ref target cell error logging. 2015-12-11 22:20:21 +11:00
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)
 2015-12-11 22:18:17 +11:00
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
 2015-12-11 21:00:13 +11:00
cc9cii
0de223c637 Fix bug (#3067) where content file number was being ignored while searching for already loaded cell references. 
- Introduced by commits 49884f54f7f00e1d4413b77eae3d6091043aa016 and 896ab44d1e919852aae03be9ecb71378f031b6f5.
- Also see https://github.com/OpenMW/openmw/pull/557
 2015-12-11 07:18:54 +11:00
cc9cii
306bfcbdf2 Fix exception when deleting a record while dialogue subview for that record is open. 2015-12-08 00:27:20 +11:00
cc9cii
68e16b6cee Convert RefNum index map to use find(). 2015-12-06 21:19:06 +11:00
cc9cii
a967418a5a Fix Preview and Unpaged World subviews not rendering. Not sure if this is related to a later version of Ogre being used. 2015-12-06 19:50:26 +11:00
cc9cii
ff072441fd Change the loader's top progress bar to show total number of records processed rather than the number of files. 2015-12-06 19:48:56 +11:00
cc9cii
65df15a89d Suppress MSVC 2015 warnings about hidden/deleted base class move constructors and move assignment operators. 2015-12-06 15:26:20 +11:00
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 35fa1f5865bcb8370505f0a2b641c8363024c8a7)
 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 27e669296e54621472ed5578103ad4306f8a94a9)
 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 99500f40212c7b37a536c2692d5b066c26c79bbf)
 2015-12-05 17:45:58 +11:00
Marc Zinnschlag
8c4d414635 remember script error panel height per scriptsubview 
(cherry picked from commit f5c61ee616bfaed911a574c6d43aa6842c224773)
 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 26640d17eb053176b45482e801236415a42ddf1f)
 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 1093a53cf9f2a85374e145d96bb21bfb46eb13ad)
 2015-12-05 17:45:16 +11:00
Marc Zinnschlag
0366a05649 Removed validator for filenames in OpenMW-CS (Fixes #2918) 
(cherry picked from commit b74b274ac0e88ad7c833b908bb301dee3986264f)
 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 e0e9e7f8c2e2e666f125c2c3a8b1c098ec4ea43a)
 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 0bdfd1b0d7c625eb8cd82bb402f3c6c9a528515b)
 2015-12-05 17:42:58 +11:00
scrawl
ebf9ffd1da Fix double writing of Dialogue NAME in OpenCS 
(cherry picked from commit af4923577b4f97ef4f5c6e89c58bf4badf3228ec)
 2015-12-05 17:33:13 +11:00
scrawl
d3caeaf898 Remove unused SOUND_INPUT_INCLUDES cmake variable. 
(cherry picked from commit 0220e82259bd799e93eb6ae5f2288ba4c71fcd3e)

Conflicts:
	apps/openmw/CMakeLists.txt
 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 d2a417580446deec3c465875ae9f85a2d455be1d)
 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 aae1aa3708bf7a48e768f6b323372f5a61aa93ca)
 2015-12-05 11:27:12 +11:00
scrawl
0d9ffe8119 Tests: add record overwrite test 
(cherry picked from commit f91aae2350a1c6ce188b4f53b5714eb7a288306d)
 2015-12-05 11:27:00 +11:00
scrawl
d3ada38f01 Tests: add record deletion test 
(cherry picked from commit 1e817a976fb836600c74cd4dbfe94742639f1179)
 2015-12-05 11:26:49 +11:00
scrawl
c3031da20e Tests: add content_diagnostics_test (requires some data files) 
(cherry picked from commit 771193bae8d00e0cee089544973deeffafdaccc8)
 2015-12-05 11:26:37 +11:00
scrawl
c221be76dc Tests: add dialogue_merging_test (requires some data files) 
(cherry picked from commit 38c155c579342f8748e3c93f531be1f1da91784a)
 2015-12-05 11:26:24 +11:00
scrawl
f9e12d6fbd Delete empty test 
(cherry picked from commit d0d8c2ededfcb45d8c5aebaac23bf076f719b4e3)
 2015-12-05 11:26:11 +11:00
scrawl
25bb8a59ef esmtool fix 
(cherry picked from commit 9116c701d518f791252fe2c991d24938bf03e3ea)

Conflicts:
	apps/esmtool/record.cpp
 2015-12-05 11:25:59 +11:00
scrawl
41ee50c2b7 Move common subrecord definitions (NAME, DELE) to defs.hpp 
(cherry picked from commit fc8e40889df58bc18a54082799699c6151d41343)
 2015-12-05 11:25:14 +11:00
Stanislav Bas
d789d9369c Make saving of deleted ESM records more consistent 
(cherry picked from commit f9b0b7ede5eb2bc8ef62fce47c495247b04ebd78)
 2015-12-05 11:24:21 +11:00
Stanislav Bas
3821bffbfa Fix missing break in switch statement 
(cherry picked from commit 9a8ca819073e54406daafd04319299429c089c4e)
 2015-12-05 11:24:09 +11:00
Stanislav Bas
2abdeef2e0 Remove unused includes 
(cherry picked from commit daaff1284e26d13358b130d7b44721ced210066d)

Conflicts:
	apps/openmw/mwworld/store.cpp
	components/esm/util.hpp
 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 0c6ab6cc9449e14fe30d1f9baa3424b92eee9ba8)
 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 8243fb2479a18cd47e03e9ffcff87020a9c1446f)

Conflicts:
	apps/esmtool/record.cpp
 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 13bb6be2383c808084eabed0cb1bfb3b9749e55a)

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
 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 67c8f95c4e85466a7c802f4cced117ade2378184)

Conflicts:
	apps/openmw/mwworld/store.cpp
 2015-12-05 11:20:55 +11:00