59cb31e0a7
Add OpenMW commits up to 20 Mar 2021
...
# Conflicts:
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/aipursue.cpp
# components/CMakeLists.txt
4 years ago
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
4 years ago
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:...>`
4 years ago
39dc6fc355
Add OpenMW commits up to 24 Feb 2021
...
# Conflicts:
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# components/CMakeLists.txt
4 years ago
5c0214142b
Merge branch 'static-build' into 'master'
...
Optional local source builds of OSG, MyGUI, Bullet
See merge request OpenMW/openmw!547
4 years ago
e1259fdc41
Add OpenMW commits up to 4 Feb 2021
...
# Conflicts:
# apps/openmw/engine.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwrender/globalmap.cpp
4 years ago
ee2f0e7eb3
Fix inconsistent argument name
4 years ago
eca0d8b7ea
Fix typo in DropMode enum
4 years ago
edc6d5c3e7
Fix a typo in separate drop binds
4 years ago
36cd818155
Fix separate drop, refactor for code reuse
4 years ago
8737453498
cmake: Compiler-specific whole-archive macro
4 years ago
99ba45a308
Optional static builds of OSG, MyGUI, Bullet
4 years ago
a8c5607aa6
Merge branch 'disableinfotablesorting' into 'master'
...
[OpenMW-CS] Info table dragging to move record order, disable sorting
See merge request OpenMW/openmw!538
4 years ago
9f0f3eaeb2
Add collada to supported formats
4 years ago
54ea8eb5c7
Fix string corruption with Qt on linux-systems
4 years ago
f2fc02cdff
Support filtered tables (mapToSource for indexes)
4 years ago
16e03c151a
Implement basic move algorithm, connect it to drag&drop
4 years ago
70087e16fe
Disable dialogue info table sorting
4 years ago
acfd2cfd90
Merge branch 'dialogclonefix' into 'master'
...
[OpenMW-CS] Fix cloning in info records
See merge request OpenMW/openmw!524
4 years ago
93b1b444f2
Optimize CreateCommand and CloneCommand configuration
4 years ago
7196ad7455
Implement an override-value when cloning, use when cloning info records
4 years ago
a735bbe9a5
Merge pull request #3040 from akortunov/pvs
...
Fix some issues, found by PVS Studio
4 years ago
3045d20a97
Make sure that vector isn't empty, just in case
4 years ago
5f1d3e0e2f
Use the Topic ID of the cloned target from topicinfos
4 years ago
313e895912
[OpenMW-CS] Cube and sphere instance selection
4 years ago
ad101de733
Merge declaration and initialization
4 years ago
1930f8f37d
Fix copy-paste error
4 years ago
50e4600b16
Reduce code duplication
4 years ago
8e5f26c109
Code cleanup
4 years ago
c9b885ffd4
Avoid possible null dereferencing
4 years ago
8283ec6cad
Do not use & for boolean arguments
4 years ago
7fc4c9f3f6
Avoid dead code
4 years ago
801e2d6ad0
Avoid to use uninitialized variables
4 years ago
da3316daf8
Add OpenMW commits up to 4 Jan 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwphysics/mtphysics.hpp
# components/CMakeLists.txt
4 years ago
32601e0ae4
Properly reserve body parts for skirts (bug #5731 )
4 years ago
3b9db41346
removing unneeded variable
4 years ago
842ea9d6ed
simplifying a bit
...
- attaching gradient camera directly to the main camera
- using Vec4ub
4 years ago
61a4a0807b
Load master index in refId to mContentFile, keep master index also in mIndex
4 years ago
4620adc662
Add OpenMW commits up to 30 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwphysics/actor.cpp
4 years ago
b0e3bd6ff9
Fix crash caused by QStatusBar
4 years ago
8084a336b5
Replace zeroes and nulls by nullptrs
4 years ago
7f435ceeac
Add OpenMW commits up to 1 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwclass/container.hpp
# apps/openmw/mwclass/creature.hpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwdialogue/journalimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/dialogue.hpp
# apps/openmw/mwgui/mainmenu.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/interpretercontext.hpp
# components/CMakeLists.txt
4 years ago
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
...
Use emplace_back instead of push_back
4 years ago
957a1425d1
Merge branch 'cleanup_1' into 'master'
...
Cleanup 1
See merge request OpenMW/openmw!365
4 years ago
259f7fcf12
Merge pull request #3020 from unelsson/strippluginindex_cs
...
Strip the plugin index when looking for deleted refs.
4 years ago
b1ea9f6a5b
Strip the plugin index from refid completely
4 years ago
538314b03a
Make path settings have path type
4 years ago
5a824d0333
components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues
4 years ago
46a1950b0e
Do not use deprecated Qt functions
4 years ago
fb4250a2b7
Strip the plugin index when looking for deleted refs.
4 years ago
David Cernat
Gleb Mazovetskiy
psi29a
uramer
Nelsson Huotari
Andrei Kortunov
Alexei Dobrohotov
Coleman Smith
AnyOldName3