29045 Commits

Author SHA1 Message Date
psi29a
ba58a322e4 Merge branch 'no_shiny_rocks' into 'master'
Only reflect spells that have a caster

Closes #6969

See merge request OpenMW/openmw!2349

(cherry picked from commit ca90b53c30a60a714240aba35a333e7179034f44)

7729ef2e Only reflect spells that have a caster
2022-08-30 07:41:57 +00:00
AnyOldName3
4bb88a4a75 Merge branch 'light_fix' into 'master'
Fix incorrect scene lighting #6952

See merge request OpenMW/openmw!2335

(cherry picked from commit 1d177e2d71adcccc6565d97c4a4f27ef27d30b54)

1f2d9f22 don't recycle statesets for light cullcallback for now
2022-08-27 01:03:40 +00:00
psi29a
af14e4d7cd Merge branch 'fix_recast_mesh_collision_shapes_48' into 'openmw-48'
Do not use collision shapes with visual only collision to generate navmesh (for 0.48)

See merge request OpenMW/openmw!2337
2022-08-25 09:28:03 +00:00
psi29a
cc0df8f43c Merge branch 'remove_forgotten_code' into 'master'
Remove forgotten commented-out debugging code

See merge request OpenMW/openmw!2319

(cherry picked from commit d9ea6e36fa3f408236dc3beb7a5b29fcf7db292a)

59a0d9c0 Update files/data/shaders/bloomlinear.omwfx
09a39c87 Remove more unused code
2022-08-25 08:56:06 +00:00
elsid
01b3938935
Do not use collision shapes with visual only collision to generate navmesh
These collision shapes are not used for actors movement physics simulation.
2022-08-25 09:48:06 +02:00
psi29a
649ca6b8e6 Merge branch 'scroll_indices' into 'master'
Properly transform item ID to enchantment ID

Closes #6959

See merge request OpenMW/openmw!2328

(cherry picked from commit f1e95ad615328274ce76b674cd4a65383f7d8014)

2b9d475e Fix #6959
2022-08-22 17:18:30 +00:00
psi29a
ada64daf87 Merge branch 'cherry-pick-0dacbaf31a5e0703c49eead6d6a977a28ec299f3' into 'master'
ActionManager::toggleMainMenu() should close PostProcessor HUD

See merge request OpenMW/openmw!2305

(cherry picked from commit bf0865d03da97e876d5f004774ab3e395fd02e37)

642d0ad6 ActionManager::toggleMainMenu() should close PostProcessor HUD.
2022-08-21 20:16:57 +00:00
psi29a
03e24b1e70 Merge branch 'apple-silicon-arm-build' into 'master'
Get build working on Apple Silicon

See merge request OpenMW/openmw!2286

(cherry picked from commit 36fbef10480ec204cd4f29ad3e1732a7c0af925f)

1d7d3d57 Get build working on Apple Silicon
808a2e58 Merge commit '5ee4ce1232b0f334f29dd702f811c58dccf5c00d' into apple-silicon-arm-build
a61237f2 Cleaned up macOS FFmpeg framework linking
2022-08-21 20:15:14 +00:00
psi29a
2f1b4eb699 Merge branch 'cherry-pick-31f0ef45d2bb53e0969962f23eb29350465993dd' into 'master'
Show a message if player attempts to access postprocessor hud when postprocessing is disabled.

See merge request OpenMW/openmw!2306

(cherry picked from commit 0889635dc73c0f51e2a675469bfb75236c6c2fe7)

5863790c Show a message if player attempts to access postprocessor hud when postprocessing is disabled
2022-08-21 20:13:26 +00:00
psi29a
77beaf5bc6 Merge branch 'font_loading' into 'master'
Cleanup fonts loading

See merge request OpenMW/openmw!2309

(cherry picked from commit f36e13444e7e2f99c528fbd8a0cb09edefd08417)

