Commit Graph

29165 Commits (openmw-48)
 

Author SHA1 Message Date
psi29a 7b3adff1c5 Merge branch 'stereo_fix' into 'master'
Fix stereo crash in the editor

Closes #7019

See merge request OpenMW/openmw!2431

(cherry picked from commit e9cfc2381f)

890be1b5 Fix crash in the editor
2 years ago
psi29a 779ec6e55c Merge branch 'recall_how_to_recall' into 'master'
Prevent recursive calls to ActiveSpells::update

Closes #7022

See merge request OpenMW/openmw!2426

(cherry picked from commit d38c072030)

d3253cb6 Prevent recursive calls to ActiveSpells::update
2 years ago
psi29a 960934afee Merge branch 'force-lua-5.1' into 'openmw-48'
Enforce Lua 5.1 when LuaJIT is not being used (OpenMW 0.48)

See merge request OpenMW/openmw!2410
2 years ago
AnyOldName3 87eaa38cf7 Merge branch 're-sign-mac-applications' into 'master'
Re-sign Mac Applications before creating install package

See merge request OpenMW/openmw!2418

(cherry picked from commit 1dd392d33d)

52501b7b Re-sign Mac Applications before creating install package
e4f04390 Merge commit 'cd8b20439ec707574826679a8f851546c78e294e' into re-sign-mac-applications
71f6f950 Make Mac Plugins osgPlugins symlink relative
9f7e1324 Made CMake 3.19 requirement specific to macOS app packaging.
2 years ago
psi29a 1bf3d6b01a Merge branch 'levelincrease' into 'master'
Update both instances of level detail text

See merge request OpenMW/openmw!2282

(cherry picked from commit 1d270e1683)

a4427235 Update both instances of level detail text
2 years ago
psi29a 4d16af29ba Merge branch 'fix_shader_prefix' into 'master'
Use nv_default shader prefix for unhandled types

See merge request OpenMW/openmw!2419

(cherry picked from commit 92680ab9cf)

63b51ead Use nv_default shader prefix for unhandled types
2 years ago
psi29a 847e2bbeaf Merge branch 'fix_reserved_nodes' into 'master'
Add missing non-prefixed reserved nodes

See merge request OpenMW/openmw!2414

(cherry picked from commit cd8b20439e)

ac01fd5e Add missing non-prefixed reserved nodes
2 years ago
Andrew Dunn fe59b9a92a Enforce Lua 5.1 when LuaJIT is not being used
Later minor version bumps of Lua somehow break a lot of our code, this
will fix things like 3rd person mode, crosshair etc for the Apple
Silicon build
2 years ago
psi29a 9bed210e4e Merge branch 'fix_reserved_names_init' into 'master'
Initialize reserved names once to avoid race condition (#7008)

Closes #7008

See merge request OpenMW/openmw!2409

(cherry picked from commit 16fd01a765)

8068d015 Initialize reserved names once to avoid race condition
2 years ago
psi29a b710cf872a Merge branch 'revert_filesystem' into 'openmw-48'
Revert std::filesystem for 0.48

See merge request OpenMW/openmw!2405
2 years ago
Andrei Kortunov d313431e43 Revert std::filesystem usages 2 years ago
elsid d9a6350c5e Limit AiWander destination by wander distance
From initial actor position.

findRandomPointAroundCircle may return a position outside given range. Use
raycast to choose a different reachable point within a radius but double check
and discard if it's still outside.

Use wander radius instead of wander distance for findRandomPointAroundCircle to
have better chance for a position to be inside wander distance.
2 years ago
psi29a 85f343e87a Merge branch 'fix_lua_color' into 'openmw-48'
Make r, g, b, a read-only properties, rather than getters

See merge request OpenMW/openmw!2380
2 years ago
uramer 19d01f26d6 Make r, g, b, a read-only properties, rather than getters 2 years ago
psi29a 64d925eace Merge branch 'font_cleanup' into 'master'
Revert changes in the progress bars layout

See merge request OpenMW/openmw!2366

(cherry picked from commit 5815faecda)

cbe923ea Revert changes in the progress bars layout
2 years ago
jvoisin 6863b2586c Merge branch 'bloom-shader-localisation' into 'master'
Bloom shader (MR2313) french localisation

See merge request OpenMW/openmw!2347

(cherry picked from commit 2ee36c2d8f)

297952bb Add lines to be translated
b8d32986 Bloom shader translation, first pass
d911e992 Missing acute accents
d58f94e5 Other typos
2 years ago
psi29a 30b05203b8 Merge branch 'bloom_options_fix' into 'master'
Fix bloomlinear options

See merge request OpenMW/openmw!2356

(cherry picked from commit 20186fd2c2)

7344a176 Fix bloomlinear options
2 years ago
psi29a d335989f11 Merge branch 'fonts-48' into 'openmw-48'
Backport fonts fixes to 0.48

See merge request OpenMW/openmw!2352
2 years ago
Andrei Kortunov d38454a125 Backport fonts fixes to 0.48 2 years ago
psi29a c3980bebf8 Merge branch 'load_menu' into 'master'
Enlarge character selection widget

See merge request OpenMW/openmw!2350

(cherry picked from commit a0029cb512)

8bac073f Enlarge character selection menu to fit long character or class names
2 years ago
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 ca90b53c30)

