Alexei Dobrohotov
2bfee281fd
Merge branch 'restore_caster' into 'master'
...
Restore projectile caster from savegame (#5860 )
See merge request OpenMW/openmw!616
(cherry picked from commit d595c7adb0fb45eafed6d3d0403ad640a91411ed)
c5426bec In the savegame, projectile caster is identified by its actor id. When
2021-03-05 21:07:29 +00:00
Evil Eye
c9d3da498a
Merge branch 'pursue' into 'master'
...
AIPursue: Pursue the player until LOS is established (#5869 )
Closes #5869
See merge request OpenMW/openmw!634
2021-03-05 16:45:47 +00:00
psi29a
4340142c22
Merge branch 'macosx_gitlab' into 'master'
...
give qt5 a show for brew
See merge request OpenMW/openmw!636
2021-03-05 12:46:32 +00:00
Bret Curtis
9fbb530dde
be explicit and print version information to verification
2021-03-05 13:25:46 +01:00
Bret Curtis
53cb20454f
add path hack only to verify, will remove later
2021-03-05 13:20:03 +01:00
Bret Curtis
f03beb7963
uninstall qt@6
2021-03-05 13:12:42 +01:00
Bret Curtis
8fc0f965bb
which qmake?
2021-03-05 13:10:22 +01:00
Bret Curtis
87ede9284b
be more explicit
2021-03-05 13:08:38 +01:00
Bret Curtis
17059cefea
give qt@5 a try
2021-03-05 13:07:26 +01:00
Bret Curtis
caa8b0ca1a
give qt5 a show for brew
2021-03-05 13:03:21 +01:00
Andrei Kortunov
7cc97297e7
Merge pull request #3048 from akortunov/master
...
Fix formatting in the groundcover docs
2021-03-05 14:29:40 +04:00
Andrei Kortunov
41b3090a49
Fix formatting in the groundcover docs
2021-03-05 14:27:01 +04:00
Evil Eye
8ae4ee291f
Attempt to fix restocking items in old saves
2021-03-04 22:52:03 +01:00
psi29a
d990c425b8
Merge branch 'recastnavigation_custom_path' into 'master'
...
Support custom path for recastnavigation
See merge request OpenMW/openmw!635
2021-03-04 18:12:28 +00:00
elsid
b9575180b5
Support custom recastnavigation system path
2021-03-04 18:13:13 +01:00
elsid
b47573f36b
Fix recastnavigation debug library suffixes
2021-03-04 18:12:08 +01:00
Bret Curtis
741584472e
another cleanup to FindRecastNavigation.cmake
2021-03-04 10:39:54 +01:00
AnyOldName3
da1d7d7480
Merge branch 'effect_icons' into 'master'
...
Reset effect icon transparency when they're hidden (#5877 )
Closes #5877
See merge request OpenMW/openmw!633
2021-03-03 20:16:35 +00:00
Dobrohotov Alexei
fc329050b3
AIPursue: Pursue the player until LOS is established ( #5869 )
2021-03-03 22:06:58 +03:00
Alexei Dobrohotov
5e91af230d
Reset effect icon transparency when they're hidden ( #5877 )
2021-03-03 21:17:59 +03:00
psi29a
54a7048eed
Merge branch 'recast_cmake' into 'master'
...
initial attempt at FindRecastNavigation.cmake
See merge request OpenMW/openmw!617
2021-03-03 11:47:31 +00:00
Bret Curtis
2bc5a44e15
Added copyright, refactored to be more clear and marked certain things as advanced.
2021-03-03 11:38:28 +01:00
Bret Curtis
c4064fca0c
include feedback and add DebugUtils and Detour
2021-03-02 23:11:06 +01:00
Bret Curtis
ed74834e01
put back the recast stuff
2021-03-02 22:48:17 +01:00
Bret Curtis
28cb14289a
initial attempt at FindRecastNavigation.cmake
2021-03-02 22:48:17 +01:00
psi29a
787a976fb8
Merge branch 'mygui-upgrade' into 'master'
...
MyGUI 3.4.1 compatibility
Closes #5806
See merge request OpenMW/openmw!560
2021-03-02 16:39:57 +00:00
Gleb Mazovetskiy
8a1644885b
MyGUI: Bump version to 3.4.1
...
Also set MYGUI_DONT_USE_OBSOLETE
2021-03-02 13:26:23 +00:00
Gleb Mazovetskiy
4495b67d77
MyGUI HEAD compatibility
...
Makes OpenMW compatible with the current MyGUI HEAD at:
f93d4fb614#5806
2021-03-02 13:24:30 +00: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
Gleb Mazovetskiy
044e784072
gl4es: Delay feature detection until a context exists
...
gl4es feature detection does not work reliably with EGL.
If a context already exists, gl4es can instead reliably detect
the underlying GLES features from the context itself.
This requires gl4es to be configured with:
-DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON
This also requires gl4es to have this fix: https://github.com/ptitSeb/gl4es/pull/271
2021-02-28 07:59:48 +00: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
46a1715d8a
Actually return something
2021-02-26 20:10:58 +00:00
AnyOldName3
16e8cf89af
Fix compilation of tests with MSVC
2021-02-26 20:10:03 +00:00
AnyOldName3
f5a87ee46d
Refactor out duplicated RTT setup code
2021-02-26 19:01:27 +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
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
