Andrei Kortunov
f335044026
Merge pull request #2587 from Capostrophic/sheathing
...
Minor sheathing-related changes
2019-11-07 20:04:03 +04:00
Capostrophic
5a5bc0bef8
Uncheck sheathing checkboxes automatically when appropriate
...
Fix their order and bogus saveSettingBool calls
2019-11-07 17:24:43 +03:00
Alexei Dobrohotov
ff44b2c66f
Merge pull request #2589 from akortunov/effects
...
Display magic effects according to research page
2019-11-07 17:03:56 +03:00
Andrei Kortunov
6eb8e0cf4d
Display magic effects according to research page
2019-11-07 11:05:18 +04:00
Alexei Dobrohotov
a8843fa5a8
Make sure MultiChar::data() constructs a valid string
...
mData may ultimately not be a valid C-string (e.g. if it contains 4 significant characters) so it may not necessarily be converted into a valid std::string
2019-11-05 22:33:14 +03:00
Capostrophic
5eab913a9c
Make additional anim sources dependency more obvious
2019-11-05 21:41:56 +03:00
Andrei Kortunov
5ede09a6cd
Merge pull request #2588 from elsid/fix_warning
...
Fix warning -Woverloaded-virtual
2019-11-05 13:13:22 +04:00
elsid
d42b5fd28e
Fix warning -Woverloaded-virtual
...
In file included from openmw/components/terrain/quadtreeworld.cpp:10:
openmw/components/terrain/quadtreenode.hpp:95:14: warning: 'Terrain::QuadTreeNode::traverse' hides overloaded virtual function [-Woverloaded-virtual]
void traverse(ViewData* vd, const osg::Vec3f& viewPoint, LodCallback* lodCallback, float maxDist);
^
OpenSceneGraph/build/clang/release/include/osg/Group:43:22: note: hidden overloaded virtual function 'osg::Group::traverse' declared here: different number of parameters (1 vs 4)
virtual void traverse(NodeVisitor& nv);
^
1 warning generated.
2019-11-05 09:31:38 +01:00
Capostrophic
7885b8c75e
Sheathing-related changes
...
Add weapon and shield sheathing and use additional anim sources checkboxes into the Advanced tab of the launcher
Remove outdated information from the documentation
2019-11-04 20:34:06 +03:00
Nelsson Huotari
45d43045eb
Remove unused std::string
2019-11-04 12:29:37 +02:00
Nelsson Huotari
aeb0ccff90
Allow selecting cell edges everywhere
2019-11-04 12:16:08 +02:00
Alexei Dobrohotov
2ee17f39fd
Merge pull request #2585 from unelsson/terrainselectionfixes
...
Terrain selection fixes
2019-11-04 03:08:35 +03:00
Nelsson Huotari
8f6dc78217
Get vertex height from data, if not available in visible cells.
2019-11-04 00:09:23 +02:00
Nelsson Huotari
9677203215
Don't allow vertex selection outside visible cells
2019-11-04 00:09:23 +02:00
Nelsson Huotari
d186bcb46f
Update selection during transient edit, clear to a single function.
2019-11-03 13:27:27 +02:00
Andrei Kortunov
678d2e6e7d
Merge pull request #2584 from Capostrophic/shadows
...
Resolving 0.46.0 release shadow-related blockers
2019-11-03 08:35:30 +04:00
Alexei Dobrohotov
5ae91465ee
Fix gamepad zoom value calculation
2019-11-02 19:47:05 +03:00
Capostrophic
31e330c9a5
Revise shadow setting tooltips and correct fade start minimum value
2019-11-02 18:06:39 +03:00
Capostrophic
208608cbd0
Fix a typo and a mistake
2019-11-02 18:06:39 +03:00
Capostrophic
9b204fe227
Move shadow settings into a new tab
2019-11-02 18:06:39 +03:00
Capostrophic
0e2380d471
Add the most basic shadow settings into the launcher
2019-11-02 18:06:39 +03:00
bzzt
b6ed2f1718
Add optional shadow map max distance and fading
2019-11-02 18:06:39 +03:00
Alexei Dobrohotov
b700c98e8f
Merge pull request #2581 from akortunov/deceleration
...
Implement actors movement deceleration (feature #4544 )
2019-10-31 15:59:18 +03:00
Bret Curtis
ec9a593fc3
Merge pull request #2578 from akortunov/mouse
...
Implement mouse wheel bindings (bug #2679 )
2019-10-31 13:14:29 +01:00
Andrei Kortunov
61ab7f3c1e
Implement actors movement deceleration (feature #4544 )
2019-10-31 14:41:12 +04:00
Alexei Dobrohotov
f944c5b175
Merge pull request #2582 from ananace/add-oars
...
Add OARS block for future packaging
2019-10-31 12:09:19 +03:00
Alexander Olofsson
165401465b
Add OARS block for future packaging
2019-10-31 07:52:36 +01:00
Michael Stopa
e4bec88a68
Implement mouse wheel bindings (bug #2679 )
2019-10-30 20:45:51 +04:00
Alexei Dobrohotov
9ab8d88753
Accept a bogus cell string argument for Position
2019-10-30 17:54:34 +03:00
Alexei Dobrohotov
7328db4d6b
Fix small typo in body part record verifier
2019-10-30 17:51:36 +03:00
Bret Curtis
92c3a68a14
Merge pull request #2575 from akortunov/encoding
...
Support UTF-8 in script parser
2019-10-30 14:59:53 +01:00
Bret Curtis
1aa4cc3388
Merge pull request #2579 from OpenMW/revert-2453-fog_compression
...
Revert "Store raw data about fog of war instead of RGBA images"
2019-10-30 14:49:07 +01:00
Bret Curtis
0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images"
2019-10-30 14:48:44 +01:00
Bret Curtis
36614dba2a
Merge pull request #2453 from akortunov/fog_compression
...
Store raw data about fog of war instead of RGBA images
2019-10-30 13:45:55 +01:00
Andrei Kortunov
45ab6e1430
Implement UTF-8 support for script parser (bug #4598 )
2019-10-30 14:59:47 +04:00
Andrei Kortunov
fe2f4bcedc
Merge pull request #2577 from akortunov/master
...
Add missing changelog entries
2019-10-30 08:28:25 +04:00
Andrei Kortunov
7a783be396
Add missing changelog entries
2019-10-30 08:27:14 +04:00
Bret Curtis
ccc8702a1e
Merge branch 'make_gitlab_ci_great_again' into 'master'
...
try to cache everything
See merge request OpenMW/openmw!156
2019-10-29 22:19:36 +00:00
Alexei Dobrohotov
dc8e5f1d12
Accept redundant volume and pitch StopSound arguments
...
Exploited in Arktwend.
2019-10-29 18:51:58 +03:00
Bret Curtis
0ac7bdd2eb
try to cache everything
2019-10-29 15:12:53 +01:00
Alexei Dobrohotov
7488f402d5
Merge pull request #2576 from akortunov/warnfix
...
Fix warnings about variable re-declaration
2019-10-29 15:03:54 +03:00
Alexei Dobrohotov
8bc2c1ac34
Make ForceGreeting ignore any extra argument
2019-10-29 14:39:21 +03:00
Andrei Kortunov
d278e5d4af
Fix warnings about variable re-declaration
2019-10-29 13:48:08 +04:00
Alexei Dobrohotov
8752523de3
Merge pull request #2573 from akortunov/encoding
...
Attempt to fix a regression - crash on ARM
2019-10-29 02:00:02 +03:00
Bret Curtis
9655da81a7
Merge pull request #2574 from Capostrophic/cellrefid
...
Avoid copying strings in SearchVisitor and readReferenceCollection (#5195 )
2019-10-28 23:32:03 +01:00
Capostrophic
c6e431d862
Avoid copying strings in SearchVisitor and readReferenceCollection
2019-10-28 19:28:14 +03:00
Andrei Kortunov
b2e12f0a73
Attempt to fix a regression - crash on ARM
2019-10-28 18:58:16 +04:00
Andrei Kortunov
0fa0e9571b
Merge pull request #2572 from Capostrophic/prevent
...
Rework prevent merchant equipping setting again
2019-10-28 18:11:13 +04:00
Andrei Kortunov
177c742f97
Merge branch 'fix-ci' into 'master'
...
Fix gitlab CI builds
See merge request OpenMW/openmw!155
2019-10-28 07:43:55 +00:00
Icecream95
acbdd0391c
Install Debian packages again in CI
...
The gcc docker image was updated to a newer version of Debian, so downloading packages from Ubuntu is no longer required.
2019-10-28 05:28:12 +00:00
