1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-28 21:15:34 +00:00
Commit graph

25139 commits

Author SHA1 Message Date
madsbuvi
fff57bc047 missing debian dependencies 2021-03-02 16:35:35 +01:00
madsbuvi
889937c144 compiler error 2021-03-02 15:21:40 +01:00
madsbuvi
2efd104b9d seated play recenter fix 2021-03-02 15:16:30 +01:00
madsbuvi
700dbb8873 more callback manager 2021-03-02 14:52:46 +01:00
madsbuvi
6baf9a5d3a Callback manager 2021-03-02 14:52:28 +01:00
madsbuvi
d598923421 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 2021-03-02 14:32:34 +01:00
Evil Eye
e2fc5d87b3 Merge branch 'elemental_shields' into 'master'
Don't let elemental shields harm the player in god mode

Closes #5875

See merge request OpenMW/openmw!631
2021-03-02 06:45:38 +00:00
Alexei Dobrohotov
023bc80f55 Don't let elemental shields harm the player in god mode 2021-03-01 21:37:30 +00:00
psi29a
eb11e1fcdb Merge branch 'build-accelerator' into 'master'
heightfield: Only `buildAccelerator` on Bullet 2.89+

Closes #5874

See merge request OpenMW/openmw!630
2021-03-01 09:14:04 +00:00
Gleb Mazovetskiy
1fb442e701 heightfield: Only buildAccelerator on Bullet 2.89+
Fixes #5874
2021-03-01 08:27:24 +00:00
psi29a
570bf567cd Merge branch 'fix_navigator_tests' into 'master'
Fix navigator tests (Bullet changes related)

See merge request OpenMW/openmw!629
2021-03-01 08:12:15 +00:00
elsid
fac5759748
Set bounding min and max height for btHeightfieldTerrainShape
They must be set for proper AABB based filtering. Use
+-max(abs(min), abs(max)) to make sure bullet does not shift coordinates by z.
2021-02-28 20:49:22 +01:00
elsid
fdca76ce86
Remove unused includes 2021-02-28 20:44:56 +01:00
madsbuvi
3347cdfe30 Fixed recentering adjusting the player's orientation. Cell changes should now retain the proper orientation. Added support for seated play. 2021-02-28 16:01:03 +01:00
madsbuvi
7986def3db Compilation error 2021-02-27 18:03:31 +01:00
madsbuvi
b2445e4a89 Attempting to fix gamma by properly managing state. 2021-02-27 17:02:12 +01:00
psi29a
28be5a259b Merge branch 'russian_console' into 'master'
Don't assume unmapped keycodes outside the extended ASCII range are unprintable

Closes #5871

