mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
Code Issues Releases Wiki Activity
25018 commits 38 branches 54 tags 122 MiB
Commit graph

25018 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hristos N. Triantafillou
209e7718a8
Clarify the requirements of a data folder 
The current text could be interpreted to mean that a data folder
_must_ have a plugin, but this isn't the case.

This added text clarifies that a plugin or resources are needed.
 2021-03-21 15:37:48 -05:00
psi29a
86bd173d69 Merge branch 'refactoring' into 'master' 
"static const" -> "static constexpr" in headers

See merge request OpenMW/openmw!676
 2021-03-21 15:43:47 +00:00
AnyOldName3
b31459cc00 Merge branch 'refractiontest' into 'master' 
Make refraction mixing based on water depth instead of screen depth

See merge request OpenMW/openmw!672
 2021-03-21 14:24:12 +00:00
Petr Mikheev
369adf1583 Merge branch 'smarterunstuck' into 'master' 
Forgot to initialize these variables

See merge request OpenMW/openmw!677
 2021-03-21 13:48:40 +00:00
Petr Mikheev
7bbbe40abe "static const" -> "static constexpr" in headers 2021-03-21 13:57:54 +01:00
wareya
e722c99e62 forgot to initialize these variables 2021-03-21 08:57:15 -04:00
psi29a
78894b6129 Merge branch 'smarterunstuck' into 'master' 
Improve 'unstuck'ing code

See merge request OpenMW/openmw!675
 2021-03-21 09:47:59 +00:00
wareya
40265bf118 make unstucking slightly smarter (can turn itself off, also acts like flat ground) 2021-03-20 21:14:56 -04:00
wareya
1a4e9df707 add bit to suppress coastline artifacts at more of a distance 2021-03-19 20:12:40 -04:00
wareya
bf336e4cb4 make sun scattering color stop being an ugly radioactive green 2021-03-19 18:51:52 -04:00
AnyOldName3
d13d90a50d Merge branch 'msvc-fix-osg-src-build' into 'master' 
MSVC: extern/ tweaks to make it build

See merge request OpenMW/openmw!663
 2021-03-19 22:28:55 +00:00
wareya
845e3944d6 make refraction more visible even at a distance 2021-03-19 17:54:08 -04:00
Bret Curtis
8f996d0bce
Merge pull request #3056 from akortunov/master 
Reset watched stats upon reload or new game start
 2021-03-19 16:14:55 +01:00
Andrei Kortunov
54daa234bd Reset watched stats upon reload or new game start 2021-03-19 11:56:14 +04:00
Alexei Dobrohotov
6ba4a36dbd
Merge pull request #3054 from akortunov/master 
Remove invalid MyGUI properties from layout files
 2021-03-18 23:39:28 +03:00
AnyOldName3
7831ba3d5d Merge branch 'async_interp' into 'master' 
Fix async physics interpolation

Closes #5908

See merge request OpenMW/openmw!670
 2021-03-18 19:51:09 +00:00
wareya
1471ef003a fix async physics interpolation 2021-03-18 13:53:00 -04:00
Bret Curtis
68c1adec0f
Merge pull request #3055 from akortunov/keyinit 
Init animation key struct before usage
 2021-03-18 12:28:10 +01:00
psi29a
a4719ffdf3 Merge branch 'fix-windows-theme' into 'master' 
Deploy Qt style DLL

Closes #5907

See merge request OpenMW/openmw!667
 2021-03-18 08:27:52 +00:00
Andrei Kortunov
a22f6b24d5 Init animation key struct before usage 2021-03-18 11:47:06 +04:00
psi29a
9c1bda5408 Merge branch 'robuster-vswhere' into 'master' 
Ensure vswhere finds us a single suitable MSVC installation

See merge request OpenMW/openmw!668
 2021-03-18 06:43:02 +00:00
AnyOldName3
b38a817600 Ensure vswhere finds us a single suitable MSVC installation 
Also document the numerous arguments to achieve this.
 2021-03-17 23:29:48 +00:00
