1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 21:45:35 +00:00
Commit graph

29126 commits

Author SHA1 Message Date
psi29a
fedd9191d5 Merge branch 'fix_reset_animation_48' into 'openmw-48'
Fix resetting player's animation on game loading (#7030) (0.48)

See merge request OpenMW/openmw!2449
2022-10-02 13:44:43 +00:00
elsid
70fe539ee4
Fix resetting player's animation on game loading
When game is loaded player's animation is replaced by a new object. Old object
is destructed without explicit removeFromScene call.
2022-10-02 13:59:08 +02:00
psi29a
37ee7170cb Merge branch 'lua_stats_used_memory_48' into 'openmw-48'
Report used memory by Lua interpreter (0.48)

See merge request OpenMW/openmw!2445
2022-09-30 11:42:02 +00:00
elsid
a74b842e16
Report used memory by Lua interpreter 2022-09-30 12:15:57 +02:00
elsid
ff44c96118
Adjust initial distance when destination is changed for obstacle check
Changed destination may create a situation when the distance actor moved between
2 update calls is less than initial distance because destination has been changed.
This forces actor to take evasive action when there is no actual obstacle.
2022-09-28 22:02:41 +02:00
AnyOldName3
b9585b8a80 Merge branch 'upgrade_sdl_windows' into 'master'
bump sdl from 2.0.22 to 2.0.24 for windows

Closes #6924

See merge request OpenMW/openmw!2425

(cherry picked from commit 483f370b01)

4c5c449b bump sdl from 2.0.22 to 2.0.24 for windows
36b4e692 Update CI/before_script.msvc.sh
ef92281b Update CI/before_script.msvc.sh
3c173646 Update CI/before_script.msvc.sh
2022-09-26 10:46:07 +00:00
Alexei Kotov
022f245150 Merge branch 'count48' into 'openmw-48'
Improve item count handling (0.48)

See merge request OpenMW/openmw!2436
2022-09-25 16:50:37 +00:00
psi29a
73f69ea37f Merge branch 'appendIndex48' into 'openmw-48'
Fix topic infos creation

See merge request OpenMW/openmw!2435
2022-09-25 15:29:07 +00:00
Andrei Kortunov
3f72432c9f Make count input box larger to fit larger text 2022-09-25 18:42:36 +04:00
Andrei Kortunov
f3aebf22dd Improve item count handling 2022-09-25 18:22:52 +04:00
Andrei Kortunov
d00fc845c0 Fix topic infos creation 2022-09-25 18:16:28 +04:00
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
2022-09-25 13:32:56 +00:00
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
2022-09-25 13:30:20 +00:00
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
2022-09-22 07:52:10 +00:00
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.
2022-09-22 07:50:39 +00:00
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
2022-09-20 08:58:40 +00:00
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
2022-09-19 08:19:03 +00:00
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
2022-09-16 17:23:45 +00:00
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
2022-09-16 08:39:45 +10:00
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
2022-09-15 22:09:21 +00:00
psi29a
b710cf872a Merge branch 'revert_filesystem' into 'openmw-48'
Revert std::filesystem for 0.48

See merge request OpenMW/openmw!2405
2022-09-15 14:53:42 +00:00
Andrei Kortunov
d313431e43 Revert std::filesystem usages 2022-09-15 14:14:52 +04:00
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.
2022-09-12 11:03:27 +02:00
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
2022-09-07 21:02:32 +00:00
uramer
19d01f26d6 Make r, g, b, a read-only properties, rather than getters 2022-09-07 21:17:24 +02:00
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
2022-09-05 08:28:57 +00:00
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
2022-09-03 20:56:09 +00:00
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
2022-09-01 22:36:28 +00:00
psi29a
d335989f11 Merge branch 'fonts-48' into 'openmw-48'
Backport fonts fixes to 0.48

See merge request OpenMW/openmw!2352
2022-08-30 21:08:54 +00:00
Andrei Kortunov
d38454a125 Backport fonts fixes to 0.48 2022-08-30 21:08:54 +00:00
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
2022-08-30 07:43:19 +00:00
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
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 1d177e2d71)

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 d9ea6e36fa)

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 f1e95ad615)

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 bf0865d03d)

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 36fbef1048)

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 0889635dc7)

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 f36e13444e)

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 7c899364af)

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 23e765954d)

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 537c6e96ab)

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 5ed9764f3b)

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 8ec8e733a1)

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 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
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 510eac3fb4)

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 9f26d6023b)

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 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
2022-08-18 12:53:54 +00:00