See merge request OpenMW/openmw!622
2021-02-26 23:28:01 +00:00
psi29a
937549c99e Merge branch 'fix_still_actors' into 'master'
Make actor flee from a combat when cannot reach a target (#5851)

See merge request OpenMW/openmw!601
2021-02-26 23:25:05 +00:00
psi29a
20e6db917b Merge branch 'fix-osg-static' into 'master'
CMake: Fix support for OSG static lib paths

See merge request OpenMW/openmw!624
2021-02-26 23:20:52 +00:00
psi29a
7088e790dd Merge branch 'include-tuple' into 'master'
Fix compilation of tests with MSVC

See merge request OpenMW/openmw!625
2021-02-26 23:19:42 +00:00
AnyOldName3
16e8cf89af Fix compilation of tests with MSVC 2021-02-26 20:10:03 +00:00
AnyOldName3
e3547fe689 Merge branch 'heightfield-accel' into 'master'
heighfield: buildAccellerator()

See merge request OpenMW/openmw!623
2021-02-26 16:14:57 +00:00
Gleb Mazovetskiy
21a70b7d2b heighfield: buildAccellerator()
This enables accelleration of heightfield collisions.

Unfortunately, `btHeightfieldTerrainShape::processAllTriangle` does not
yet use the accellerator data, so this change does not improve
performance yet but might do so in future bullet versions.

References:

* Accellerator introduced in:
  https://github.com/bulletphysics/bullet3/pull/2062

* Feature request to use the accellerator in `processAllTriangle`:
  https://github.com/bulletphysics/bullet3/issues/3276
2021-02-26 14:38:06 +00:00
Gleb Mazovetskiy
13c5b1b0c5 CMake: Fix support for OSG static lib paths
`$<TARGET_FILE:...>` fails if the argument is already a path (instead of
a library name). This happens when a static library is found via
`osg_find_library`.

If the argument contains `/` or `.`, do not use `$<TARGET_FILE:...>`
2021-02-26 10:48:09 +00:00
Alexei Dobrohotov
92300733c5
Merge pull request #3047 from akortunov/master
Remove outdated entries from gitignore
2021-02-26 02:16:32 +03:00
Alexei Dobrohotov
a292a31cb3 Merge branch 'you_and_i_code' into 'master'
Fix Ctrl U/W behaviour to work with unicode text

See merge request OpenMW/openmw!621
2021-02-25 23:11:03 +00:00
madsbuvi
2923174f9a Added a list of setting overrides 2021-02-25 22:52:57 +01:00
Evil Eye
1a423860b5 Add changelog entry 2021-02-25 21:45:15 +01:00
Evil Eye
6e0f070cd1 Don't assume unmapped keycodes outside the extended ASCII range are unprintable 2021-02-25 21:37:21 +01:00
Evil Eye
a616af822e Fix Ctrl U/W behaviour to work with unicode text 2021-02-25 19:33:11 +01:00
Andrei Kortunov
b7535ad9fb Remove outdated entries from gitignore 2021-02-25 11:33:48 +04:00
Andrei Kortunov
e230dcb8b2 Merge branch 'why-wont-this-bug-just-die' into 'master'
Make the dummy texture for the character preview even more shadow-friendly

See merge request OpenMW/openmw!619
2021-02-24 06:20:52 +00:00
AnyOldName3
c7ee5d21dc Make the dummy texture for the character preview even more shadow-friendly 2021-02-23 23:24:40 +00:00
madsbuvi
e610247392 gamma debugging 2021-02-22 16:25:30 +01:00
AnyOldName3
2b144ff3dd Merge branch 'fix_frame_rate_limit' into 'master'
Fix frame rate limit (#5686)

See merge request OpenMW/openmw!603
2021-02-21 16:20:51 +00:00
psi29a
96b5581930 Merge branch 'fetchcontent-recast-navigation' into 'master'
Move recastnavigation to FetchContent

Closes #5793

See merge request OpenMW/openmw!614
2021-02-20 00:36:42 +00:00
psi29a
07740982ce Merge branch 'fix-osg-plugins-dir' into 'master'
Fix OSGPlugins_LIB_DIR on the MacOS build

See merge request OpenMW/openmw!615
2021-02-20 00:26:17 +00:00
Gleb Mazovetskiy
e265d0bc2b Fix OSGPlugins_LIB_DIR on the MacOS build
Moves auto-detection of OSGPlugins_LIB_DIR into FindOSGPlugins.cmake.

This should hopefully fix the error in the MacOS build.
2021-02-19 19:00:24 +00:00
Gleb Mazovetskiy
1c9245bd58 Move recastnavigation to FetchContent 2021-02-19 18:35:34 +00:00
psi29a
5c0214142b Merge branch 'static-build' into 'master'
Optional local source builds of OSG, MyGUI, Bullet

See merge request OpenMW/openmw!547
2021-02-19 16:58:05 +00:00
psi29a
bcbe144a1d Merge branch 'weatheralpha' into 'master'
Fix weather particle fading

Closes #5455

See merge request OpenMW/openmw!506
2021-02-19 16:50:38 +00:00
psi29a
de28a89a43 Merge branch 'navigator_cleanup' into 'master'
Navigator cleanup

See merge request OpenMW/openmw!612
2021-02-19 16:37:45 +00:00
psi29a
87d80b3d0a Merge branch 'loading_screen_race_condition' into 'master'
Fix a race condition in loading screen.

See merge request OpenMW/openmw!568
2021-02-18 22:37:47 +00:00
madsbuvi
efbdada088 Merge branch 'openmw-vr' of https://gitlab.com/madsbuvi/openmw into openmw-vr 2021-02-17 18:09:30 +01:00
madsbuvi
a0a7e6b5aa Replaced combo boxes with list box dialogues to help navigate certain elements better in VR. 2021-02-17 18:09:07 +01:00
psi29a
59e09cba5b Merge branch 'boltsize' into 'master'
Use projectile mesh size (#5829)

See merge request OpenMW/openmw!587
2021-02-15 08:40:30 +00:00
psi29a
16460aa4e3 Merge branch 'distinguish-engine-and-cs' into 'master'
Use different filenames for Engine and CS packages

See merge request OpenMW/openmw!610
2021-02-15 05:21:43 +00:00
elsid
603af3d62c Merge branch 'wotz-this-do' into 'master'
Don't force linker to work with doubly-defined symbols

See merge request OpenMW/openmw!602
2021-02-15 00:01:46 +00:00
elsid
561628087c Merge branch 'profiler_fix' into 'master'
Fix profiler glitches (#5850)

See merge request OpenMW/openmw!605
2021-02-15 00:01:06 +00:00
elsid
e1c5d05e84 Merge branch 'yell-about-missing-icon' into 'master'
Log when icon is missing and fallback is used

Closes #5857

See merge request OpenMW/openmw!611
2021-02-14 23:57:30 +00:00