1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-08-12 01:14:06 +00:00
Commit graph

21223 commits

Author SHA1 Message Date
scrawl
9ea475d00c Port LocalScripts::addCell to new CellStore interfaces 2015-12-06 20:33:22 +01:00
scrawl
a517f4f9ba Add CellStore::forEachType to help with porting over game logic to the new interfaces 2015-12-06 20:32:39 +01:00
scrawl
0af33b5abd Throw exception if moveTo() is passed an object not part of *this 2015-12-06 20:05:13 +01:00
scrawl
176a3c16f4 Resolve moved references loaded from a save game 2015-12-06 20:00:24 +01:00
scrawl
671561ea37 Write moved references to the save game file (not resolved on loading yet) 2015-12-06 19:11:25 +01:00
scrawl
2219231230 Missing updateMergedRefs() 2015-12-06 18:46:49 +01:00
scrawl
138957c49a Special case objects with no refnum 2015-12-06 18:43:52 +01:00
scrawl
5e99a3eda6 Rename CellStore Functor to Visitor 2015-12-06 18:13:04 +01:00
scrawl
2301080c63 Load CellStore when an object is moved there 2015-12-06 18:04:48 +01:00
scrawl
811df1e97b Pass the ESM reader list to CellStore constructor 2015-12-06 18:03:55 +01:00
scrawl
b320a01cee Update AUTHORS.md 2015-12-06 17:46:28 +01:00
scrawl
d10f2505f2 Merge pull request #845 from pcercuei/cmake_improvement
CMake: Add the list of possible values for some config options
2015-12-06 17:40:19 +01:00
scrawl
db7835c925 Merge pull request #846 from pcercuei/gles_add_missing_includes
mwrender: Add missing includes
2015-12-06 17:37:45 +01:00
Paul Cercueil
0765ff3ba2 mwrender: Add missing includes
Those missing includes were causing the build to fail when compiled with
USE_GLES set.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-06 16:01:21 +01:00
Paul Cercueil
46f45773ca CMake: Add the list of possible values for some config options
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-06 15:55:23 +01:00
scrawl
1d5af3c9c8 Remove unneeded cast 2015-12-06 15:44:27 +01:00
scrawl
e39f49a88f OSG extensions namespace fixes 2015-12-06 15:27:43 +01:00
Marc Zinnschlag
b37a2ac09c user settings categories 2015-12-06 12:06:28 +01:00
cc9cii
68e16b6cee Convert RefNum index map to use find(). 2015-12-06 21:19:06 +11:00
Marc Zinnschlag
36ce8f97d7 basic framework for new user settings system 2015-12-06 11:18:31 +01: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
Chris Robinson
91cd6be11b Use the correct SoundId for NPC "land" sounds 2015-12-05 18:00:28 -08:00
Chris Robinson
c75303b652 Add an option to select and enable HRTF 2015-12-05 17:14:53 -08:00
Marc Zinnschlag
03a0b1fbfd Merge remote-tracking branch 'origin/master' 2015-12-05 15:41:20 +01:00
scrawl
c60f4ba7bd Make RigGeometry bone references case-insensitive (Fixes #3058) 2015-12-05 15:02:35 +01: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)

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 d2a4175804)
2015-12-05 17:29:12 +11:00
cc9cii
1334091613 Resolve merge issues. 2015-12-05 17:28:32 +11:00
scrawl
53158d29b1 stopSound crash fix 2015-12-05 01:54:16 +01: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