7729ef2e Only reflect spells that have a caster
2 years ago
AnyOldName3 4bb88a4a75 Merge branch 'light_fix' into 'master'
Fix incorrect scene lighting #6952

See merge request OpenMW/openmw!2335

(cherry picked from commit 1d177e2d71)

1f2d9f22 don't recycle statesets for light cullcallback for now
2 years ago
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
2 years ago
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 d9ea6e36fa)

59a0d9c0 Update files/data/shaders/bloomlinear.omwfx
09a39c87 Remove more unused code
2 years ago
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.
2 years ago
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 f1e95ad615)

2b9d475e Fix #6959
2 years ago
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 bf0865d03d)

642d0ad6 ActionManager::toggleMainMenu() should close PostProcessor HUD.
2 years ago
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 36fbef1048)

1d7d3d57 Get build working on Apple Silicon
808a2e58 Merge commit '5ee4ce1232b0f334f29dd702f811c58dccf5c00d' into apple-silicon-arm-build
a61237f2 Cleaned up macOS FFmpeg framework linking
2 years ago
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 0889635dc7)

5863790c Show a message if player attempts to access postprocessor hud when postprocessing is disabled
2 years ago
psi29a 77beaf5bc6 Merge branch 'font_loading' into 'master'
Cleanup fonts loading

See merge request OpenMW/openmw!2309

(cherry picked from commit f36e13444e)

9e1ab590 Cleanup fonts loading
2 years ago
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 7c899364af)

afcbb3cb Clear the magic queue when unloading actors
443420ea CI compare cells
2 years ago
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 23e765954d)

70e1efdd omw_GetWorldPosFromUV() should use omw_GetDepth()
2 years ago
psi29a 071b66999d Merge branch 'bloom_shader' into 'master'
Add wareya's linear bloom shader

See merge request OpenMW/openmw!2313

(cherry picked from commit 537c6e96ab)

534f0377 Add wareya's linear bloom shader
84c72b1c Add dots at the end, and add the .ru translation
2 years ago
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 5ed9764f3b)

a5476082 Preserve effect indices when applying AoE and targeted spells
2 years ago
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 8ec8e733a1)

8b02c17a Mark summon effects as applied if they have spawned a creature
2 years ago
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 4078f19c74)

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
2 years ago
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 510eac3fb4)

17c10537 Validate near and far clip distances
2 years ago
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 9f26d6023b)

448853fb Update CI/before_script.msvc.sh
2 years ago
psi29a 5e76c124a7 Merge branch 'font_fixes' into 'master'
Font fixes

See merge request OpenMW/openmw!2297

(cherry picked from commit 7bb1856b74)

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
2 years ago
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 0d776d7009)

15f4b551 Clarify object paging merge factor docs
2 years ago
psi29a 18de21cf13 Update CHANGELOG.md 2 years ago
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 92f3b4ba82)

0f9a7594 wait a brief moment before reading a file marked as modified
2 years ago
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 1e4dd46688)

43f552f4 Allow users to decide if they need to import bitmap fonts
2 years ago
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 2a892a2525)

b3b16284 Update BuiltInShaders/sv.yaml
2 years ago
psi29a efa4b52e9a Comment out flatpack build for now. 2 years ago
psi29a 3fdb2201b4 Merge branch 'cherry-pick-856fcb77' into 'openmw-48'
Merge branch 'FlatpakCI' into 'master' flatpack RC1

See merge request OpenMW/openmw!2285
2 years ago
psi29a fda1127b5c Merge branch 'FlatpakCI' into 'master'
Flatpak CI Build

See merge request OpenMW/openmw!2066

(cherry picked from commit 856fcb7742)

274ad078 add flatpak ci
2 years ago
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 f42ab6a3e7)

e3ad30a5 Do not copy data when it is not needed
2 years ago
psi29a cc27baec62 Merge branch 'update-windows-deps' into 'openmw-48'
Update OSGoS dependency package

See merge request OpenMW/openmw!2278
2 years ago
Alexander Olofsson 149d0b2f29
Increment CI cache key for Windows builds 2 years ago