9e1ab590 Cleanup fonts loading
2022-08-21 20:11:15 +00:00
psi29a
2795097907 Merge branch 'consistently_hostile' into 'master'
Clear the magic queue when unloading actors

Closes #6954

See merge request OpenMW/openmw!2317

(cherry picked from commit 7c899364af0c047dfddaf5280aa1d43f3b95d8fd)

afcbb3cb Clear the magic queue when unloading actors
443420ea CI compare cells
2022-08-21 20:06:07 +00:00
AnyOldName3
d262ca2d30 Merge branch 'cherry-pick-abb14df943304a954f734b6289fb48f4951ae242' into 'master'
[Multiview][Postprocessor] omw_GetWorldPosFromUV() should use omw_GetDepth()

See merge request OpenMW/openmw!2320

(cherry picked from commit 23e765954d29afbedf15c31c6ca3d9e4a539c6d7)

70e1efdd omw_GetWorldPosFromUV() should use omw_GetDepth()
2022-08-21 17:48:20 +00:00
psi29a
071b66999d Merge branch 'bloom_shader' into 'master'
Add wareya's linear bloom shader

See merge request OpenMW/openmw!2313

(cherry picked from commit 537c6e96abc4952a6c93eeedd6eecfaf7344809d)

534f0377 Add wareya's linear bloom shader
84c72b1c Add dots at the end, and add the .ru translation
2022-08-21 12:54:00 +00:00
psi29a
19df671bba Merge branch 'effect_indices' into 'master'
Preserve effect indices when applying AoE and targeted spells

Closes #6957

See merge request OpenMW/openmw!2315

(cherry picked from commit 5ed9764f3be47fba2d3097bd9d016863b56f88ab)

a5476082 Preserve effect indices when applying AoE and targeted spells
2022-08-21 12:04:01 +00:00
psi29a
b2d0b3da93 Merge branch 'unique_summons' into 'master'
Mark summon effects as applied if they have spawned a creature

Closes #6955

See merge request OpenMW/openmw!2316

(cherry picked from commit 8ec8e733a161d75000c434dd40a023eb8b6a40fc)

8b02c17a Mark summon effects as applied if they have spawned a creature
2022-08-21 12:02:52 +00:00
psi29a
b21c9cdf31 Merge branch 'SHADER_HOT_RELOAD' into 'master'
Shaders: Hot reload, togglable by lua debug command

See merge request OpenMW/openmw!2238

(cherry picked from commit 4078f19c741685b7120c636108de7ded1ae6dbfd)

8d194a16 Shaders: rudimentary hot reloader on shaders
4e7c1c5b Added break when the operation failed
6b38d622 Added lua bindings to toggle hot reload (disabled by default) or to trigger a reload
31d41252 forgot memory include
f78fa989 fixed include, cleaned comments and indentation
fc8838c7 Renamed lua binding, and use action to avoid concurrency issue
aa51d6de Missing chrono include ?
68d06989 Fixed cyclical included check
b6d7293a Removed weird lines that I thought were necessary to please the compiler
9a475b0c fixed blank lines and missing breaks
cdd95f78 replaced empty function body by default
a1c8dc9d C++17 compat ?
7b78bf4b Fix files with different defines weren't added to the hot reload manager
cc9d4364 includes now work when the same shader has different defines
15751c57 Lua debug api doc
3ab0a991 Hot reload done only once every 200 ms, no point in beeing faster
df69fc76 Post processing shaders now use the same lua commands, no more launcher option...
c71f3508 changed overview.rst of post processing
603b30e1 Added some variable names to make it clearer what their function was
baadc06e Merge branch 'master' into 'SHADER_HOT_RELOAD'
decfbc53 Fix threading issues
b14cc673 adds missing decleration
16a4b571 adds missing include
166717d6 Makes sure threads are only stopped once ,and that they will be re-started
25c1f0ca Renamed variable to fix case issue
2022-08-21 09:10:29 +00:00
psi29a
c4dd9d40fe Merge branch 'dont-look-back-in-anger-or-look-backwards-at-all-really' into 'master'
Validate near and far clip distances