AnyOldName3
1c296a1a78 Deploy Qt style DLL 2021-03-17 18:11:36 +00:00
Alexei Dobrohotov
7acebbd6e8 Merge branch 'no-using-namespace-std' into 'master' 
Minor cleanup: Remove `using namespace std`

See merge request OpenMW/openmw!664
 2021-03-17 16:49:32 +00:00
psi29a
cac7461324 Merge branch 'fix-mesa-sunglare' into 'master' 
Fix sunglare on Mesa

Closes #5906

See merge request OpenMW/openmw!665
 2021-03-17 09:27:25 +00:00
AnyOldName3
3ad1040271 Update changelog 2021-03-17 02:00:21 +00:00
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.
 2021-03-17 01:46:04 +00:00
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.
 2021-03-16 19:58:02 +00:00
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).
 2021-03-16 19:52:10 +00:00
Evil Eye
d1e8c6b223 Merge branch 'magical_rat' into 'master' 
Register copied Spells with SpellList

See merge request OpenMW/openmw!662
 2021-03-16 19:50:15 +00:00
Andrei Kortunov
c68e047f19 Remove invalid MyGUI properties from layout files 2021-03-16 13:21:35 +04:00
psi29a
49ec7c2053 Merge branch 'fix-mygui-log' into 'master' 
Fix MyGUI log

Closes #5900

See merge request OpenMW/openmw!660
 2021-03-16 08:43:45 +00:00
AnyOldName3
70f48d9b26 Merge branch 'fix-boost-zlib-vcpkg' into 'master' 
MSVC: Fix build with vcpkg's boost

See merge request OpenMW/openmw!661
 2021-03-16 02:34:20 +00:00
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
 2021-03-16 01:36:07 +00:00
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.
 2021-03-15 22:35:13 +00:00
AnyOldName3
20852e82b2 Merge branch 'zbuffer' into 'master' 
NiZBufferProperty: handle depth test flag (bug #5902)

Closes #5902

See merge request OpenMW/openmw!658
 2021-03-15 15:20:50 +00:00
Dobrohotov Alexei
952b31ac5c NiZBufferProperty: handle depth test flag (bug #5902) 2021-03-15 13:40:02 +03:00
AnyOldName3
56ef1ec506 Merge branch 'correct-extension-name' into 'master' 
Use correct extension name.

See merge request OpenMW/openmw!653
 2021-03-14 23:54:58 +00:00
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
 2021-03-14 21:57:35 +00:00
Bret Curtis
90baf8ad60
Merge pull request #3053 from akortunov/master 
Add move assignment operator for the ESM::Variant
 2021-03-14 22:12:23 +01:00
Bret Curtis
40c989d732 allman style 2021-03-14 22:11:18 +01:00
Evil Eye
c2580d60e9 Register copied Spells with SpellList 2021-03-14 19:32:03 +01:00
Bret Curtis
9fc0649fb6 a better check to avoid the mCell assertion, so compariing nullptr to current cell will refurn false anyway 2021-03-14 18:08:52 +01:00
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 2021-03-14 18:02:48 +01:00
Bret Curtis
fff1df9ee4 revert some blank lines 2021-03-14 18:02:48 +01:00
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. 2021-03-14 18:02:48 +01:00
Bret Curtis
1479f98793 hacky solution with debug; seems that player is added before cell so tracing down will not find anything 2021-03-14 18:02:48 +01:00
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. 2021-03-14 18:02:48 +01:00
psi29a
3736cd45cd Merge branch 'mygui-obsolete' into 'master' 
Set `MYGUI_DONT_USE_OBSOLETE=OFF`

Closes #5896

See merge request OpenMW/openmw!656
 2021-03-14 16:29:05 +00:00
Gleb Mazovetskiy
918fd174f3 Set MYGUI_DONT_USE_OBSOLETE=OFF 
Fixes https://gitlab.com/OpenMW/openmw/-/issues/5896
 2021-03-14 12:39:55 +00:00