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
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
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
Petr Mikheev
bd6b984022
Smoothing speed in CharacterController
2020-09-22 22:50:44 +02:00
Petr Mikheev
71ba94a89a
Smooth turning; smooth stopping; combat headtracking
2020-09-22 22:50:44 +02:00
Alexei Dobrohotov
f8389c6c37
Support enchantment absorption
2020-09-22 00:33:27 +03:00
Alexei Dobrohotov
387bda5e22
Add inverse order rotation support to SetAngle (feature #5579 )
2020-09-21 22:27:01 +03:00
Alexei Dobrohotov
acdf4cb5e3
Merge pull request #3007 from akortunov/warnfix
...
Fix unsugned/signed comparison warning
2020-09-21 10:10:29 +03:00
Andrei Kortunov
7d776609c8
Fix unsugned/signed comparison warning
2020-09-21 10:36:01 +04:00
AnyOldName3
bb2f89b497
Merge branch 'macos-gldebug-hotfix' into 'master'
...
Disable OpenGL Debug stuff when SDL doesn't provide the necessary definitions
See merge request OpenMW/openmw!304
2020-09-21 01:45:16 +00:00
AnyOldName3
390fb4f12e
Disable OpenGL Debug stuff when SDL doesn't provide the necessary definitions
2020-09-21 00:49:09 +01:00
Bret Curtis
dd7e964baf
Merge pull request #2999 from akortunov/spellfix
...
Apply effects during rest before fast-forwarding spells state
2020-09-20 14:47:37 +02:00
psi29a
86c6d9b1b5
Merge branch 'cherry-pick-b3db3875' into 'master'
...
Merge branch '4771-and-4631' into 'master'
Closes #4631 and #4471
See merge request OpenMW/openmw!303
2020-09-20 12:35:44 +00:00
psi29a
22c3588d0d
Merge branch '4771-and-4631' into 'master'
...
Try lower MSAA level if the requested value isn't available
Closes #4471 and #4631
See merge request OpenMW/openmw!297
(cherry picked from commit b3db387512340a5e9a77427c2d7d9d88c2340056)
da0aef7a Retrieve SDL OpenGL attributes after context creation
a51e63b3 Try lower MSAA levels if OpenGL context doesn't have what we requested
c4e92a0a Update CHANGELOG.md
2020-09-20 12:35:26 +00:00
psi29a
87028e1640
Merge branch 'flipping-heck' into 'master'
...
Make NiFlipControllers only affect base texture
Closes #2069
See merge request OpenMW/openmw!301
2020-09-20 12:20:18 +00:00
psi29a
b4ccd2658a
Merge branch 'khr_debug' into 'master'
...
Khr debug
See merge request OpenMW/openmw!302
2020-09-20 12:14:57 +00:00
Bret Curtis
8f07b7e076
Merge pull request #3005 from Assumeru/dont-search-containers
...
Don't search containers
2020-09-20 11:48:26 +02:00
AnyOldName3
3f61ff3a44
Make OpenGL debugging optional
2020-09-19 23:30:34 +01:00
AnyOldName3
441c09578a
Merge remote-tracking branch 'origin/khr_debug' into khr_debug
2020-09-19 23:09:11 +01:00
AnyOldName3
14740855b5
Merge branch '16-bit-tga-alpha' into 'master'
...
Discard the alpha channel of 16-bit TGAs, just like Morrowind
See merge request OpenMW/openmw!298
2020-09-17 13:28:16 +00:00
AnyOldName3
f8f72ce4c4
Add changelog entry
2020-09-16 23:08:01 +01:00
AnyOldName3
b2cb98d30e
Fix NiFlipController
...
NiFlipControllers *always* affect the base texture, even if no base
texture is bound. When no base texture is bound, they default to UV set
zero and to having wrapped UV coordinates, instead of using the settings
for the disabled base texture.
2020-09-16 23:03:42 +01:00
Alexei Dobrohotov
8390ba0a0c
Merge branch 'fix_5557' into 'master'
...
Fix #5557
Closes #5557
See merge request OpenMW/openmw!290
2020-09-16 21:43:31 +00:00
Evil Eye
fe82cd9f92
Don't search containers
2020-09-15 21:13:18 +02:00
Petr Mikheev
874c754b68
Fix #5557
2020-09-15 20:24:16 +02:00
psi29a
165fa1c376
Merge branch 'multi-config-runtime-resources' into 'master'
...
Allow setting up multiple build configurations at once
See merge request OpenMW/openmw!296
2020-09-15 13:52:46 +00:00
AnyOldName3
086db32c13
Merge branch 'typo' into 'master'
...
fix typo in terrainstorage.hpp
See merge request OpenMW/openmw!299
2020-09-13 17:01:54 +00:00
tessa
58b5249e8b
fix typo in terrainstorage.hpp
2020-09-13 10:46:27 -05:00
AnyOldName3
85b5fdee35
Discard the alpha channel of 16-bit TGAs, just like Morrowind
2020-09-12 00:20:44 +01:00
