Commit Graph

27585 Commits (59cb31e0a788c8a9b7071a63d321da29fbb72ffd)
 

Author SHA1 Message Date
David Cernat 59cb31e0a7 Add OpenMW commits up to 20 Mar 2021
# Conflicts:
#   apps/openmw/CMakeLists.txt
#   apps/openmw/mwmechanics/aipursue.cpp
#   components/CMakeLists.txt
4 years ago
AnyOldName3 d13d90a50d Merge branch 'msvc-fix-osg-src-build' into 'master'
MSVC: extern/ tweaks to make it build

See merge request OpenMW/openmw!663
4 years ago
Bret Curtis 8f996d0bce
Merge pull request #3056 from akortunov/master
Reset watched stats upon reload or new game start
4 years ago
Andrei Kortunov 54daa234bd Reset watched stats upon reload or new game start 4 years ago
Alexei Dobrohotov 6ba4a36dbd
Merge pull request #3054 from akortunov/master
Remove invalid MyGUI properties from layout files
4 years ago
AnyOldName3 7831ba3d5d Merge branch 'async_interp' into 'master'
Fix async physics interpolation

Closes #5908

See merge request OpenMW/openmw!670
4 years ago
wareya 1471ef003a fix async physics interpolation 4 years ago
Bret Curtis 68c1adec0f
Merge pull request #3055 from akortunov/keyinit
Init animation key struct before usage
4 years ago
psi29a a4719ffdf3 Merge branch 'fix-windows-theme' into 'master'
Deploy Qt style DLL

Closes #5907

See merge request OpenMW/openmw!667
4 years ago
Andrei Kortunov a22f6b24d5 Init animation key struct before usage 4 years ago
psi29a 9c1bda5408 Merge branch 'robuster-vswhere' into 'master'
Ensure vswhere finds us a single suitable MSVC installation

See merge request OpenMW/openmw!668
4 years ago
AnyOldName3 b38a817600 Ensure vswhere finds us a single suitable MSVC installation
Also document the numerous arguments to achieve this.
4 years ago
AnyOldName3 1c296a1a78 Deploy Qt style DLL 4 years ago
Alexei Dobrohotov 7acebbd6e8 Merge branch 'no-using-namespace-std' into 'master'
Minor cleanup: Remove `using namespace std`

See merge request OpenMW/openmw!664
4 years ago
psi29a cac7461324 Merge branch 'fix-mesa-sunglare' into 'master'
Fix sunglare on Mesa

Closes #5906

See merge request OpenMW/openmw!665
4 years ago
AnyOldName3 3ad1040271 Update changelog 4 years ago
AnyOldName3 162b25c180 Fix sunglare on Mesa
The sunglare works by comparing an occlusion query with depth testing on
against one with depth testing off to determine if there's anything
closer to the camera than the maximum depth buffer value. For the depth-
tested query, the depth range is set from 1 to 1 so it's always drawn at
the maximum distance. Originally, we had the depth function set to LESS,
meaning that the query would always fail as 1 is not less than 1, but
also glPolygonOffset was used to move the query by "the smallest value
that is guaranteed to produce a resolvable offset for a given
implementation" closer to the camera. While other driver and hardware
combinations do that, Mesa seems to be clamping to the depth range, so
still failing.

Instead, it's simpler to just get rid of the polygon offset and change
the depth test to LEQUAL as 1 *is* less than or equal to 1, but not than
any other possible depth buffer value.
4 years ago
Gleb Mazovetskiy b9c2f6ea1a Minor cleanup: Remove `using namespace std`
I came across these while trying to figure why MSVC build triggers
https://developercommunity.visualstudio.com/t/error-c2872-byte-ambiguous-symbol/93889

In the end, the issue was not in openmw but in OSG, but it's good to
clean up here anyway.
4 years ago
Gleb Mazovetskiy 493659d4f9 MSVC: extern/ tweaks to make it build
Not everything is supported but it does build with the following CMakeSettings.json
variables and dependencies from vcpkg:

      "variables": [
        { "name": "OPENMW_USE_SYSTEM_BULLET", "value": "False", "type": "BOOL" },
        { "name": "OPENMW_USE_SYSTEM_MYGUI", "value": "False", "type": "BOOL" },
        { "name": "OPENMW_USE_SYSTEM_OSG", "value": "False", "type": "BOOL" },
        { "name": "BULLET_STATIC", "value": "True", "type": "BOOL" },
        { "name": "OSG_STATIC", "value": "False", "type": "BOOL" },
        { "name": "MYGUI_STATIC", "value": "False", "type": "BOOL" }
      ],

What works: it builds

What does not work: Not all DLLs are copied into the output directory with this set up
(SDL2, MyGUI, Bullet, OSG, are not copied).
4 years ago
Evil Eye d1e8c6b223 Merge branch 'magical_rat' into 'master'
Register copied Spells with SpellList

