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

19305 commits

Author SHA1 Message Date
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
Alexei Kotov
263a955290 Merge branch 'coverity' into 'master'
Avoid possible null dereference

See merge request OpenMW/openmw!2243
2022-08-06 10:53:38 +00:00
Andrei Kortunov
7dd668bf12 Allow mouse scrolling in the race preview widget (feature 6925) 2022-08-06 11:25:27 +04:00
elsid
dffb12ac05
Use std::vector to store paged ref nums 2022-08-06 02:11:58 +02:00
Andrei Kortunov
8812705838 Avoid possible null dereference - throw an exception instead 2022-08-05 20:26:27 +04:00
Alexei Kotov
86a4d530c4 Merge branch 'luaprofiler' into 'master'
Implementing profiler stats for LuaManager::synchronizedUpdate

See merge request OpenMW/openmw!2215
2022-08-05 16:19:57 +00:00
Christian Haro
19a08d19d6 Implementing profiler stats for LuaManager::synchronizedUpdate 2022-08-05 16:19:57 +00:00
psi29a
00f8c9760a Merge branch 'fixed_string_tests' into 'master'
Replace deprecated std::is_pod

See merge request OpenMW/openmw!2239
2022-08-04 09:55:51 +00:00
psi29a
b55a511ad8 Merge branch 'idlechance' into 'master'
Fix Wander random idle chance

See merge request OpenMW/openmw!2242
2022-08-04 09:55:05 +00:00
psi29a
9c4ca98421 Merge branch 'sheathing' into 'master'
Avoid cosmetic view-mode dependent issues in shield sheathing

Closes #6845

See merge request OpenMW/openmw!2241
2022-08-04 09:54:43 +00:00
Alexei Kotov
19dc4cda9b Avoid cosmetic view-mode dependent issues in shield sheathing 2022-08-04 05:33:54 +03:00
elsid
8e4f6fc4e4
Use FetchContent to get googletest 2022-08-04 01:12:11 +02:00
elsid
da0a1ac9ba
Do compile time checks in compile time instead of tests 2022-08-03 21:47:00 +02:00
elsid
c42c0dcbc9
Replace deprecated std::is_pod
apps/openmw_test_suite/esm/test_fixed_string.cpp:99:23: warning: ‘template<class _Tp> struct std::is_pod’ is deprecated: use is_standard_layout && is_trivial instead [-Wdeprecated-declarations]
   99 |      ASSERT_TRUE(std::is_pod<ESM::NAME>::value);
      |                       ^~~~~~
2022-08-03 21:47:00 +02:00
glassmancody.info
5d6a26c10f dont ignore tested objects in postpass 2022-08-03 07:55:56 -07:00
Evil Eye
1248bdc816 Save state for disposed actors if they can respawn 2022-08-02 19:33:27 +02:00
psi29a
caf971b979 Merge branch 'invis' into 'master'
Restore invisibility early-out in combat engagement

