Project579
e97eeca281
Attempt to work around QT MOC bugs caused by the filesystem header.
2022-09-11 02:19:07 +02:00
Project579
4bb07282c9
Replace all remaining occurrences of boost::filesystem with std::filesystem.
2022-09-11 02:19:00 +02:00
Evil Eye
fb9bc5f535
Use string_view in Fallback::Map
2022-08-28 17:20:49 +02:00
Evil Eye
2222b47e3d
Make Settings::Manager::getString return a reference
2022-08-28 16:38:11 +02:00
mpeco
9040209046
functor-based Qt signal-slot syntax construction set: changing visibility of certain slots for connecting on external/derived classes
2022-08-23 17:14:12 -03:00
mpeco
78700eee57
functor-based Qt signal-slot syntax construction set
2022-08-23 17:14:12 -03:00
elsid
2a79a8074a
Use forward declarations
2022-08-19 22:05:15 +02:00
elsid
b3882777ab
Cleanup opencs includes
2022-08-19 19:25:03 +02:00
elsid
bf1f4f2117
Mark private template functions defined in cpp as inline
2022-08-19 19:17:21 +02:00
Alexei Kotov
aee8150d65
Autoresize table subview columns (bug #6939 )
...
Use the contents of the first 500 records, clamp the width to [100, 300]
2022-08-17 19:58:39 +03:00
Alexei Kotov
e537f2b6f3
Fix display for some package settings
2022-08-14 19:51:43 +03:00
psi29a
b551e69b6f
#5534 remove OSG 3.4 support and require at least 3.6.5 support
2022-08-09 21:07:28 +00:00
elsid
f99ed6f1db
Split components/misc/stringops.hpp into multiple headers
...
Replace all ciEqual overloads with one having std::string_view as argument.
2022-08-03 22:06:24 +02:00
elsid
228a0dc723
Avoid redundant lowerCase call
2022-08-03 00:19:16 +02:00
elsid
ba69146ced
Use std::string_view to avoid redundant std::string construction
2022-08-03 00:18:55 +02:00
Alexei Kotov
0d18f76271
Editor: Decouple levelled list columns (bug #6705 )
2022-07-30 12:48:29 +03:00
Andrei Kortunov
de58c9dff3
Get rid of obsolete osg::Geode where it is possible
2022-07-20 15:28:56 +04:00
Evil Eye
3967509cdd
Use meaningful names instead of pretending we don't know what snow is
2022-07-17 19:54:59 +02:00
psi29a
0eb674ec84
Merge branch 'settings_fix' into 'master'
...
Refactor usage of settings storage in the launcher and editor
See merge request OpenMW/openmw!2123
2022-07-12 13:00:52 +00:00
Andrei Kortunov
4b257e496e
Use static settings map for launcher and editor - the Settings::Manager has a static data anyway
2022-07-12 14:56:20 +04:00
Andrei Kortunov
a5b0ef0912
Avoid possible null dereference
2022-07-12 13:43:47 +04:00
Andrei Kortunov
42b9a6daaf
Do not use an invalid iterator
2022-07-12 12:45:11 +04:00
elsid
7501597813
Do not use float as loop variable
...
apps/opencs/view/render/instanceselectionmode.cpp:294:9: warning: Variable 'i' with floating point type 'float' should not be used as a loop counter [clang-analyzer-security.FloatLoopCounter]
for (float i = 0.0; i <= resolution; i += 2)
^ ~ ~
2022-07-06 13:52:28 +02:00
elsid
bef15edf0b
Remove redundant ostream, istream, iostream and sstream includes
...
* Replace by std::to_string and operator+ where possible.
* Move the code requiring to include <sstream> from .hpp to .cpp files.
2022-07-05 01:41:28 +02:00
Andrei Kortunov
aa349f2ed9
Initialize some missing variables
2022-07-03 15:44:50 +04:00
elsid
7e6c13630a
Use target_precompile_headers for the most expensive headers
2022-07-01 14:05:17 +00:00
elsid
10fbf170a2
Reduce number of includes for boost/program_options
2022-06-25 18:32:10 +02:00
Bret Curtis
37a440a0ee
add one include back
2022-06-20 16:26:52 +02:00
jvoisin
8b9ed57348
Clean up Qt includes
2022-06-17 11:56:54 +02:00
psi29a
9c1970dce4
Merge branch 'lua_esm' into 'master'
...
Advanced Lua scripts configuration in omwaddon
See merge request OpenMW/openmw!1947
2022-06-11 18:48:23 +00:00
ζeh Matt
d5ec959449
Create platform component for platform specific things
2022-06-06 20:45:51 +03:00
Petr Mikheev
a70d5831c5
Lua scripts configuration in omwaddon
2022-06-05 01:36:39 +02:00
Cody Glassman
ce49aa1202
Attach lights at origin when missing AttachLight node
2022-06-04 13:35:27 +00:00
Evil Eye
db1a372e5b
Replace new with make_unique in opencs
2022-05-29 13:25:17 +02:00
Michał Plichta
5ee5e8f2f7
Correct CS typo described in #6704
2022-05-24 19:24:39 +02:00
elsid
98f53eca65
Fix gcc warning: -Wuninitialized
...
/home/elsid/dev/openmw/apps/opencs/model/world/data.cpp: In constructor ‘CSMWorld::Data::Data(ToUTF8::FromType, bool, const Files::PathContainer&, const std::vector<std::__cxx11::basic_string<char> >&, const boost::filesystem::path&)’:
/home/elsid/dev/openmw/apps/opencs/model/world/data.cpp:69:36: warning: member ‘CSMWorld::Data::mCells’ is used uninitialized [-Wuninitialized]
69 | : mEncoder (encoding), mPathgrids (mCells), mRefs (mCells),
| ^~~~~~
2022-05-16 22:26:19 +02:00
cody glassman
04843fed6d
moddable post-processing pipeline
2022-05-15 10:03:58 -07:00
Evil Eye
a64979e25d
Replace empty std::string assignments
2022-05-04 22:33:39 +02:00
Max Henzerling
41be5a17f4
comments from PR
2022-05-01 11:52:19 -07:00
Max Henzerling
af5b1b3083
Add option to open record editting subviews in new windows instead of exclusive docking.
2022-05-01 11:52:19 -07:00
Petr Mikheev
c7ab67c2c1
Allow relative paths in openmw.cfg; support --replace=config.
2022-04-28 00:39:41 +02:00
elsid
0dcb1f5aac
Fix build on Windows
...
Use wrapper header over Windows.h to undefine far and near in a single place.
2022-04-25 00:25:46 +02:00
psi29a
84458baa8b
Merge branch 'VA_OpenMW-CS' into 'master'
...
OpenMW-CS: Issue #3245 Add configurable instance grid, angle, and scale snapping
Closes #3245
See merge request OpenMW/openmw!1737
2022-04-11 16:03:30 +00:00
Vidi_Aquam
035fe778b2
Temporary workaround for angle snapping
...
Made the angle snap only apply to an object when the drag is finished, which is much more usable until the rotation system can be fixed completely
2022-04-11 08:12:38 -05:00
elsid
db44f91fd5
Remove redundant include from esm3/esmreader.hpp
2022-04-10 22:16:32 +02:00
elsid
4509b05bc8
Use std::make_shared instead of new
...
make_shared allocates single storage for ref counter and the object.
std::shared_ptr<T>(new T) allocates 2 storages.
2022-04-08 22:50:09 +02:00
Vidi_Aquam
abf0c8048e
Change reading of settings and add missing logic to mouse wheel drag
2022-04-03 09:04:12 -05:00
Vidi_Aquam
6d7c8f25fc
Implement grid snapping and angle snapping in OpenMW-CS
...
Adds configurable snap settings for instance movement, rotation and scaling, used with the secondary edit button
2022-04-02 19:25:57 -05:00
Martin Otto
96e48e5492
Make settings loader differentiate between engine and editor ( fixes #6658 ).
2022-03-04 09:44:52 +00:00
Bret Curtis
32fd6f297a
static_cast bitwise operation between different enumeration types
2022-03-01 10:53:01 +01:00
Bret Curtis
4b742dd461
explicit capture for lamda
2022-03-01 09:43:08 +01:00
elsid
c044bef6a7
Add StatelessUtf8Encoder to support caller provided buffer for output
2022-02-14 23:19:49 +01:00
Petr Mikheev
a453e5c198
Reuse the same code to load settings in apps/openmw, apps/launcher, apps/opencs
2022-02-02 23:47:11 +01:00
Petr Mikheev
5ca56a4f8a
New option "config" for specifying additional config directories.
2022-02-02 23:47:11 +01:00
Petr Mikheev
dd5ba5c57b
Redirect log only after parsing configuration
2022-02-02 23:47:11 +01:00
elsid
45db56b382
Rework fixed string
...
* Avoid inheritance.
* Define equality operators out of the class definition.
* Replace toString with toStringView where it doesn't make sense to create a string.
2022-01-28 18:39:09 +01:00
Bret Curtis
74e7cfc023
remove unused includes: part1
...
remove unused imports: part2
revert one tidy we will keep for c++20
2022-01-23 17:30:25 +01:00
Bret Curtis
cdbab2325f
rename esmterrain to esm3terrain
2022-01-23 17:19:30 +01:00
Bret Curtis
d1fb854521
move most of the files from esm to esm3, keep common code in esm; this is make space for a future with esm4
...
esm typo
esm typo
2022-01-23 17:04:48 +01:00
Cody Glassman
8ec0a52605
Toggable day night switch ( #5928 )
2022-01-11 09:34:19 +00:00
AnyOldName3
8fc09f8c51
Merge remote-tracking branch 'upstream/master' into detain-hash-selectively-reluctant
...
Merge conflicts included:
* One setting being removed (branch had changed its type).
* One setting's description being changed (branch had changed its type).
* List of files in components/files was changed both upstream and on the
branch.
* Upstream had changed something in a file the branch deletes.
2021-12-09 17:09:52 +00:00
Bret Curtis
9336626927
use OPENMW_RESOURCES_ROOT instead
2021-12-08 14:33:49 +01:00
Bret Curtis
a9bf53d4ed
modified builtin_scripts to be macOS aware; simplified things as the SHADER and MYGUI dir were just pointing to the OpenMW_BINARY_DIR anyway, so removing the code duplication
2021-12-08 14:28:56 +01:00
AnyOldName3
84d6de3eba
Parse paths with boost rules when it's quoted, but use the string verbatim when it's not
2021-11-21 19:51:02 +00:00
Evil Eye
52f9634624
Allow the CS to handle the repeat flag for all types
2021-11-20 11:03:08 +01:00
psi29a
5c5c71778a
Merge branch 'circular' into 'master'
...
Consistently sort content files
See merge request OpenMW/openmw!1350
2021-11-14 20:24:18 +00:00
Evil Eye
6daefe3ddc
Cast to the unsigned char expected by cctype functions
2021-11-14 11:26:18 +01:00
Evil Eye
f23bd51175
Don't check bounds when the type is unambiguously a char
2021-11-14 11:26:18 +01:00
Evil Eye
751e8cf76b
Do a bounds check before calling functions defined in cctype
2021-11-14 11:26:15 +01:00
AnyOldName3
8fb0b5846e
Allow paths with trailing data, emmitting a warning
2021-11-14 00:22:44 +00:00
Evil Eye
a3e039d862
Explicitely sort by file name after adding all data dirs
2021-11-07 14:15:30 +01:00
Alexei Dobrohotov
7a0c13fcf8
Make better use of std::clamp
2021-11-06 08:47:32 +03:00
Bo Svensson
6cf74f7041
refactors ESM::Land ( #3213 )
...
With this PR we reduce coupling, simplify code, encapsulate a variable and separate actual `ESM` data from its context.
2021-11-04 16:55:32 +01:00
Petr Mikheev
37386f417e
Support *.omwscripts in openmw-launcher
2021-10-29 20:09:47 +02:00
Evil Eye
9b565c4cf9
Remove dead code
2021-10-28 22:16:43 +02:00
Bo Svensson
c9c8d02332
fixes a crash ( #3183 )
...
This PR fixes a crash caused by the improperly ensured lifetime of RigGeometry::mSourceGeometry. mSourceGeometry was not adequate to ensure mSourceGeometry would outlive mGeometry because we extend mGeometrys lifetime beyond this lifetime by passing mGeometry to the draw traversal instead of this.
In addition,
We add important comments.
We detect and prevent generally unsafe operations in high level code.
We add a sprinkling of const to help clarify intentions.
2021-10-23 10:31:46 +02:00
elsid
18d3102148
Do not use union to access FIXED_STRING<4> as int
...
https://en.cppreference.com/w/cpp/language/union :
> It's undefined behavior to read from the member of the union that wasn't most recently written.
2021-10-17 17:16:21 +02:00
unelsson
14c4bba4a3
Remove unused include
2021-10-15 21:54:00 +03:00
unelsson
28278e9a82
Drawing duplicate lines is faster than iterating through big containers
2021-10-15 21:54:00 +03:00
unelsson
55456a19fc
Only iterate through temporary selection when using toggle
2021-10-15 21:54:00 +03:00
unelsson
46960825ef
Various terrain selection and editmode dragging fixes
2021-10-15 21:54:00 +03:00
unelsson
89a20b6ea5
Call dragEnded instead of pressed also after aborted operation
2021-10-15 21:54:00 +03:00
unelsson
3df9ceda03
Remove measurement code
2021-10-15 21:54:00 +03:00
unelsson
7602d677fa
Terrain selection optimizations, measurements, renderBin change
2021-10-15 21:54:00 +03:00
Petr Mikheev
a8acc19988
Avoid copying std::string in MWWorld::Ptr::getTypeDescription()
2021-10-12 00:18:23 +02:00
AnyOldName3
1b83b08d80
Merge remote-tracking branch 'upstream/master' into detain-hash
...
Tests which no longer work are commented out.
Some of these don't work because they're effectively testing for the
presence of bugs in the old implementation.
Others don't work because we're no longer accidentally disabling the
boost::program_options feature where it generates an error if only part
of a token gets consumed.
These will be fixed by later commits.
2021-10-10 23:50:50 +01:00
AnyOldName3
af0d399103
Purge all uses of Escape Hash types
2021-10-09 01:49:08 +01:00
psi29a
fc7e13d76a
Merge branch 'omwaddon_dep' into 'master'
...
Allow creating omwaddons without a dependency on an omwgame
See merge request OpenMW/openmw!1243
2021-10-08 06:40:43 +00:00
psi29a
555224a0fb
Merge branch 'fixes' into 'master'
...
Make compilers happy and fix the changelog
See merge request OpenMW/openmw!1260
2021-10-07 10:17:27 +00:00
Evil Eye
d680aa26e9
Disallow switch fallthrough
2021-10-03 21:58:10 +02:00
Matjaž Lamut
1c9f06f742
Minor UI tweaks all around OpenMW-CS
2021-10-03 19:13:51 +00:00
psi29a
782e0710af
Merge branch 'OpenCS-preserve-blocked' into 'master'
...
OpenCS - Preserve "blocked" record flags when saving. #6288
Closes #6288
See merge request OpenMW/openmw!1052
2021-09-27 19:21:20 +00:00
psi29a
ade6cd0127
Merge branch 'editor_columns_filtering' into 'master'
...
Toggling table columns visibility. Partially implements #890
Closes #890
See merge request OpenMW/openmw!1232
2021-09-27 19:02:19 +00:00
Petr Mikheev
413ac067ec
Allow creating omwaddons without a dependency on an omwgame
2021-09-26 17:44:28 +02:00
psi29a
e2e5161d81
Merge branch 'optimizebrushdraw' into 'master'
...
Optimize terrain editing brush drawing performance
Closes #6285
See merge request OpenMW/openmw!1226
2021-09-26 15:14:55 +00:00
Pi03k
e641bea606
Toggling table columns visibility
2021-09-22 10:47:08 +02:00
Evil Eye
831055f878
Merge branch 'OpenCS-fix-modify' into 'master'
...
OpenCS - Re-implement the fix for Issue #6067 .
See merge request OpenMW/openmw!1173
2021-09-19 19:23:30 +00:00
psi29a
18f5762a76
Merge branch 'master' into 'OpenCS-preserve-blocked'
...
# Conflicts:
# CHANGELOG.md
2021-09-18 15:20:26 +00:00
unelsson
70e210735a
Optimize terrain editing brush drawing performance
2021-09-18 15:57:00 +03:00
Pi03k
4ff5a04e9b
Remove redundant qt-related cmake macros
2021-09-17 14:41:04 +02:00
psi29a
24d1c2b5fa
Merge branch 'recurse_directory_iterator' into 'master'
...
VFS manager refactoring
See merge request OpenMW/openmw!1218
2021-09-15 07:20:52 +00:00
Cédric Mocquillon
d4e26746a3
Use recurse subdirectory iterator to iterate over the VFS without exposing internal details
2021-09-14 18:09:54 +02:00
pi03k
e4eeb9cce9
Remove 'no relevant classes' moc warning
2021-09-14 11:20:18 +02:00
psi29a
0ab8a7ddd7
Merge branch 'create-objects-menu' into 'master'
...
OpenMW-CS: Usability changes to the drop-down menu when creating a new object.
See merge request OpenMW/openmw!1210
2021-09-12 14:15:11 +00:00
Lamoot
6e6214bc43
In OpenMW-CS, when creating a new object, sort the entries in the drop-down menu alphabetically. Also have the menu be tall enough to show all of them at once (without scroll bars).
2021-09-09 20:46:27 +02:00
elsid
6b7434ca69
Pass std::string_view instead of const std::string&
...
* Starting with Actor::getBodyPartMesh and ending with
Misc::StringUtils::ciEqual.
* Add tests for Misc::StringUtils::ciEqual.
2021-09-09 18:39:50 +02:00
elsid
b0f772af40
Define dependency to OSG plugins in one place
...
Each binary depending on components library requires OSG plugins to be linked.
Duplicating dependecies for each binary does not give benefits and brings
problems when new binary is added.
2021-09-06 22:44:52 +02:00
psi29a
6170971ea3
Merge branch 'bettermoveinstance' into 'master'
...
Set instance movement based on camera zoom
See merge request OpenMW/openmw!1186
2021-09-06 09:48:30 +00:00
elsid
a8c16071dc
Fix -Wreturn-local-addr warning
...
/home/elsid/dev/openmw/apps/opencs/model/world/actoradapter.cpp: In member function ‘const string& CSMWorld::ActorAdapter::ActorData::getPart(ESM::PartReferenceType) const’:
/home/elsid/dev/openmw/apps/opencs/model/world/actoradapter.cpp:142:20: error: returning reference to temporary [-Werror=return-local-addr]
142 | return "";
| ^~
2021-09-04 18:04:45 +02:00
jvoisin
d4e3575f1d
Don't use const for objects returned by value.
...
This prevents the usage of std::move semantics,
and makes clang-tidy sad.
2021-09-01 22:23:50 +02:00
unelsson
f876ff2c14
Clear temporary movement data at the end of the drag
2021-09-01 02:04:04 +03:00
unelsson
53d315c862
XYZ-locking, mouse wheel move fix
2021-09-01 02:04:04 +03:00
unelsson
23fe3d74ab
Use floats, not doubles
2021-09-01 02:04:04 +03:00
unelsson
840e7615f5
Store object origins and move difference
2021-09-01 02:04:04 +03:00
unelsson
0d511da615
Test of basic mouse-plane use
2021-09-01 02:04:04 +03:00
jvoisin
deb2af6acc
Dont copy-construct from a const-ref when used only as a const-ref
...
This also makes clang-tiny a bit happier
2021-08-29 20:22:34 +02:00
cc9cii
0a5571f19e
Disable editing for blocked records in both table and dialogue edit widget.
2021-08-29 15:27:59 +10:00
cc9cii
b0d5ca386d
Update original cell column and do not modify the refnum when moving a reference to another cell with 3D editing.
2021-08-28 16:12:40 +10:00
cc9cii
2eb210f31a
Partially undo commit 71be4cdd20 so that moved references retain the original refnum. This is consistent with vanilla CS's behaviour.
2021-08-28 16:12:40 +10:00
cc9cii
b2bd97f283
A different implementation to MR 1051 to fix Issue #6067 .
...
This MR doesn't delete the original record, but instead the original record is updated with the moved record when loading.
Issue #4752 is no longer addressed in this MR.
2021-08-28 14:09:55 +10:00
cc9cii
7264a10c07
Partially revert commit dab1a9e7fb
2021-08-28 09:49:45 +10:00
cc9cii
7227a83e60
Preserve "blocked" record flags when saving with OpenCS. This will help outputs of OpenCS to be used with vanilla Morrowind.
...
Sample use case: users are using the Morrowind Code Patch feature that allows modders to enable this flag to differentiate editor-made potions from player crafted potions for tooltips.
2021-08-28 09:42:54 +10:00
psi29a
66f028c4a1
Merge branch 'correctcommandimplementation' into 'master'
...
Don't do storage in constructors of the commands
See merge request OpenMW/openmw!1126
2021-08-27 07:30:45 +00:00
psi29a
fff35dcb03
Merge branch 'Ignore-empty-pgrd' into 'master'
...
Do not store empty PGRD records. Should resolve Issue #6209 .
See merge request OpenMW/openmw!1121
2021-08-26 14:29:49 +00:00
unelsson
de3497d291
Fix undo-redo crash
2021-08-22 23:42:27 +03:00
unelsson
890ce1eefb
Reverse action order for redo and undo
2021-08-22 23:42:27 +03:00
unelsson
0cfabd6f3b
Move mapToSource back to constructor
2021-08-22 23:42:27 +03:00
unelsson
b2fe591590
Don't do any storing in the constructor
2021-08-22 23:42:27 +03:00
unelsson
45549da0f5
For most commands, set mOld in redo, not in constructor
2021-08-22 23:42:27 +03:00
psi29a
716eebe616
Merge branch 'terrainselectioncrashfix' into 'openmw-47'
...
Fix terrain selection crash
See merge request OpenMW/openmw!1165
(cherry picked from commit ec4e3b04a7b84e41bdd62ddc00cb42b5284b14818008f7c73e
2021-08-22 19:22:54 +00:00
psi29a
d09c807a40
Merge branch 'fixbadcast' into 'master'
...
Fix std::bad_cast
Closes #6217
See merge request OpenMW/openmw!1130
2021-08-20 20:36:44 +00:00
unelsson
7801f42005
Don't do mapToSource at executeModify
2021-08-20 22:32:41 +03:00
elsid
e9b8933b2f
Do no link binaries with Qt where it's not used
...
Define components_qt static library with all qt dependent components that also
depends on other components. Link only cs, wizard and launcher with qt
dependent components.
2021-08-20 19:02:09 +02:00
cc9cii
bd3ef506cd
Empty Pathgrid record is considered as the modder's intention to delete any existing record.
2021-08-19 19:30:01 +10:00
unelsson
298db2ef76
Initialize and check pointer.
2021-08-12 22:31:37 +03:00
unelsson
f1d05a93bf
Get index and model from proxy
2021-08-12 22:28:16 +03:00
psi29a
b770373491
Merge branch 'OpenCS-enforce-str-length' into 'master'
...
OpenCS - Disallow entry of strings longer than the lengths allowed by the file format (#3066 )
See merge request OpenMW/openmw!1088
2021-08-06 21:08:09 +00:00
glassmancody.info
09e03fde2e
refactor and fix wobbly shores
2021-08-04 17:49:57 -07:00
glassmancody.info
70fac33940
initial reverse-z depth implementation
2021-08-04 17:39:11 -07:00
cc9cii
8aee84c46e
Disallow entry of strings longer than the lengths allowed by the file format.
...
It is possible to allow longer strings but that will require an extension in the omwaddon format as well as changes to the reader to handle that extension. Such changes should be a separate MR.
(applied the patch in https://gitlab.com/OpenMW/openmw/-/issues/3066 )
2021-08-04 09:39:18 +10:00
psi29a
9fa7521fc5
Merge branch 'OpenCS-no-charconv' into 'master'
...
OpenCS - Avoid the inclusion of charconv header
See merge request OpenMW/openmw!1087
2021-08-03 23:32:40 +00:00
psi29a
9b7e14ec00
Merge branch 'OpenCS-moved-reference' into 'master'
...
OpenCS - Fix moved reference - Issues #3514 and #4752
See merge request OpenMW/openmw!1051
(cherry picked from commit 2bee171c7990522da33c2667f7d079fa35f4ede0)
36c30f7f Fix for Issue #3514 where moving a reference to another cell is not handled properly.
40327681 Update the changelog.
2021-08-03 23:29:05 +00:00
cc9cii
bf06898a79
Retain the use of std::string_view in the function signature.
2021-08-04 08:23:22 +10:00
cc9cii
99e691fbe3
Avoid the inclusion of <charconv> header due to Ubuntu Bionic (18.04) which as gcc version less than 8.1
...
Partially reverts commit fd67ebde25
2021-08-04 06:47:14 +10:00
unelsson
09ee2a0a36
fix texture brush index search
2021-08-01 19:42:41 +03:00
psi29a
4b48e62b64
Merge branch 'fixandclean' into 'master'
...
Fix opencs build and remove some clang warnings
See merge request OpenMW/openmw!1078
2021-08-01 12:11:17 +00:00
fredzio
1391194152
Remove unneeded return statement
2021-08-01 13:14:32 +02:00
fredzio
9ba459662d
Remove unneeded std::move
...
[19/199] Building CXX object apps/opencs/CMakeFiles/openmw-cs.dir/model/world/commands.cpp.o
../../../apps/opencs/model/world/commands.cpp:298:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
mOld = std::move(model.getRecord (id).clone());
^
../../../apps/opencs/model/world/commands.cpp:298:12: note: remove std::move call here
mOld = std::move(model.getRecord (id).clone());
^~~~~~~~~~ ~
../../../apps/opencs/model/world/commands.cpp:333:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
mOld = std::move(model.getRecord (id).clone());
^
../../../apps/opencs/model/world/commands.cpp:333:12: note: remove std::move call here
mOld = std::move(model.getRecord (id).clone());
^~~~~~~~~~ ~
2 warnings generated.
2021-08-01 13:14:32 +02:00
fredzio
36e33b0cf2
Add missing override
2021-08-01 13:14:32 +02:00
fredzio
bede1ea1ec
Fix build
2021-08-01 13:14:32 +02:00
psi29a
15d278de55
Merge branch 'opt-out-compose' into 'master'
...
Make it possible to opt out of composing variables
Closes #6186
See merge request OpenMW/openmw!1076
2021-08-01 08:53:52 +00:00
cc9cii
67cad2c515
Fix CSMWorld::InfoCollection::getTopicRange() returning one too many.
2021-08-01 15:53:00 +10:00
AnyOldName3
4727ae4b3b
Make it possible to opt out of composing variables
2021-08-01 02:47:10 +01:00
psi29a
141095b850
Merge branch 'OpenCS-loading-opt' into 'master'
...
OpenCS loading time improvements
See merge request OpenMW/openmw!1044
2021-07-31 21:27:29 +00:00
cc9cii
33dcd7585a
OpenCS - Jump To Modified
2021-07-24 20:00:25 +00:00
cc9cii
3e466699c8
A better way to plug a potential memory leak in the event of an exception during push_back().
2021-07-24 21:23:03 +10:00
cc9cii
fd67ebde25
Changes based on review comments, including:
...
* replace murmurhash with std::unordered_map
* plug potential leak from unique_ptr release
* replacing some sections with cleaner code
2021-07-24 09:17:48 +10:00
cc9cii
ee3361a118
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."
(copied the changes from commit SHA-1: 77394fce99
2021-07-23 23:18:11 +10:00
cc9cii
725d689e8a
Call push_back() if inserting to the end of the vector. It seems MSVC may be generating different code compared to insert().
...
(copied the changes from commit SHA-1: 257126ed69
2021-07-23 23:17:16 +10:00
cc9cii
44a333b6db
Don't attempt to open files yet to be created.
2021-07-23 21:25:35 +10:00
cc9cii
5c504e4d22
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
(copied the changes from commit SHA-1: 86945d1912
2021-07-23 19:07:56 +10:00
cc9cii
10c6304a1f
Fix typo from commit cfdbd0d471.
2021-07-23 18:12:09 +10:00
cc9cii
fc2f68a465
Change the loader's top progress bar to show total number of records processed rather than the number of files.
...
(copied the changes from commit SHA-1: ff072441fd
2021-07-23 17:34:27 +10:00
cc9cii
5fffcab94f
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
(copied the changes from commit SHA-1: 06f9922822
2021-07-23 16:05:58 +10:00
cc9cii
66bda84240
Convert RefNum index map to use find().
...
(copied the changes from commits 68e16b6cee0de223c63761a4a0807b
2021-07-23 15:30:33 +10:00
cc9cii
be45092e55
Use std::unique_ptr to store records in collections, RefidCollection and RefIdData.
...
(copied the changes from commit 23e7e3c165
2021-07-23 14:21:21 +10:00
elsid
cfdbd0d471
Indicate moved cell refs explicitly
...
This is less error prone approach than use of MovedCellRef fields.
Also make separate functions for skipping and reading moved cell refs to avoid
passing special flags logic and null pointers for unused arguments.
2021-07-12 18:56:42 +02:00
psi29a
126cf40848
Merge branch 'filter' into 'master'
...
Add a default filter to CS tables
See merge request OpenMW/openmw!958
2021-07-06 14:16:45 +00:00
cc9cii
ae4ddd810f
More dead code removal.
2021-07-06 14:45:45 +10:00
cc9cii
ec457a09c3
Fix Npc edit widget index out of bounds due to a removed column.
2021-07-06 13:45:58 +10:00
cc9cii
f68c81e631
Merge branch 'master' into 'OpenCS_Bug6017'
2021-07-06 03:10:46 +00:00
cc9cii
4b3de46bfa
Use enums in place of magic numbers. Ensure Creature and NPC cell references are always saved as persistent.
2021-07-06 12:37:02 +10:00
elsid
7498a86abe
Remove redundant semicolons
2021-07-05 13:11:54 +02:00
cc9cii
42bcbe34de
Cell references that teleport (Doors) should be placed in the "persistent" group when saving.
2021-07-04 16:18:47 +10:00
psi29a
07c3ed16d0
Merge branch 'base64-fixes' into 'master'
...
Base64 fixes
Closes #6111
See merge request OpenMW/openmw!965
2021-07-02 06:27:17 +00:00
cc9cii
2d8dd9be32
Fix using incorrect id to search for record flags. Eliminate inefficient double-loop in saving cell references.
2021-06-30 10:46:51 +10:00
cc9cii
47ef98ca1b
Clean up RefIdData code for better legibility.
2021-06-30 10:09:56 +10:00
cc9cii
f2a301653c
Remove redundant mPersistent member from ESM::NPC and ESM::Creature, replaced by mRecordFlags. Fixed the editing of the persistence flag value.
2021-06-30 08:20:29 +10:00
cc9cii
2a76634f5f
Moved persistence flag from references to the header flags of referenceables (e.g. Static, Weapon, etc). Editing widget is not fully working.
2021-06-29 23:25:26 +10:00
cc9cii
f6eab52a1b
Added "Persistent" column to references table.
2021-06-29 19:45:02 +10:00
cc9cii
024ad3276b
Partial fix for #6017 . The persistence flag of the references are saved but it is not yet possible to modify it via OpenCS.
2021-06-29 19:20:01 +10:00
elsid
8d2cdedc87
Show number of pathgrid node in a tooltip
...
To allow users faster understand what node it is.
2021-06-28 00:34:49 +02:00
AnyOldName3
d38126ef1c
Pack default CS config
...
*Technically* it was already being loaded as if it were packed, but it
made no difference because it's supposed to be empty.
2021-06-26 20:00:25 +01:00
Alexey Sokolov
ec576b36f1
Add a default filter to CS tables
...
This fixes the single most annoying issue of OpenMW-CS: inability for
users to filter records in the table if they don't happen to know by
heart the syntax of the very powerful filter engine. Because simply
typing the text into the search field did not work. Now, existence of .*
suggests that regex is used, and users still can replace the text with a
custom filter if they wish.
2021-06-25 11:45:43 +01:00
Evil Eye
7377568f01
Merge branch 'modernize_use_override_openmw_cs' into 'master'
...
Using override keyword in OpenMW CS
See merge request OpenMW/openmw!888
2021-06-22 18:04:40 +00:00
Alexey Sokolov
3e4340338f
Update IRC links to libera
...
In README, in OpenCS about dialog, in Travis notification
2021-05-31 21:15:26 +01:00
Thunderforge
945f1aad20
Using override keyword in OpenMW CS
...
Detected by clang-tidy's modernize-use-override
2021-05-18 19:53:55 -05:00
Atahualpa
3a1243a5d0
Rebased branch, reduced code duplication, added comments, adjusted formatting.
2021-05-18 17:53:00 +02:00
Atahualpa
ca80aeaaea
Fix vertex calculation for cell-border drawing.
2021-05-18 15:05:26 +02:00
Atahualpa
356efa15a2
Fixes #6035 (circle brush selects outside of circle) and #6036 (some corner vertices not selected).
2021-05-18 15:04:01 +02:00
Atahualpa
7be891b440
Directly use Geometry instead of Geode; fix for loop; add size_t type-cast.
2021-05-18 14:56:03 +02:00
Atahualpa
73949d5bd0
Updating the CMake file isn't a bad idea either...
2021-05-18 14:56:03 +02:00
Atahualpa
6c49074765
Remove old references to Cell class.
2021-05-18 14:56:03 +02:00
Atahualpa
008bf64dd9
Second step toward fixing terrain selection issues.
2021-05-18 14:56:03 +02:00
Atahualpa
18ea4d8eb2
First step toward fixing terrain selection issues.
2021-05-18 14:56:02 +02:00
elsid
f2188d2533
Reduce temporary allocations on ESM loading
...
By moving objects instead of copying when possible.
2021-05-15 18:45:21 +02:00
Bret Curtis
66a527c3de
Merge pull request #3075 from akortunov/warnfix
...
Fix MSVC's C4244 and C4267 warnings
2021-05-14 21:28:56 +02:00
psi29a
3944648f0b
Merge branch 'opencs_remove_inclde' into 'master'
...
Remove some superfluous includes in the opencs
See merge request OpenMW/openmw!829
2021-05-14 13:33:06 +00:00
jvoisin
06ae26037f
Remove some superfluous includes in the opencs
2021-05-14 10:57:31 +02:00
Andrei Kortunov
f9d42ed396
Fix MSVC's C4267 warnings
2021-05-12 10:34:39 +04:00
Thunderforge
339d347aea
Fixing performance-faster-string-find issues
...
This addresses the Clang Tidy check [performance-faster-string-find](https://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html ).
2021-05-10 22:44:07 -05:00
Andrei Kortunov
2d869ca9ff
Fix node masks signed/unsigned mismatch
2021-04-20 10:52:51 +04:00
Andrei Kortunov
9647b670e4
Do not declare unused variables
2021-04-19 15:43:00 +04:00
Andrei Kortunov
0cadc97fb3
Fix double -> float conversions
2021-04-19 15:36:58 +04:00
Bret Curtis
befa3f587f
Merge pull request #3068 from akortunov/master
...
Clean up MSVC warnings
2021-04-19 09:27:17 +02:00
psi29a
3423d3f882
Merge branch 'various_warn' into 'master'
...
Fix various warnings found by clang
See merge request OpenMW/openmw!758
2021-04-18 20:04:20 +00:00
jvoisin
38316cdaf8
Fix various warnings found by clang
...
- unused alias
- inefficient use of push_back
- exceptions not inheriting from std::exception
- weird use of a comma
- value compared against itself
2021-04-17 19:06:33 +02:00
Andrei Kortunov
f308dde254
Clean up MSVC warnings
2021-04-17 12:14:50 +04:00
unelsson
06fda4c5a1
QLineEdit for setting base animation files
2021-04-16 23:12:14 +03:00
unelsson
95272e0f14
String setting to CSMPrefs, part of dehardcoding animation files
2021-04-16 23:12:14 +03:00
Andrei Kortunov
016a1d45df
Remove outdated field - remnant from earlier implementation
2021-04-14 10:58:44 +04:00
glassmancody.info
582f7b52cf
Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up
2021-04-13 11:09:52 -07:00
glassmancody.info
4ba473b684
Finalize settings, torch fix
2021-04-13 11:09:49 -07:00
glassmancody.info
690995988b
More formatting, OpenCS cells are unbroken
2021-04-13 11:09:35 -07:00
glassmancody.info
7370acdf54
Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up
2021-04-13 11:09:19 -07:00
glassmancody.info
43ac32921c
Rewrite, support different lighting methods
2021-04-13 11:09:19 -07:00
glassmancody.info
9d9074c244
Add shared UBO
2021-04-13 11:07:48 -07:00
glassmancody.info
c5ea966f24
Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up
2021-04-13 11:06:16 -07:00
glassmancody.info
dda735c54a
initial commit
2021-04-13 11:06:16 -07:00
Andrei Kortunov
124a33d8a3
Fix uninitialized variables
2021-04-10 10:58:00 +04:00
Petr Mikheev
7bbbe40abe
"static const" -> "static constexpr" in headers
2021-03-21 13:57:54 +01:00
Gleb Mazovetskiy
455be9dbbb
Fix linking with -DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON
...
1. CMake's built-in OSG finder does not use pkgconfig, so we have to
manually ensure the order is correct for inter-library dependencies.
https://gitlab.kitware.com/cmake/cmake/-/issues/21701
2. OSG plugin pkgconfig files are missing dependencies on the underlying
libraries (e.g. freetype, png, jpeg), so we have to link them manually.
https://github.com/openscenegraph/OpenSceneGraph/issues/1052
2021-03-06 21:17:52 +00:00
Gleb Mazovetskiy
13c5b1b0c5
CMake: Fix support for OSG static lib paths
...
`$<TARGET_FILE:...>` fails if the argument is already a path (instead of
a library name). This happens when a static library is found via
`osg_find_library`.
If the argument contains `/` or `.`, do not use `$<TARGET_FILE:...>`
2021-02-26 10:48:09 +00:00
psi29a
5c0214142b
Merge branch 'static-build' into 'master'
...
Optional local source builds of OSG, MyGUI, Bullet
See merge request OpenMW/openmw!547
2021-02-19 16:58:05 +00:00
uramer
ee2f0e7eb3
Fix inconsistent argument name
2021-01-28 23:47:38 +01:00
uramer
eca0d8b7ea
Fix typo in DropMode enum
2021-01-28 22:40:44 +01:00
uramer
edc6d5c3e7
Fix a typo in separate drop binds
2021-01-28 22:22:48 +01:00
uramer
36cd818155
Fix separate drop, refactor for code reuse
2021-01-28 22:10:33 +01:00
Gleb Mazovetskiy
8737453498
cmake: Compiler-specific whole-archive macro
2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
99ba45a308
Optional static builds of OSG, MyGUI, Bullet
2021-01-26 19:00:55 +00:00
psi29a
a8c5607aa6
Merge branch 'disableinfotablesorting' into 'master'
...
[OpenMW-CS] Info table dragging to move record order, disable sorting
See merge request OpenMW/openmw!538
2021-01-25 12:51:13 +00:00
Nelsson Huotari
9f0f3eaeb2
Add collada to supported formats
2021-01-18 19:22:01 +02:00
Nelsson Huotari
54ea8eb5c7
Fix string corruption with Qt on linux-systems
2021-01-18 19:21:02 +02:00
Nelsson Huotari
f2fc02cdff
Support filtered tables (mapToSource for indexes)
2021-01-13 15:55:16 +02:00
Nelsson Huotari
16e03c151a
Implement basic move algorithm, connect it to drag&drop
2021-01-13 15:38:29 +02:00
Nelsson Huotari
70087e16fe
Disable dialogue info table sorting
2021-01-11 20:49:35 +02:00
psi29a
acfd2cfd90
Merge branch 'dialogclonefix' into 'master'
...
[OpenMW-CS] Fix cloning in info records
See merge request OpenMW/openmw!524
2021-01-11 14:13:53 +00:00
Nelsson Huotari
93b1b444f2
Optimize CreateCommand and CloneCommand configuration
2021-01-11 12:53:34 +02:00
Nelsson Huotari
7196ad7455
Implement an override-value when cloning, use when cloning info records
2021-01-10 21:23:52 +02:00
Bret Curtis
a735bbe9a5
Merge pull request #3040 from akortunov/pvs
...
Fix some issues, found by PVS Studio
2021-01-10 12:58:17 +01:00
Nelsson Huotari
3045d20a97
Make sure that vector isn't empty, just in case
2021-01-10 01:25:40 +02:00
Nelsson Huotari
5f1d3e0e2f
Use the Topic ID of the cloned target from topicinfos
2021-01-10 01:06:23 +02:00
Nelsson Huotari
313e895912
[OpenMW-CS] Cube and sphere instance selection
2021-01-09 21:35:07 +00:00
Andrei Kortunov
ad101de733
Merge declaration and initialization
2021-01-09 22:58:54 +04:00
Andrei Kortunov
1930f8f37d
Fix copy-paste error
2021-01-09 20:03:12 +04:00
Andrei Kortunov
50e4600b16
Reduce code duplication
2021-01-09 20:00:51 +04:00
Andrei Kortunov
8e5f26c109
Code cleanup
2021-01-09 14:41:10 +04:00
Andrei Kortunov
c9b885ffd4
Avoid possible null dereferencing
2021-01-09 14:24:04 +04:00
Andrei Kortunov
8283ec6cad
Do not use & for boolean arguments
2021-01-09 14:03:48 +04:00
Andrei Kortunov
7fc4c9f3f6
Avoid dead code
2021-01-09 13:52:01 +04:00
