Commit Graph

24021 Commits (5ab29f26e94f757a97c3f11234f3e80d9d3b00d2)
 

Author SHA1 Message Date
Alexei Dobrohotov 5ab29f26e9 Put the main menu below other windows (bug #5622) 4 years ago
psi29a 4faaa86449 Merge branch 'cyclic_includes' into 'master'
More accurate detection of cyclic includes

See merge request OpenMW/openmw!281
4 years ago
psi29a aa4e6c448b Merge branch 'spellabsorption' into 'master'
Support enchantment absorption

See merge request OpenMW/openmw!307
4 years ago
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
4 years ago
Bret Curtis c291bb169e fixed indentation and additional diffs 4 years ago
Bret Curtis 18899394c4 typo in path 4 years ago
Bret Curtis bf7e1bd32b make switch to using GL hosted windows deps 4 years ago
psi29a f1ab519fac Merge branch 'uses' into 'master'
Handle 0-use items like vanilla (bug #5611)

Closes #5611

See merge request OpenMW/openmw!306
4 years ago
psi29a d9dafbe45b Merge branch 'master' into 'uses'
# Conflicts:
#   CHANGELOG.md
4 years ago
psi29a 0438d9d5bb Merge branch 'enchanting' into 'master'
Reset enchant effects displayed range when they are constant (bug #5603)

See merge request OpenMW/openmw!309
4 years ago
psi29a 61b83697f5 Merge branch 'rotation' into 'master'
Add inverse order rotation support to SetAngle (feature #5579)

Closes #5579

See merge request OpenMW/openmw!305
4 years ago
psi29a ad1021721f Merge branch 'master' into 'rotation'
# Conflicts:
#   CHANGELOG.md
4 years ago
elsid 61cf505f41 Merge branch 'smooth_movement' into 'master'
Smooth movement

Closes #4894 and #5610

See merge request OpenMW/openmw!282
4 years ago
Alexei Dobrohotov f2af957647 Reset enchant effects displayed range when they are constant (bug #5603) 4 years ago
Alexei Dobrohotov 8084784828 Merge branch 'del'hruhn-fix' into 'master'
Actually set the uvSet value

Closes #5614

See merge request OpenMW/openmw!308
4 years ago
Alexei Dobrohotov e0a5c24afe Handle 0-use items like vanilla (bug #5611) 4 years ago
AnyOldName3 a338e8c561 Actually set the uvSet value
This got lost when uvSet was made into a local variable.
4 years ago
Petr Mikheev a17fb14b8a Add "smooth movement" and "NPCs avoid collisions" settings to openmw-launcher and to the docs; update CHANGELOG.md. 4 years ago
Petr Mikheev ad51a4be2e Changes in head tracking and greetings for "smooth movement". 4 years ago
Petr Mikheev b838782557 Avoid collisions between actors. 4 years ago
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). 4 years ago
Petr Mikheev 6a75942907 Fix CharacterController::setAttackTypeBasedOnMovement 4 years ago
Petr Mikheev bd6b984022 Smoothing speed in CharacterController 4 years ago
Petr Mikheev 71ba94a89a Smooth turning; smooth stopping; combat headtracking 4 years ago
Alexei Dobrohotov f8389c6c37 Support enchantment absorption 4 years ago
Alexei Dobrohotov 387bda5e22 Add inverse order rotation support to SetAngle (feature #5579) 4 years ago
Alexei Dobrohotov acdf4cb5e3
Merge pull request #3007 from akortunov/warnfix
Fix unsugned/signed comparison warning
4 years ago
Andrei Kortunov 7d776609c8 Fix unsugned/signed comparison warning 4 years ago
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
4 years ago
AnyOldName3 390fb4f12e Disable OpenGL Debug stuff when SDL doesn't provide the necessary definitions 4 years ago
Bret Curtis dd7e964baf
Merge pull request #2999 from akortunov/spellfix
Apply effects during rest before fast-forwarding spells state
4 years ago
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
4 years ago
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
4 years ago
psi29a 87028e1640 Merge branch 'flipping-heck' into 'master'
Make NiFlipControllers only affect base texture

Closes #2069

See merge request OpenMW/openmw!301
4 years ago
psi29a b4ccd2658a Merge branch 'khr_debug' into 'master'
Khr debug

See merge request OpenMW/openmw!302
4 years ago
Bret Curtis 8f07b7e076
Merge pull request #3005 from Assumeru/dont-search-containers
Don't search containers
4 years ago
AnyOldName3 3f61ff3a44 Make OpenGL debugging optional 4 years ago
AnyOldName3 441c09578a Merge remote-tracking branch 'origin/khr_debug' into khr_debug 4 years ago
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
4 years ago
AnyOldName3 f8f72ce4c4 Add changelog entry 4 years ago
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.
4 years ago
Alexei Dobrohotov 8390ba0a0c Merge branch 'fix_5557' into 'master'
Fix #5557

Closes #5557

See merge request OpenMW/openmw!290
4 years ago
Evil Eye fe82cd9f92 Don't search containers 4 years ago
Petr Mikheev 874c754b68 Fix #5557 4 years ago
psi29a 165fa1c376 Merge branch 'multi-config-runtime-resources' into 'master'
Allow setting up multiple build configurations at once

See merge request OpenMW/openmw!296
4 years ago
AnyOldName3 086db32c13 Merge branch 'typo' into 'master'
fix typo in terrainstorage.hpp

See merge request OpenMW/openmw!299
4 years ago
tessa 58b5249e8b fix typo in terrainstorage.hpp 4 years ago
AnyOldName3 85b5fdee35 Discard the alpha channel of 16-bit TGAs, just like Morrowind 4 years ago
Bret Curtis 673f0f4f77
Merge pull request #3003 from akortunov/min_cost
Set a minimum 1gp cost for services
4 years ago
Andrei Kortunov 753ca91556 Set a minimum 1gp cost for services (regression #5600) 4 years ago