See merge request OpenMW/openmw!2229
2022-08-02 13:26:27 +00:00
Alexei Kotov
b4f743ad60 Fix Wander idle chance 2022-08-02 15:55:29 +03:00
Alexei Kotov
acfff6b25e Restore invisibility early-out in combat engagement 2022-08-01 15:11:18 +03:00
psi29a
454684bad3 Merge branch 'custom_actor_collision_shape_type' into 'master'
Support cylinder and rotating box collision shape types for actors (#6138)

Closes #6138

See merge request OpenMW/openmw!2043
2022-08-01 11:00:23 +00:00
Alexei Kotov
aa5fcc6649 Don't center spell and enchanted item effect lists (bug #4310) 2022-08-01 11:12:06 +03:00
psi29a
861f1d5303 Merge branch 'pleaseshutupyoustupiddoor' into 'master'
Don't stop playing sounds attached to removed objects (bug #6896)

Closes #6896

See merge request OpenMW/openmw!2221
2022-08-01 08:05:27 +00:00
psi29a
77f4ea7d7c Merge branch 'titleofthemovie' into 'master'
Prevent Movies_Morrowind_Logo video from pausing sounds (bugs #6049, #6109)

Closes #6109 and #6049

See merge request OpenMW/openmw!2223
2022-08-01 08:00:01 +00:00
psi29a
6f9c3c111e Merge branch 'inertia' into 'master'
Discard momentum upon player's teleportation (bug #6545)

Closes #6545

See merge request OpenMW/openmw!2226
2022-08-01 07:48:26 +00:00
psi29a
881a784bcf Merge branch 'transparent_fix' into 'master'
[Postprocessing] Force enable depth writes in transparent post-pass

See merge request OpenMW/openmw!2214
2022-08-01 06:24:46 +00:00
Alexei Kotov
bccdefd63f Discard momentum upon teleportation (bug #6545) 2022-08-01 07:59:14 +03:00
Alexei Kotov
2126cedb7d Prevent Movies_Morrowind_Logo video from pausing sounds (bug #6049)
Fix custom decoder tracks update (bug #6109)
2022-08-01 05:55:09 +03:00
Alexei Kotov
f9d41fcfe8 Don't stop playing sounds attached to removed objects (bug #6896) 2022-08-01 04:03:00 +03:00
Petr Mikheev
9a4df75f3c Merge branch 'luaIngredient' into 'master'
Lua Bindings for Ingredient Records

See merge request OpenMW/openmw!2205
2022-07-31 20:31:29 +00:00
Christian Haro
86bb3195a0 Lua Bindings for Ingredient Records 2022-07-31 20:31:29 +00:00
psi29a
9ba3ab2be9 Merge branch 'post_fog' into 'master'
[Postprocessing]  API to work with fog

See merge request OpenMW/openmw!2212
2022-07-31 17:33:08 +00:00
psi29a
1029114172 Merge branch 'water_level' into 'master'
[Postprocessing] Improve water level handling

See merge request OpenMW/openmw!2217
2022-07-31 17:32:45 +00:00
psi29a
42db39e281 Merge branch 'esscamera' into 'master'
essimporter: Recover player's pitch from PCDT (bug #6818)

Closes #6818

See merge request OpenMW/openmw!2210
2022-07-31 17:31:11 +00:00
Alexei Kotov
0b1e6a2b59 Fix pipeline errors 2022-07-31 14:43:57 +03:00
psi29a
a41c9240d9 Merge branch 'wallflower_breakdancing' into 'master'
Break invisibility before applying CE enchantments

Closes #6913

See merge request OpenMW/openmw!2218
2022-07-31 09:49:14 +00:00
psi29a
e3f04794e3 Merge branch 'spellcasting' into 'master'
Fix spellcasting state getting stuck due to premature attack attempts

Closes #6917

See merge request OpenMW/openmw!2216
2022-07-31 08:14:31 +00:00
psi29a
7236135631 Merge branch 'esscellrefs' into 'master'
essimporter: fix doubled actors

See merge request OpenMW/openmw!2213
2022-07-31 08:12:22 +00:00
psi29a
015a5c6b93 Merge branch 'essskills' into 'master'
essimporter: fix doubled stats

See merge request OpenMW/openmw!2211
2022-07-31 08:11:58 +00:00
Evil Eye
6196e777da Break invisibility before applying CE enchantments 2022-07-31 09:48:01 +02:00
Andrei Kortunov
5bfca57835 Add a way to check if water is enabled in post processing shaders 2022-07-31 10:33:18 +04:00
Alexei Kotov
7a6e984e90 Fix spellcasting state getting stuck due to premature attack attempts 2022-07-31 09:05:35 +03:00
glassmancody.info
066185fbcf override depth write flag from object paging in transparent post-pass 2022-07-30 14:37:49 -07:00
Andrei Kortunov
888f4d2ac1 Add a post processing API to work with fog 2022-07-30 21:44:18 +04:00
Alexei Kotov
9f49682d01 essimporter: refactor ESSImport::CellRef and fix doubled actors 2022-07-30 19:30:32 +03:00
Alexei Kotov
c7676a9de6 essimporter: fix doubled stats 2022-07-30 16:48:14 +03:00
Alexei Kotov
8f9b2becde essimporter: Recover player pitch from PCDT (bug #6818) 2022-07-30 15:46:14 +03:00
elsid
8b8e4f78b6
Support cylinder and rotating box collision shape types for actors
Cylinder collision shape should give the best consistency between physics
simulation and pathfinding. Rotating box is already used by some actors, so
add it to have the same collision shape type for all actors.
2022-07-30 14:28:21 +02:00
psi29a
a62b16df5d Merge branch 'delevelled' into 'master'
Editor: Decouple levelled list table columns (bug #6705)

Closes #6705

See merge request OpenMW/openmw!2209
2022-07-30 12:17:07 +00:00
psi29a
79cdc08253 Merge branch 'clean_despawn' into 'master'
Remove effects added by unloading cells

Closes #6914

See merge request OpenMW/openmw!2208
2022-07-30 10:09:36 +00:00
Alexei Kotov
0d18f76271 Editor: Decouple levelled list columns (bug #6705) 2022-07-30 12:48:29 +03:00
Evil Eye
9fc5ced9c9 Remove effects added by unloading cells 2022-07-30 10:59:27 +02:00
psi29a
f2a2880998 Merge branch 'empty_scripts_revival' into 'master'
Bring back empty script message

See merge request OpenMW/openmw!2207
2022-07-30 08:07:24 +00:00
Cody Glassman
89e0de2314 Bring back empty script message 2022-07-30 08:07:24 +00:00
psi29a
5cd4dbd9a9 Merge branch 'unrestrictedfailure' into 'master'
Spellcasting timing fixes (bug #4227)

Closes #4227

See merge request OpenMW/openmw!2201
2022-07-30 07:35:46 +00:00
psi29a
7361a1c6fd Merge branch 'awareness' into 'master'
Fix invisibility handling in awareness checks

See merge request OpenMW/openmw!2203
2022-07-30 06:41:07 +00:00
psi29a
7abcb9b0a7 Merge branch 'positioncell' into 'master'
Snap down any actor teleported with Position/PositionCell (bug #6154)

Closes #6154

See merge request OpenMW/openmw!2204
2022-07-30 06:40:38 +00:00
Alexei Kotov
1e7cbb88d2 Merge branch 'fix_initial_player_landing' into 'master'
Trace down player on initial cell loading after all cells are loaded (#6907)

Closes #6907

See merge request OpenMW/openmw!2206
2022-07-29 23:45:10 +00:00
elsid
37b0ff596c
Trace down player on initial cell loading after all cells are loaded 2022-07-29 23:16:25 +02:00
Alexei Kotov
fede5c7c02 Fix invisibility handling in awareness checks 2022-07-29 18:54:14 +03:00
Alexei Kotov
435ddcfb6b Snap down any actor teleported with Position/PositionCell (bug #6154) 2022-07-29 18:51:49 +03:00
Alexei Kotov
8005d3ca25 Rename updateState back into updateWeaponState 2022-07-29 17:22:51 +03:00