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

19265 commits

Author SHA1 Message Date
psi29a
e1e7f3e135 Merge branch 'fix_7056' into 'master'
Add missing content=builtin.omwscripts if openmw is started via openmw-cs

Closes #7056

See merge request OpenMW/openmw!2496

(cherry picked from commit c2b495a187)

6025943f Add missing content=builtin.omwscripts if openmw is started via openmw-cs (fixes #7056)
2022-11-07 13:03:18 +00:00
elsid
4f360e6374
Support negative days in TimeStamp
As vanilla engine does.
2022-11-02 20:28:23 +01:00
Evil Eye
df5eac88b8 Only force adjust the player and NPCs teleported out of the active grid 2022-10-31 12:56:05 +01:00
psi29a
e0c2131cd7 Merge branch 'bound48' into 'openmw-48'
Allow bound effects to be recast if they're attached to a recastable effect 0.48

See merge request OpenMW/openmw!2487
2022-10-30 18:36:26 +00:00
Evil Eye
2881a30e9e Allow bound effects to be recast if they're attached to a recastable effect 2022-10-30 14:31:41 +01:00
Petr Mikheev
710ad11dc8 Fix #7039: freeze after throwing an error in a queued Lua callback 2022-10-22 17:59:59 +02:00
uramer
5cf96a808e Lua coroutine crash tests 2022-10-22 17:59:59 +02:00
uramer
4f25796029 Execute async callbacks on the main Lua stack 2022-10-22 17:59:56 +02:00
Evil Eye
d6fcf54438 Mark constant methods const 2022-10-18 19:16:03 +02:00
Evil Eye
53c03b65cf Prevent potentially returning garbage flags 2022-10-18 18:59:13 +02:00
Evil Eye
7e8da3dc9c Don't use potentially invalid cache entry 2022-10-18 18:56:14 +02:00
Evil Eye
1e16900d97 Merge branch 'water_walking_evasion_48' into 'openmw-48'
Adjust initial distance when destination is changed for obstacle check (#6860) (0.48)

See merge request OpenMW/openmw!2442
2022-10-02 15:16:47 +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
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
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
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
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
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
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
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
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
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
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
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
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 1e4dd46688)

43f552f4 Allow users to decide if they need to import bitmap fonts
2022-08-17 21:16:56 +00:00
Alexei Kotov
2f5f2bdbad Stagger fixes, 0.48.0 edition 2022-08-10 17:30:43 +03: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
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
cody glassman
c770c462e4 revert traversal nodes, discovered to break some NIFs with UV controllers 2022-08-06 11:39:23 -07:00
Alexei Kotov
0fd817150e Merge branch 'ordinator_farming_restored' into 'master'
Save state for disposed actors if they can respawn

Closes #6923

See merge request OpenMW/openmw!2232
2022-08-06 11:03:06 +00:00