See merge request OpenMW/openmw!2311

(cherry picked from commit 510eac3fb427ad1ff4c1201b6b7312b9abb91ad1)

17c10537 Validate near and far clip distances
2022-08-20 18:34:04 +00:00
psi29a
d88b34131a Merge branch 'boost180' into 'master'
Bump boost to 1.80 for windows

Closes #6942

See merge request OpenMW/openmw!2304

(cherry picked from commit 9f26d6023b76ba2201174ca51d564a33f30fd483)

448853fb Update CI/before_script.msvc.sh
2022-08-19 22:40:37 +00:00
psi29a
5e76c124a7 Merge branch 'font_fixes' into 'master'
Font fixes

See merge request OpenMW/openmw!2297

(cherry picked from commit 7bb1856b74e54973d00bb2e4c777baf057f4a8ac)

c3d3f314 Allow to change font settings in the launcher
2cd2b42e Improve handling of larger font size
2cae8bea Improve layout of Interface tab
3117a993 Fix documentation
2022-08-18 12:53:54 +00:00
psi29a
33d85635fd Merge branch 'terraindocs' into 'master'
Clarify object paging merge factor docs (#5924)

Closes #5924

See merge request OpenMW/openmw!2295

(cherry picked from commit 0d776d7009cbacbce7c234e6653f3b5333e10eed)

15f4b551 Clarify object paging merge factor docs
2022-08-18 08:59:50 +00:00
psi29a
18de21cf13 Update CHANGELOG.md 2022-08-17 23:30:41 +02:00
psi29a
bbfc573b15 Merge branch 'windows_save' into 'master'
[Postprocessing] Mitigate clashes with live reload and external saves on windows

See merge request OpenMW/openmw!2237

(cherry picked from commit 92f3b4ba82e96d53e36212d3e824de4d13551552)

0f9a7594 wait a brief moment before reading a file marked as modified
2022-08-17 21:19:36 +00:00
psi29a
341161ba03 Merge branch 'fontconfig' into 'master'
Allow users to decide if they need to import bitmap fonts

See merge request OpenMW/openmw!2270

(cherry picked from commit 1e4dd46688f8a70e5b3837db1f1f5a61fa50dbd9)

43f552f4 Allow users to decide if they need to import bitmap fonts
2022-08-17 21:16:56 +00:00
psi29a
f45bb18614 Merge branch 'swedish-i10n-0-48' into 'master'
Updated Swedish strings for built-in shaders

See merge request OpenMW/openmw!2284

(cherry picked from commit 2a892a2525e3450ab36b347dfb68a6997d51f043)

b3b16284 Update BuiltInShaders/sv.yaml
2022-08-17 20:09:38 +00:00
psi29a
efa4b52e9a Comment out flatpack build for now. 2022-08-17 09:01:46 +02:00
psi29a
3fdb2201b4 Merge branch 'cherry-pick-856fcb77' into 'openmw-48'
Merge branch 'FlatpakCI' into 'master' flatpack RC1

See merge request OpenMW/openmw!2285
2022-08-16 10:58:39 +00:00
psi29a
fda1127b5c Merge branch 'FlatpakCI' into 'master'
Flatpak CI Build

See merge request OpenMW/openmw!2066

(cherry picked from commit 856fcb77422b1dd5414a7ab9b5e0a773dec3d54a)

274ad078 add flatpak ci
2022-08-16 10:55:40 +00:00
psi29a
d444b1b350 Merge branch 'coverity' into 'master'
Do not copy data when it is not needed

See merge request OpenMW/openmw!2277

(cherry picked from commit f42ab6a3e754406bde34d493786ce92f98370f49)

e3ad30a5 Do not copy data when it is not needed
2022-08-16 07:27:29 +00:00
psi29a
cc27baec62 Merge branch 'update-windows-deps' into 'openmw-48'
Update OSGoS dependency package

See merge request OpenMW/openmw!2278
2022-08-16 07:18:58 +00:00
Alexander Olofsson
149d0b2f29
Increment CI cache key for Windows builds 2022-08-15 23:52:29 +02:00
Alexander Olofsson
619bb73d44
Add lost backslash 2022-08-15 10:36:46 +02:00
Alexander Olofsson
944e748971
Use the correct debug-suffixes for dependencies 2022-08-15 10:23:06 +02:00
Alexander Olofsson
14663b8314
Update OSGoS dependency package 2022-08-15 10:15:29 +02:00
psi29a
df3ebf6b87 Merge branch 'cs-tables-doc-fix' into 'master'
OpenMW-CS tables doc polish

See merge request OpenMW/openmw!2269
2022-08-14 09:54:55 +02:00
psi29a
15ed99be5b Merge branch 'sky-doc-small-fixes' into 'master'
Better wording and formatting of the Sky Structure doc

See merge request OpenMW/openmw!2265
2022-08-12 12:05:11 +02:00
psi29a
0fb2c96a69 Merge branch 'stagger' into 'openmw-48'
Stagger fixes, 0.48.0 edition

See merge request OpenMW/openmw!2259
2022-08-10 16:16:18 +00:00
Alexei Kotov
2f5f2bdbad Stagger fixes, 0.48.0 edition 2022-08-10 17:30:43 +03:00
psi29a
f61cc5c60c Merge branch 'changelog2' into 'master'
Additional fixes for 0.48 changelog

See merge request OpenMW/openmw!2257
2022-08-10 12:06:17 +02:00
psi29a
bc79de4934 Merge branch 'sheerheartattackhasnoweaknesses' into 'master'
Animation regression fixes

See merge request OpenMW/openmw!2255
2022-08-10 09:56:03 +02:00
psi29a
cec1429c0f Merge branch 'cleanup' into 'master'
#5534 remove OSG 3.4 support and require at least 3.6.5 support

Closes #3180 and #5534

See merge request OpenMW/openmw!2228
2022-08-09 23:08:37 +02:00
psi29a
105be76d81 Merge branch 'localization-fr-1' into 'openmw-48'
French i10n translations

See merge request OpenMW/openmw!2250
2022-08-09 18:01:33 +00:00
Arnaud Dochain
5f69af582e French i10n translations 2022-08-09 18:01:33 +00:00
psi29a
0339e32c0c Merge branch 'ubb_fix' into 'master'
Remove excessive allocations in lightmanager

See merge request OpenMW/openmw!2251
2022-08-09 11:03:51 +02:00
psi29a
69654b6697 Merge branch 'revert_active' into 'master'
Revert traversal mode to default

See merge request OpenMW/openmw!2249
2022-08-07 16:23:19 +00:00
psi29a
6ee20835fc Merge branch 'main_pp' into 'master'
[Postprocessing] Remove default shader and simplify pipeline

Closes #6920

See merge request OpenMW/openmw!2248
2022-08-07 14:50:08 +00:00
cody glassman
ac4b29be08 cleanup default shaders and remove confusing main shader 2022-08-07 06:42:48 -07:00
psi29a
e75d3285cf Merge branch 'paged_refs_vector' into 'master'
Use std::vector to store paged ref nums

See merge request OpenMW/openmw!2245
2022-08-07 13:35:54 +00:00
psi29a
6d7216adba Merge branch 'coverity' into 'master'
Use ubuntu:20.04 docker image for Coverity

See merge request OpenMW/openmw!2244
2022-08-07 09:47:20 +00:00
cody glassman
c770c462e4 revert traversal nodes, discovered to break some NIFs with UV controllers 2022-08-06 11:39:23 -07:00
Alexei Kotov
bc1a6bfd72 Merge branch 'changelog' into 'master'
Cleanup 0.48 changelog

See merge request OpenMW/openmw!2247
2022-08-06 15:43:12 +00:00