David Cernat
cedf70f367
Add OpenMW commits up to 13 Apr 2021
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/summoning.cpp
# apps/openmw/mwphysics/mtphysics.hpp
2021-04-13 23:52:37 +02: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
David Cernat
59cb31e0a7
Add OpenMW commits up to 20 Mar 2021
...
# Conflicts:
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/aipursue.cpp
# components/CMakeLists.txt
2021-03-20 16:44:11 +02: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
David Cernat
39dc6fc355
Add OpenMW commits up to 24 Feb 2021
...
# Conflicts:
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# components/CMakeLists.txt
2021-02-24 13:02:57 +02: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
David Cernat
e1259fdc41
Add OpenMW commits up to 4 Feb 2021
...
# Conflicts:
# apps/openmw/engine.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwrender/globalmap.cpp
2021-02-05 02:16:03 +02: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
Andrei Kortunov
801e2d6ad0
Avoid to use uninitialized variables
2021-01-09 13:36:40 +04:00
David Cernat
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
2021-01-05 07:25:31 +02:00
Alexei Dobrohotov
32601e0ae4
Properly reserve body parts for skirts (bug #5731 )
2020-12-11 10:39:57 +03:00
Coleman Smith
3b9db41346
removing unneeded variable
2020-12-10 17:03:10 -08:00
Coleman Smith
842ea9d6ed
simplifying a bit
...
- attaching gradient camera directly to the main camera
- using Vec4ub
2020-12-10 21:36:46 +00:00
Nelsson Huotari
61a4a0807b
Load master index in refId to mContentFile, keep master index also in mIndex
2020-12-09 00:10:58 +02:00
David Cernat
4620adc662
Add OpenMW commits up to 30 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwphysics/actor.cpp
2020-12-01 01:15:39 +02:00
Nelsson Huotari
b0e3bd6ff9
Fix crash caused by QStatusBar
2020-11-29 23:25:34 +02:00
Andrei Kortunov
8084a336b5
Replace zeroes and nulls by nullptrs
2020-11-29 11:14:07 +04:00
David Cernat
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
2020-11-01 23:17:59 +02:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
...
Use emplace_back instead of push_back
2020-11-01 01:58:56 +03:00
psi29a
957a1425d1
Merge branch 'cleanup_1' into 'master'
...
Cleanup 1
See merge request OpenMW/openmw!365
2020-10-24 18:43:03 +00:00
Bret Curtis
259f7fcf12
Merge pull request #3020 from unelsson/strippluginindex_cs
...
Strip the plugin index when looking for deleted refs.
2020-10-23 21:51:53 +02:00
Nelsson Huotari
b1ea9f6a5b
Strip the plugin index from refid completely
2020-10-23 20:21:34 +03:00
AnyOldName3
538314b03a
Make path settings have path type
2020-10-23 15:34:41 +01:00
