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
065ed5138e
Use emplace_back instead of push_back
4 years ago
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
68837aaf4a
Add OpenMW commits up to 15 Oct 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/mwgui/containeritemmodel.cpp
# apps/openmw/mwgui/tradewindow.cpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwworld/actionteleport.cpp
# apps/openmw/mwworld/containerstore.cpp
4 years ago
73708a6f2a
Install openmw-cs.cfg on single-config generators and from the right directory on multi-config
4 years ago
39e429c9eb
Add OpenMW commits up to 11 Jul 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
5 years ago
8f86617262
Merge branch 'master' into 'master'
...
Fixed passed indexes for object deletion #5384
See merge request OpenMW/openmw!196
5 years ago
5eb7eb8d88
Add OpenMW commits up to 4 Jul 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/charactercreation.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/character.cpp
5 years ago
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
...
Replace OpenThreads by std types
5 years ago
d0fe15b095
Use meaningful names instead of mSkill1 and mSkill2
5 years ago
40ad87bc4d
Replace OpenThreads by std types
5 years ago
0bb9322a69
Use default constructor for ItemFlags
5 years ago
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
5 years ago
c8d5d421d9
Do not use deprecated mouse wheel movement angle
5 years ago
2b4274bca8
Use modern Qt flag declarations
5 years ago
8f9c3e28d9
Handle typo
5 years ago
61a5c6125d
#5480 : Drop Qt4 support and require Qt 5.12 or later.
5 years ago
053a5a6258
Add OpenMW commits up to 9 May 2020
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/aiextensions.cpp
5 years ago
039c9a37eb
Verifier: Don't check race of non-skin body parts (bug #5400 )
...
Remove unnecessary flag field check
Remove magic numbers
5 years ago
8a8b4986da
Fixed passed indexes for object deletion #5384
5 years ago
a20f8e77dc
Add OpenMW commits up to 25 Apr 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
5 years ago
68549828b4
create static functions to set/get hidden node mask; compromise on magic numbers to make things easier to understand
5 years ago
8a8107e837
as it says; revert vismask and uncomplicate openmw
5 years ago
4ae0bd1fae
Merge branch 'helplink' into 'master'
...
Link to readthedocs documentation from OpenCS
See merge request OpenMW/openmw!171
5 years ago
513ac8986d
Add link to opencs documentation on readthedocs, available through
...
context menu.
The documentation opens in default browser.
There are 3 contexts:
- global: opens the OpenMW CS User Manual main page
- when a record is selected: opens the "Tables" page
- when the filter field is selected: opens the "Record Filters" page
There is also a link to the OpenCS tutorial in the help menu.
5 years ago
25a632c650
Add OpenMW commits up to 13 Apr 2020
...
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
5 years ago
ad333e88fe
Handle enchantment autocalc flag as a flag (bug #5363 )
5 years ago
42c7ec8f1c
Minor fix to calculation of mLandSizeFactor (-1)
5 years ago
023c51ad0e
Fix int/float conversions in the CSVRender::BrushDraw
5 years ago
9712925ba3
Merge pull request #2762 from akortunov/warnfix
...
Avoid a hack to initialize mIndex in the editor
5 years ago
c7cedc4e5a
Avoid a hack to initialize mIndex
5 years ago
7fda65e7bb
Merge pull request #2692 from unelsson/opencsbrushdraw
...
Editor: Implement brush outlines
5 years ago
a68d9aed4c
Fix issues, found by CoverityScan
5 years ago
ef4a7089e4
Use template specialization for writeHNT to write raw arrays
...
To avoid passing explicit size argument where it's possible.
5 years ago
7bc3298ed4
Add OpenMW commits up to 1 Apr 2020
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# apps/openmw/mwphysics/physicssystem.cpp
5 years ago
66fba7cc51
Remove unneeded constructors, only initialize in cpp, minor fixes
5 years ago
ec2ff2a9b0
Fix if oneliners
5 years ago
18cdd3bd7c
rebase-related fixes
5 years ago
da0add904b
Fix and simplify brush outlines and coordinate calculations
5 years ago
8f625474fd
Hotfix terraintexturemode circle brush radius calculations
5 years ago
e14c390a9b
Fix crash
5 years ago
731e5b57f5
Tool outline for terraintexturemode and square shape. Various fixes.
5 years ago
24c8b32d4c
Implement brush outline for terrainshapemode
5 years ago
baff15362a
Merge pull request #2713 from unelsson/opencsdropobjects
...
Editor: Implement dropping objects with keypress in instancemode
5 years ago
18bfc6f2c5
Fix Gender column filtering (bug #4601 ) and correct filter descs
5 years ago
793ea8566f
Fix typo
5 years ago
17cb3414d8
clean-up, improve formatting
5 years ago
75f6577f61
Remove unneeded include
5 years ago
41aa90bfa7
Add helper class for safer mask handling
5 years ago
af434cffba
fix numeric limits min() to lowest(), fix correct drop height
5 years ago
035d5205d9
Use collision boxes to calculate dropping height, variable naming
5 years ago
54738e1e32
Handle mask disabling better
5 years ago
Gleb Mazovetskiy
David Cernat
psi29a
uramer
Nelsson Huotari
Andrei Kortunov
Alexei Dobrohotov
Coleman Smith
AnyOldName3
AnyOldName3
elsid
Giovanni Bodega
Frederic Chardon