See merge request OpenMW/openmw!662
4 years ago
Andrei Kortunov c68e047f19 Remove invalid MyGUI properties from layout files 4 years ago
psi29a 49ec7c2053 Merge branch 'fix-mygui-log' into 'master'
Fix MyGUI log

Closes #5900

See merge request OpenMW/openmw!660
4 years ago
AnyOldName3 70f48d9b26 Merge branch 'fix-boost-zlib-vcpkg' into 'master'
MSVC: Fix build with vcpkg's boost

See merge request OpenMW/openmw!661
4 years ago
Gleb Mazovetskiy f460ab2152 MSVC: Fix build with vcpkg's boost
boost-zlib is not present (nor needed) in vcpkg version of boost
There, it is part of boost-iostreams instead.

This was previously reported in:
https://gitlab.com/OpenMW/openmw/-/merge_requests/213#note_348625016
4 years ago
AnyOldName3 ba74fbf30e Fix MyGUI log
Also actually print an error to the regular log when the MyGUI log can't
be opened so we notice if we kill it again in under five years.
4 years ago
AnyOldName3 20852e82b2 Merge branch 'zbuffer' into 'master'
NiZBufferProperty: handle depth test flag (bug #5902)

Closes #5902

See merge request OpenMW/openmw!658
4 years ago
Dobrohotov Alexei 952b31ac5c NiZBufferProperty: handle depth test flag (bug #5902) 4 years ago
AnyOldName3 56ef1ec506 Merge branch 'correct-extension-name' into 'master'
Use correct extension name.

See merge request OpenMW/openmw!653
4 years ago
psi29a 9d5ec7624e Merge branch 'fix_falling' into 'master'
Resolve #5895 by checking that the player is not on the ground

Closes #5895

See merge request OpenMW/openmw!651
4 years ago
Bret Curtis 90baf8ad60
Merge pull request #3053 from akortunov/master
Add move assignment operator for the ESM::Variant
4 years ago
Bret Curtis 40c989d732 allman style 4 years ago
Evil Eye c2580d60e9 Register copied Spells with SpellList 4 years ago
Bret Curtis 9fc0649fb6 a better check to avoid the mCell assertion, so compariing nullptr to current cell will refurn false anyway 4 years ago
Bret Curtis 49545e6d29 add comments as to why we need to check that the player is grounded or not; only run once during initial cell loading 4 years ago
Bret Curtis fff1df9ee4 revert some blank lines 4 years ago
Bret Curtis c067782814 proper fix that traces down the player when a cell is loaded; we also only run once if the current cell being loaded is the one that the player is in. 4 years ago
Bret Curtis 1479f98793 hacky solution with debug; seems that player is added before cell so tracing down will not find anything 4 years ago
Bret Curtis 19ad7d7f0c Resolve #5895 by setting the initial mOnGround state to false; we do this because the movement solver runs one frame behind so when we run through the loop the first time we assume we are on the ground even though we may be 400 units in the air. 4 years ago
psi29a 3736cd45cd Merge branch 'mygui-obsolete' into 'master'
Set `MYGUI_DONT_USE_OBSOLETE=OFF`

Closes #5896

See merge request OpenMW/openmw!656
4 years ago
Gleb Mazovetskiy 918fd174f3 Set `MYGUI_DONT_USE_OBSOLETE=OFF`
Fixes https://gitlab.com/OpenMW/openmw/-/issues/5896
4 years ago
psi29a 89aed67e2b Merge branch 'shhh-macs-stop-yelling' into 'master'
Hide macro usage from Macs where it isn't defined

See merge request OpenMW/openmw!655
4 years ago
AnyOldName3 9466d6a409 Hide macro usage from Macs where it isn't defined 4 years ago
psi29a 514a55ed4c Merge branch 'fix_5846' into 'master'
Fix #5846 (headtracking)

Closes #5846

See merge request OpenMW/openmw!652
4 years ago
psi29a dfae954eb2 Merge branch 'mygui_crashes_on_exit' into 'master'
Resolve crashes on exit with visible MyGUI widgets

Closes #5899

See merge request OpenMW/openmw!654
4 years ago
glassmancody.info 6255b0492b Resolve crashes on exit with visible MyGUI widgets 4 years ago
AnyOldName3 34af58f53f Use correct extension name.
Like 0068c7bb25, but for other shaders, too
4 years ago
Petr Mikheev 447c3b9489 Fix 5846 4 years ago
Andrei Kortunov 4d48c81998 Add move assignment operator and move constructor for the ESM::Variant 4 years ago
Evil Eye 4db2f79a3c Merge branch 'setpos' into 'master'
Use relative movement inside of SetPos

See merge request OpenMW/openmw!649
4 years ago
fredzio cb39f8fb01 Use moveObjectBy in SetPos 4 years ago