Andrei Kortunov
822764d0fa
Rework fixed strings handling
2020-10-05 21:52:22 +04:00
psi29a
72ab340374
Merge branch 'nifdefinitions' into 'master'
...
Introduce some extended NIF definitions
See merge request OpenMW/openmw!319
2020-10-04 11:47:28 +00:00
Alexei Dobrohotov
29ccb09da5
Introduce some extended NIF definitions
2020-10-04 13:18:56 +03:00
Petr Mikheev
2835ea1e21
Update logic of "NPCs avoid collisions"
2020-10-03 22:58:00 +02:00
Alexei Dobrohotov
25b966d58d
Merge branch 'master' into 'master'
...
Hostile Follower issue #5101
See merge request OpenMW/openmw!244
2020-10-03 20:05:18 +00:00
Charles Calhoun
14aacb81c5
Fix follower aggression when traveling. Summoning still has problems but less intrusive than current implementation.
2020-10-03 20:05:17 +00:00
Mads Buvik Sandvei
d5450a7d88
Correctly resetting line numbering during shader processing.
2020-10-03 14:22:34 +02:00
psi29a
3040b3b2b6
Merge branch 'issue-5588' into 'master'
...
Prevent empty right page of journal having invisible topics (Fixes #5588 )
Closes #5588
See merge request OpenMW/openmw!310
2020-10-03 10:55:44 +00:00
Kyle Shrader
845049a166
Prevent empty right page of journal having invisible topics ( Fixes #5588 )
2020-10-03 10:55:44 +00:00
psi29a
54b386fe93
Merge branch 'patch-1' into 'master'
...
Update install-game-files.rst
See merge request OpenMW/openmw!300
2020-10-03 10:51:27 +00:00
imkirkdouglacus
5215ce45d0
Update install-game-files.rst
2020-10-03 10:51:27 +00:00
psi29a
4b95cb8660
Merge branch '5624' into 'master'
...
Skip raycasting for zero-length rays
Closes #5624
See merge request OpenMW/openmw!316
2020-10-03 10:31:13 +00:00
AnyOldName3
9e78f3d936
Skip raycasting for zero-length rays
...
Rays with no length can't intersect anything. This also prevents an
assertion triggering with Bullet built in Debug mode.
2020-10-03 02:19:38 +01:00
psi29a
21fa55de8e
Merge branch 'gitlab_tests' into 'master'
...
Run unit tests in gitlab CI for linux build
See merge request OpenMW/openmw!314
2020-10-02 23:19:10 +00:00
psi29a
2d24e87bcc
Merge branch 'nifstuffagain' into 'master'
...
niffile.cpp cleanup
See merge request OpenMW/openmw!313
2020-10-02 22:22:58 +00:00
elsid
322298e02a
Build with clang in gitlab CI for linux
2020-10-03 00:19:48 +02:00
elsid
af95474670
Run unit tests in gitlab CI for linux build
2020-10-03 00:19:48 +02:00
elsid
23fe60a067
Run unit tests in a separate build
2020-10-03 00:19:29 +02:00
psi29a
7cd5940f00
Merge branch 'psi29a-master-patch-58402' into 'master'
...
Update CI/before_script.msvc.sh
See merge request OpenMW/openmw!315
2020-10-02 21:53:39 +00:00
psi29a
1ddfb18cb3
Update CI/before_script.msvc.sh
2020-10-02 21:07:46 +00:00
Alexei Dobrohotov
4e22c2687f
niffile.cpp cleanup
2020-10-02 21:50:54 +03:00
Alexei Dobrohotov
5ab29f26e9
Put the main menu below other windows (bug #5622 )
2020-10-01 20:31:45 +03:00
psi29a
4faaa86449
Merge branch 'cyclic_includes' into 'master'
...
More accurate detection of cyclic includes
See merge request OpenMW/openmw!281
2020-09-30 05:39:28 +00:00
psi29a
aa4e6c448b
Merge branch 'spellabsorption' into 'master'
...
Support enchantment absorption
See merge request OpenMW/openmw!307
2020-09-29 15:27:52 +00:00
psi29a
60447b27c4
Merge branch 'update_to_gl_deps_for_windows' into 'master'
...
make switch to using GL hosted windows deps
See merge request OpenMW/openmw!311
2020-09-29 15:15:57 +00:00
Bret Curtis
c291bb169e
fixed indentation and additional diffs
2020-09-29 13:29:12 +02:00
Bret Curtis
18899394c4
typo in path
2020-09-29 13:13:26 +02:00
Bret Curtis
bf7e1bd32b
make switch to using GL hosted windows deps
2020-09-29 12:21:25 +02:00
psi29a
f1ab519fac
Merge branch 'uses' into 'master'
...
Handle 0-use items like vanilla (bug #5611 )
Closes #5611
See merge request OpenMW/openmw!306
2020-09-29 08:20:56 +00:00
psi29a
d9dafbe45b
Merge branch 'master' into 'uses'
...
# Conflicts:
# CHANGELOG.md
2020-09-29 08:20:50 +00:00
psi29a
0438d9d5bb
Merge branch 'enchanting' into 'master'
...
Reset enchant effects displayed range when they are constant (bug #5603 )
See merge request OpenMW/openmw!309
2020-09-28 17:18:29 +00:00
psi29a
61b83697f5
Merge branch 'rotation' into 'master'
...
Add inverse order rotation support to SetAngle (feature #5579 )
Closes #5579
See merge request OpenMW/openmw!305
2020-09-28 17:10:18 +00:00
psi29a
ad1021721f
Merge branch 'master' into 'rotation'
...
# Conflicts:
# CHANGELOG.md
2020-09-28 17:09:50 +00:00
elsid
61cf505f41
Merge branch 'smooth_movement' into 'master'
...
Smooth movement
Closes #4894 and #5610
See merge request OpenMW/openmw!282
2020-09-26 22:12:06 +00:00
Alexei Dobrohotov
f2af957647
Reset enchant effects displayed range when they are constant (bug #5603 )
2020-09-25 02:13:57 +03:00
Alexei Dobrohotov
8084784828
Merge branch 'del'hruhn-fix' into 'master'
...
Actually set the uvSet value
Closes #5614
See merge request OpenMW/openmw!308
2020-09-24 21:35:56 +00:00
Alexei Dobrohotov
e0a5c24afe
Handle 0-use items like vanilla (bug #5611 )
2020-09-25 00:20:25 +03:00
AnyOldName3
a338e8c561
Actually set the uvSet value
...
This got lost when uvSet was made into a local variable.
2020-09-24 17:13:09 +01:00
fredzio
ae38b3d9b2
Put the install logic in one place for all platforms
2020-09-23 20:00:32 +02:00
AnyOldName3
be5fd6fd03
Exclude directories correctly
...
We don't need `/*` as we don't want the directory itself, not just its
contents. We also need to list possible other directories explicitly as
there's currently no way to skip directories without matches.
It would be much nicer if CMake was tracking the DLLs we needed for us.
2020-09-23 20:00:32 +02:00
AnyOldName3
73708a6f2a
Install openmw-cs.cfg on single-config generators and from the right directory on multi-config
2020-09-23 20:00:32 +02:00
AnyOldName3
8dd820ba48
Exclude deps
2020-09-23 20:00:32 +02:00
AnyOldName3
d0ddf488db
Install PDBs when appropriate
2020-09-23 20:00:32 +02:00
AnyOldName3
db0f7c607f
Make Windows install target slightly less breakable
2020-09-23 20:00:32 +02:00
fredzio
87290cf6d1
Add support for multi configurations generators on unix
...
Since version 3.17 cmake supports the Ninja Multi-Config
No change for Xcode, VS and Ninja "single config"
2020-09-23 20:00:32 +02:00
Petr Mikheev
a17fb14b8a
Add "smooth movement" and "NPCs avoid collisions" settings to openmw-launcher and to the docs; update CHANGELOG.md.
2020-09-22 22:50:44 +02:00
Petr Mikheev
ad51a4be2e
Changes in head tracking and greetings for "smooth movement".
2020-09-22 22:50:44 +02:00
Petr Mikheev
b838782557
Avoid collisions between actors.
2020-09-22 22:50:44 +02:00
Petr Mikheev
79a72e4b44
Slightly modify aicombat to make it more difficult to get around an enemy. The difference is visible only if turning is slow (i.e. if smooth movement enabled).
2020-09-22 22:50:44 +02:00
Petr Mikheev
6a75942907
Fix CharacterController::setAttackTypeBasedOnMovement
2020-09-22 22:50:44 +02:00
