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

29152 commits

Author SHA1 Message Date
Evil Eye
5188d2a7f9 Update reference 2022-12-09 17:21:07 +01:00
Evil Eye
92761f0527 Add option to restore non-MCP Calm spell behaviour 2022-12-09 17:21:04 +01:00
psi29a
fff497c205 Merge branch 'lua_gc_48' into 'openmw-48'
[0.48] Run Lua GC in every frame

See merge request OpenMW/openmw!2531
2022-12-07 10:53:36 +00:00
Petr Mikheev
734f09abe6 Run Lua GC in every frame 2022-12-04 22:27:44 +01:00
psi29a
9bbc4a54c1 Merge branch 'dial_early_48' into 'openmw-48'
!2524 for 0.48

See merge request OpenMW/openmw!2525
2022-11-28 08:06:06 +00:00
Evil Eye
3b8b5aee39 Add an early out to dialogue loading to match Morrowind.exe behaviour 2022-11-27 22:40:31 +01:00
Andrei Kortunov
3e70fc2577 Add missing translations 2022-11-20 11:58:09 +04:00
Andrei Kortunov
babd9ee24b Improve postprocess HUD layout 2022-11-18 11:48:00 +04:00
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
psi29a
be89953368 Merge branch 'fix_settings_reloadlua' into 'master'
Clear storage of setting groups on reloadlua

See merge request OpenMW/openmw!2497

(cherry picked from commit 523fabe1e8)

17891600 Clear storage of setting groups on reloadlua
2022-11-07 11:46:18 +00:00
psi29a
30b1b2f911 Merge branch 'fix_7005' into 'master'
Fix Lua settings UI not working after a save (#7005)

See merge request OpenMW/openmw!2495

(cherry picked from commit 084396f29e)

589d7e82 Fix Lua settings UI not working after a save (#7005)
2022-11-04 09:14:59 +00:00
psi29a
2580cbfe67 Merge branch 'time_stamp_48' into 'openmw-48'
Support negative days in TimeStamp for 0.48 (#6981)

See merge request OpenMW/openmw!2493
2022-11-02 21:51:39 +00:00
elsid
4f360e6374
Support negative days in TimeStamp
As vanilla engine does.
2022-11-02 20:28:23 +01:00
psi29a
a5b1ce77ea Merge branch 'flying_position48' into 'openmw-48'
Only force adjust the player and NPCs teleported out of the active grid

See merge request OpenMW/openmw!2489
2022-10-31 20:20:25 +00: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
psi29a
ddc90bc778 Merge branch 'async_crashes_48' into 'openmw-48'
Pull fixes for async Lua into 0.48

See merge request OpenMW/openmw!2482
2022-10-24 06:51:58 +00: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
psi29a
dc9ba9dc80 Merge branch 'grayscale_dialogue_48' into 'openmw-48'
Dialogue issues 0.48

See merge request OpenMW/openmw!2480
2022-10-18 19:33:34 +00: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
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