psi29a
04fcfcc79d
Merge branch 'master' into 'bigpeepeventsenergy'
...
# Conflicts:
# components/sdlutil/sdlinputwrapper.cpp
2022-08-01 07:55:51 +00:00
Alexei Kotov
f9fdcfe4a7
Prevent mouse movement events from being queued in loading screens (bug #4374 )
2022-08-01 06:54:36 +03:00
Alexei Kotov
bb2fa1cbfa
Break SDL_PeepEvents loop on error (bug #6890 )
2022-08-01 06:24:45 +03:00
psi29a
9ba3ab2be9
Merge branch 'post_fog' into 'master'
...
[Postprocessing] API to work with fog
See merge request OpenMW/openmw!2212
2022-07-31 17:33:08 +00:00
Andrei Kortunov
5bfca57835
Add a way to check if water is enabled in post processing shaders
2022-07-31 10:33:18 +04:00
Andrei Kortunov
888f4d2ac1
Add a post processing API to work with fog
2022-07-30 21:44:18 +04:00
elsid
8b8e4f78b6
Support cylinder and rotating box collision shape types for actors
...
Cylinder collision shape should give the best consistency between physics
simulation and pathfinding. Rotating box is already used by some actors, so
add it to have the same collision shape type for all actors.
2022-07-30 14:28:21 +02:00
psi29a
c54822acf9
Merge branch 'locale_menu' into 'master'
...
Add a way to configure locale settings in-game
See merge request OpenMW/openmw!2179
2022-07-28 07:23:55 +00:00
elsid
8cecc55d64
Fix inserting texture to map
...
Avoid using invalidated iterator after erase call.
Use insert_or_assing instead of operator[] because OSGTexture doesn't have a
default constructor.
2022-07-27 20:01:13 +02:00
psi29a
2964e0d4fd
Merge branch 'font_cleanup' into 'master'
...
Remove code which became redundant due to changes in way how we load bitmap fonts
See merge request OpenMW/openmw!2190
2022-07-27 09:28:30 +00:00
Andrei Kortunov
8ff64ca176
Add a default way to store arrays in the settings.cfg
2022-07-27 13:03:34 +04:00
Andrei Kortunov
a787625c65
Remove code which became redundant due to changes in way how we load bitmap fonts
2022-07-27 12:15:07 +04:00
Evil Eye
55134d1e31
Use string_view in the CharacterController
2022-07-26 17:23:00 +02:00
psi29a
17a0063a7c
Merge branch 'async_delete_animation' into 'master'
...
Destruct animation asynchronously when unloading a cell
See merge request OpenMW/openmw!2177
2022-07-26 13:42:43 +00:00
psi29a
bbcf7809f0
Merge branch 'gui_cleanup' into 'master'
...
GUI cleanup
See merge request OpenMW/openmw!2169
2022-07-26 13:39:33 +00:00
elsid
d165966bea
Make OSGTexture final
...
To show that there are no more inheritance levels and also help compiler to
better optimize virtual function calls. There is no need to access virtual table
when compiler calls a virtual function of a final type.
2022-07-26 12:33:31 +02:00
elsid
5f800279ac
Remove unused Gui::FontLoader::mTextures
2022-07-26 12:33:27 +02:00
elsid
0614b82452
Restore UnrefQueue to destruct animation asynchronously
2022-07-24 21:08:43 +02:00
Andrei Kortunov
e0c05a15fb
Post processing shaders localization
2022-07-24 13:18:50 +00:00
psi29a
ad687c380a
Merge branch 'nif' into 'master'
...
Move NIF implementation to cpp files
Closes #6518
See merge request OpenMW/openmw!2170
2022-07-21 16:09:33 +00:00
Andrei Kortunov
c36c28e8f9
Move NIF implementation to cpp files
2022-07-21 15:54:52 +04:00
Petr Mikheev
643e33c11a
Merge branch 'lua_pathfinding_bindings' into 'master'
...
Add bindings for navigator utils functions (#6690 )
See merge request OpenMW/openmw!2128
2022-07-20 23:52:16 +00:00
elsid
27cc901e76
Add bindings for navigator utils functions
2022-07-21 00:04:26 +02:00
elsid
036937ee02
Store RenderManager textures by value
2022-07-20 22:49:46 +02:00
elsid
6738722aa5
Initialize all required osgMyGUI::DataManager members in constructor
2022-07-20 22:49:46 +02:00
elsid
1c507125df
Remove empty functions
2022-07-20 22:49:46 +02:00
elsid
d307178683
Replace components/vfs/manager.hpp include by forward declaration
2022-07-20 22:49:46 +02:00
elsid
a281bcaf90
Remove redundant Platform::initialize function
2022-07-20 22:49:44 +02:00
elsid
c0e1642d7f
Use unique_ptr for osgMyGUI::Platform members
2022-07-20 21:49:33 +02:00
Andrei Kortunov
de58c9dff3
Get rid of obsolete osg::Geode where it is possible
2022-07-20 15:28:56 +04:00
Andrei Kortunov
168a097c8b
Improve binding VFS to MyGUI
2022-07-20 08:06:57 +04:00
psi29a
3b75ae7ff1
Merge branch 'terrain-include-cleanup' into 'master'
...
Cleanup includes in Terrain component
See merge request OpenMW/openmw!2157
2022-07-19 14:42:43 +00:00
Matt
c6bc264b35
Use correct assertion for the file implementation
2022-07-19 13:48:57 +00:00
psi29a
4a15fae588
Merge branch 'fix-fileclose' into 'master'
...
Use ScopedHandle for File::Handle
See merge request OpenMW/openmw!2159
2022-07-19 10:05:07 +00:00
ζeh Matt
8f7ec42c09
Close handle if valid for move assignment
2022-07-18 23:11:09 +03:00
Andrei Kortunov
4e7fe5a8bd
Set VFS only once
2022-07-18 23:37:41 +04:00
ζeh Matt
8a724eb772
Delete assignment and copy constructor
2022-07-18 22:28:35 +03:00
ζeh Matt
3c8ef8463c
Close only valid handles
2022-07-18 21:44:03 +03:00
Petr Mikheev
e222afc764
Merge branch 'fwd-lua-vfs' into 'master'
...
Type forward VFS::Manager in luastate.hpp and l10n.hpp
See merge request OpenMW/openmw!2158
2022-07-18 18:23:02 +00:00
ζeh Matt
2014ea40b9
Use ScopedHandle for File::Handle
2022-07-18 21:13:41 +03:00
psi29a
40cab76de5
Merge branch 'fonts' into 'master'
...
Enhance a way to setup fonts and layout files
See merge request OpenMW/openmw!2112
2022-07-18 17:36:31 +00:00
ζeh Matt
c5d85c1854
Revert removal of <atomic>
2022-07-18 19:40:26 +03:00
ζeh Matt
764d34362e
Type forward VFS::Manager in luastate.hpp and l10n.hpp
2022-07-18 19:36:41 +03:00
ζeh Matt
ddf43ec42f
Move structs into separate headers, cleanup includes, cleanup forwarders
2022-07-18 19:15:03 +03:00
ζeh Matt
ce556ba0cc
Remove obsolete LowLevelFile
2022-07-18 16:41:43 +03:00
Andrei Kortunov
845a812ebf
Drop fonts export - users are supposed to use TrueType fonts or mods with legacy format
2022-07-18 10:40:03 +04:00
Andrei Kortunov
5bc5c1bb0c
Use our fonts as a fallback
2022-07-18 09:57:20 +04:00
Andrei Kortunov
1f864e3127
Do not override monospace font
2022-07-18 00:04:43 +04:00
Andrei Kortunov
dc0d6fe31d
Avoid code duplication
2022-07-17 23:59:35 +04:00
Andrei Kortunov
facdc8fc0d
Use string_view
2022-07-17 22:13:27 +04:00
Andrei Kortunov
d83382d236
Rework Profiler to work with VFS
2022-07-17 22:01:48 +04:00
Andrei Kortunov
59c4ea014d
Rework StatsHandler to support VFS
2022-07-17 22:01:48 +04:00
Andrei Kortunov
6f6b5ba04b
Some refactoring
2022-07-17 22:01:48 +04:00
Andrei Kortunov
db686b25c2
Use fallback data from openmw.cfg to setup fonts
2022-07-17 22:01:48 +04:00
Andrei Kortunov
8513bc9620
Fix build error on MSVC
2022-07-17 22:01:48 +04:00
Andrei Kortunov
8fc3635c2c
Use case-insensitive font keys, remove debug code
2022-07-17 22:01:48 +04:00
Andrei Kortunov
c47a48e25d
Inject layout files to VFS
2022-07-17 22:01:48 +04:00
Andrei Kortunov
2630bc21dd
Allow to override MyGUI layout
2022-07-17 22:01:48 +04:00
Andrei Kortunov
4ddba5142e
Introduce font mappings
2022-07-17 22:01:48 +04:00
Andrei Kortunov
dd04bfccfb
Load fonts
2022-07-17 22:01:48 +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
7c442926f8
Merge branch 'platform-file' into 'master'
...
Move platform specific file code into platform and cleanup LowLevelFile
See merge request OpenMW/openmw!2143
2022-07-17 16:44:13 +00:00
psi29a
b032a643f9
Merge branch 'vfs_string_view' into 'master'
...
Use std::string_view in VFS::Manager
See merge request OpenMW/openmw!2148
2022-07-17 15:50:29 +00:00
psi29a
6cc3ec12db
Merge branch 'ci-werror' into 'master'
...
Windows, MSVC: Enable warnings as errors on CI
See merge request OpenMW/openmw!2146
2022-07-17 15:49:51 +00:00
ζeh Matt
03302a8f5b
Conditionally build cpp for platform, remove obsolete header
2022-07-17 18:40:27 +03:00
elsid
0e12d331f9
Simplify iteration over Bone::mChildren
2022-07-17 13:52:24 +02:00
elsid
e4f599575e
Use unique_ptr to manage Bone lifetime
2022-07-17 13:34:45 +02:00
Petr Mikheev
38ee6d285d
Use std::string_view in VFS::Manager
2022-07-17 12:19:19 +02:00
elsid
6c8ed4d19c
Move Files::IStreamPtr alias to a separate header
...
To avoid transitive include of Windows.h all over the engine.
2022-07-17 11:35:39 +02:00
Project579
02ef9c953e
MSVC: Fix all warnings at level 4, upgrade Qt5 to 5.15.2 to also reduce warnings, disabled 5054 warnings due to Qt5's use of deprecated operators in C++20 .
2022-07-17 11:23:12 +02:00
ζeh Matt
3d5f898920
Cleanup and fixes
2022-07-16 21:18:57 +03:00
ζeh Matt
1b70ff775d
Move platform specific file code into platform and cleanup LowLevelFile
2022-07-16 20:40:42 +03:00
elsid
9398e97600
Avoid manual memory management for VFS archives
2022-07-16 15:30:14 +02:00
jvoisin
2ef2e93a46
Merge branch 'collection-lowercase' into 'master'
...
Makes key inside Collection::getCollection use lowercase
Closes #6483
See merge request OpenMW/openmw!2135
2022-07-14 20:39:27 +00:00
ζeh Matt
92e209c62a
Simplify getIsHungAppWindow
2022-07-14 22:02:01 +03:00
Matt
888d009a1e
Apply 1 suggestion(s) to 1 file(s)
2022-07-14 16:50:25 +00:00
Matt
32d50765ab
Apply 1 suggestion(s) to 1 file(s)
2022-07-14 16:50:15 +00:00
Igor Fedosov
68887e79a0
Makes key inside Collection::getCollection use lowercase
2022-07-14 17:02:35 +03:00
ζeh Matt
0d625abde0
Declare utf8ToUtf16 static
2022-07-14 16:47:27 +03:00
ζeh Matt
100e400fed
Dynamically obtain the function pointer to IsHungAppWindow
2022-07-14 16:46:31 +03:00
psi29a
80adcf3c88
Merge branch 'maybe_lock' into 'master'
...
Refactor Maybe*Locks
See merge request OpenMW/openmw!2126
2022-07-12 14:51:21 +00:00
Andrei Kortunov
d3da09878d
Drop line about non-existent UnrefQueue
2022-07-12 17:41:07 +04:00
elsid
22ed6d5c1e
Use unsigned to define number of threads
2022-07-12 15:19:52 +02:00
psi29a
54db3a97bb
Merge branch 'multiview-refactor' into 'master'
...
[Multiview] refactoring
See merge request OpenMW/openmw!2122
2022-07-12 08:44:43 +00:00
Petr Mikheev
9fbcc5df5e
Merge branch 'localization' into 'master'
...
Use Lua's YAML-based localization for MyGUI
See merge request OpenMW/openmw!2099
2022-07-12 08:13:33 +00:00
Andrei Kortunov
ccbb5e03fb
Use YAML files to translate MyGUI's localization tags
2022-07-12 08:20:40 +04:00
Mads Buvik Sandvei
b277fa48c7
Refactor multiview to avoid littering OSG_HAS_MULTIVIEW and multiview-related uniforms around the code, keep them all in multiview.cpp.
2022-07-11 17:27:05 +02:00
psi29a
aaaeed572a
Merge branch 'fix_6841' into 'master'
...
Treat empty `RootCollisionNode` in NIF as NC flag and generate VisualOnly collision shape
Closes #6841
See merge request OpenMW/openmw!2084
2022-07-11 08:31:59 +00:00
Petr Mikheev
8b8c304953
Treat empty RootCollisionNode in NIF as NCC flag and generate CameraOnly collision shape
2022-07-10 00:46:11 +02:00
Petr Mikheev
dc3ba3a75b
Fix #6862
2022-07-09 23:19:38 +02:00
elsid
9ac3bb753e
Move declaration private static member variables of LightManager to .cpp
...
There is no need to expose them to other translation units.
2022-07-08 17:21:01 +02:00
elsid
4211cf1c24
Use uniform indent and apply openmw naming policy
2022-07-08 17:14:13 +02:00
psi29a
510a9b9a5e
Merge branch 'navmeshtilescache_find' into 'master'
...
Avoid redundant copy when finding item in NavMeshTilesCache
See merge request OpenMW/openmw!2109
2022-07-06 13:48:24 +00:00
elsid
6fb7af3b63
Avoid redundant copy when finding item in NavMeshTilesCache
...
std::make_tuple returns a tuple for types with removed references which makes it
to copy arguments. std::tie leaves references.
2022-07-06 14:23:07 +02:00
elsid
b4f12aace1
Explicitly ignore result of std::unique_ptr::release call
...
components/nifbullet/bulletnifloader.cpp:206:13: warning: the value returned by this function should be used [bugprone-unused-return-value]
boxShape.release();
^~~~~~~~~~~~~~~~~~
components/nifbullet/bulletnifloader.cpp:232:13: warning: the value returned by this function should be used [bugprone-unused-return-value]
child.release();
^~~~~~~~~~~~~~~
components/nifbullet/bulletnifloader.cpp:233:13: warning: the value returned by this function should be used [bugprone-unused-return-value]
mStaticMesh.release();
^~~~~~~~~~~~~~~~~~~~~
components/nifbullet/bulletnifloader.cpp:240:9: warning: the value returned by this function should be used [bugprone-unused-return-value]
mStaticMesh.release();
^~~~~~~~~~~~~~~~~~~~~
components/nifbullet/bulletnifloader.cpp:246:9: warning: the value returned by this function should be used [bugprone-unused-return-value]
mAvoidStaticMesh.release();
^~~~~~~~~~~~~~~~~~~~~~~~~~
components/nifbullet/bulletnifloader.cpp:411:9: warning: the value returned by this function should be used [bugprone-unused-return-value]
childMesh.release();
^~~~~~~~~~~~~~~~~~~
components/nifbullet/bulletnifloader.cpp:425:9: warning: the value returned by this function should be used [bugprone-unused-return-value]
childShape.release();
^~~~~~~~~~~~~~~~~~~~
2022-07-06 13:52:29 +02:00
elsid
72bda2bd10
Avoid redundant initialization
...
components/nifbullet/bulletnifloader.cpp:79:24: warning: Value stored to 'a' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
unsigned short a = strip[0], b = strip[0], c = strip[1];
^ ~~~~~~~~
2022-07-06 13:52:28 +02:00
elsid
5b9ca3b979
Avoid possible division by zero
...
components/detournavigator/navmeshdb.cpp:183:43: warning: Division by zero [clang-analyzer-core.DivideZero]
setMaxPageCount(*mDb, maxFileSize / dbPageSize + static_cast<std::uint64_t>((maxFileSize % dbPageSize) != 0));
~~~~~~~~~~~~^~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:182:33: note: Calling 'getPageSize'
const auto dbPageSize = getPageSize(*mDb);
^~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:144:13: note: 'value' initialized to 0
std::uint64_t value = 0;
^~~~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:145:13: note: Calling 'request<DetourNavigator::(anonymous namespace)::GetPageSize, unsigned long *, >'
request(db, statement, &value, 1);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
components/sqlite3/request.hpp:254:64: note: Left side of '&&' is false
for (std::size_t i = 0; executeStep(db, statement) && i < max; ++i)
^
components/detournavigator/navmeshdb.cpp:145:13: note: Returning from 'request<DetourNavigator::(anonymous namespace)::GetPageSize, unsigned long *, >'
request(db, statement, &value, 1);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:146:13: note: Returning zero (loaded from 'value')
return value;
^~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:182:33: note: Returning from 'getPageSize'
const auto dbPageSize = getPageSize(*mDb);
^~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:182:9: note: 'dbPageSize' initialized to 0
const auto dbPageSize = getPageSize(*mDb);
^~~~~~~~~~~~~~~~~~~~~
components/detournavigator/navmeshdb.cpp:183:43: note: Division by zero
setMaxPageCount(*mDb, maxFileSize / dbPageSize + static_cast<std::uint64_t>((maxFileSize % dbPageSize) != 0));
~~~~~~~~~~~~^~~~~~~~~~~~
2022-07-06 13:52:28 +02:00
AnyOldName3
2bb28b5e27
Merge branch 'fix_typo' into 'master'
...
Fix particle flags typo (#6857 )
Closes #6857
See merge request OpenMW/openmw!2102
2022-07-05 19:31:37 +00:00
glassmancody.info
0954597fa7
fix typo with wrong flags in particle nifloader
2022-07-05 11:00:28 -07:00
Andrei Kortunov
38042fd7a2
Init missing variables
2022-07-05 17:47:52 +04:00
