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
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
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
elsid
bc67669a97
Comment unused argument
2021-02-15 00:22:48 +01:00
elsid
4983684fda
Fix implicit int to float conversion warning
2021-02-15 00:20:15 +01:00
elsid
bb0c478954
Add missing include and use std malloc and free
2021-02-15 00:20:15 +01:00
elsid
3a9b1ce63a
Use camel case for local constant
2021-02-15 00:20:14 +01:00
elsid
a7fe6c7ba1
Move duplicated usage patter of dtNavMeshQuery::findNearestPoly into a separate function
2021-02-14 23:54:59 +01:00
elsid
d3ab6c972f
Avoid set unused position from dtNavMeshQuery::findNearestPoly result
2021-02-14 23:54:59 +01:00
AnyOldName3
6291b9304b
Log when icon is missing and fallback is used
2021-02-14 16:56:21 +00:00
AnyOldName3
70a059d4bf
Use different filenames for Engine and CS packages
2021-02-14 16:31:16 +00:00
Petr Mikheev
4d3df56bf3
Merge branch 'wizard_morrowind_bsa' into 'master'
...
Wizard: Display an error if Morrowind.bsa is missing
See merge request OpenMW/openmw!571
2021-02-14 10:25:25 +00:00
psi29a
6c487c539e
Merge branch 'static-ci-filename' into 'master'
...
Give binaries static filename
See merge request OpenMW/openmw!607
2021-02-14 09:42:07 +00:00
uramer
e7afbc74d8
Wizard: Only allow to select Morrowind.esm master files, display an error if Morrowind.bsa is missing
2021-02-14 10:34:13 +01:00
AnyOldName3
5e5c0a1d89
Add branch name back to filename
...
The URL needs to contain the branch name anyway, so there's no point
removing it.
2021-02-13 00:28:18 +00:00
AnyOldName3
d47bd54bb5
Merge branch 'move_warning' into 'master'
...
Remove a new warning
See merge request OpenMW/openmw!606
2021-02-12 19:53:21 +00:00
AnyOldName3
0736fec148
Give binaries static filename
2021-02-12 19:21:07 +00:00
fredzio
c4e909c29e
Silence a clang warning:
...
warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
2021-02-12 19:36:03 +01:00
fredzio
9d90e250cf
Physics is not running while paused, so zero the stats for the async
...
thread instead of keeping whatever value was before the pause.
2021-02-12 19:33:08 +01:00
fredzio
bc4047d815
Update engine stats for all levels above first, not only at the second.
2021-02-12 19:03:02 +01:00
psi29a
5566f2b06b
Merge branch 'optimise-groundcover-lighting' into 'master'
...
Optimise groundcover lighting
See merge request OpenMW/openmw!600
2021-02-11 20:49:45 +00:00
psi29a
57fba8c070
Merge branch 'door_to_nothingness' into 'master'
...
Fallback to default cell name for door destination
Closes #5838
See merge request OpenMW/openmw!591
2021-02-11 08:22:47 +00:00
AnyOldName3
c97980a0f6
Don't force linker to work with doubly-defined symbols
2021-02-11 01:35:32 +00:00
Evil Eye
2e73d2c145
Fallback to default cell name for door destination
2021-02-10 22:13:04 +01:00
psi29a
c33b2e0100
Merge branch 'dehardcodebaseanim' into 'master'
...
Dehardcode Base_animation and improve Collada support
See merge request OpenMW/openmw!510
2021-02-10 16:29:47 +00:00
AnyOldName3
f8f6d63d4c
Optimise groundcover lighting
2021-02-09 21:56:21 +00:00
Alexei Dobrohotov
a884146878
Merge branch 'master' into 'master'
...
Add unit test for swapEndiannessInplace(). Part of Bug #5837
See merge request OpenMW/openmw!598
2021-02-09 20:34:39 +00:00
Sergey Fukanchik
f3271cb66b
Add unit test for swapEndiannessInplace(). Part of Bug #5837
2021-02-09 13:09:36 -05:00
psi29a
e2ec3b0db7
Merge branch 'missing-inventory-icon' into 'master'
...
Use default icon.tga when inventory icon is missing
Closes #4977
See merge request OpenMW/openmw!596
2021-02-08 08:43:54 +00:00
AnyOldName3
034a7a9dbc
Add changelog entry
2021-02-07 23:45:53 +00:00
AnyOldName3
da6223fc4b
Use default icon.tga when inventory icon is missing
2021-02-07 23:27:45 +00:00
psi29a
4b7d00530d
Merge branch 'freeunrealestate' into 'master'
...
Don't check magicka when casting free spells
Closes #5841
See merge request OpenMW/openmw!589
2021-02-07 21:54:52 +00:00
psi29a
7a9eb34403
Merge branch 'master' into 'freeunrealestate'
...
# Conflicts:
# CHANGELOG.md
2021-02-07 21:03:51 +00:00
psi29a
31f41836a1
Merge branch 'no_stuck_in_proj' into 'master'
...
Don't let projectiles push actors out of the world (#5802 )
See merge request OpenMW/openmw!595
2021-02-07 20:37:46 +00:00
psi29a
21a6922caa
Merge branch 'shieldispain' into 'master'
...
Play damage sound when hurt by elemental shields
Closes #5840
See merge request OpenMW/openmw!594
2021-02-07 20:34:36 +00:00
fredzio
b78820de55
Ignore projectiles inside of MovementSolver::unstuck. It is normal for actors to be inside of a
...
projectile collision shape.
A side effect of moving actors outside of projectile collision shape is that if both the actor and the projectile are
near a wall, the actor could get moved outside of the world.
2021-02-07 18:32:03 +01:00
Evil Eye
997ff37301
Merge branch 'very_minor_docs_change' into 'master'
...
Update 'toggle sneak' documentation
Closes #5844
See merge request OpenMW/openmw!593
2021-02-07 13:04:20 +00:00
Evil Eye
af0f94f03e
Play damage sound when hurt by elemental shields
2021-02-07 12:55:10 +01:00
Jonas Tobias Hopusch
39c2c19dae
Update 'toggle sneak' documentation
...
The docs now correctly say that this setting can be changed in the launcher,
instead of insisting it's a config-file-only setting.
Closes #5844
Signed-off-by: Jonas Tobias Hopusch <jotoho-git@mailbox.org>
2021-02-07 12:53:06 +01:00
psi29a
9bd77e7d2c
Merge branch 'fix_swap_endianness' into 'master'
...
Fix implementation of Misc::swapEndiannessInplace
See merge request OpenMW/openmw!592
2021-02-07 11:26:32 +00:00
Evil Eye
f1caeea444
Don't return negative values from GetMagicka
2021-02-07 11:58:23 +01:00
Petr Mikheev
31b5150e0d
Fix implementation of Misc::swapEndiannessInplace
2021-02-07 09:12:38 +01:00
Evil Eye
e4cd89643f
Merge branch 'master' of gitlab.com:OpenMW/openmw into freeunrealestate
2021-02-07 00:17:14 +01:00
