1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 16:29:55 +00:00
Commit graph

22301 commits

Author SHA1 Message Date
elsid
9854d42d56
Use ESM::RefId for worldspace type 2024-05-19 20:07:47 +02:00
elsid
5d28164416
Remove recast mesh tiles outside active range 2024-05-19 20:07:47 +02:00
elsid
4f5bdbb4fb
Remove recastmesh group for absent tile 2024-05-19 20:07:47 +02:00
Evil Eye
5f0fe8097c Use ESM::ReadersCache in the editor 2024-05-19 18:55:37 +02:00
Andrei Kortunov
3d699bd533 Improve operation widget appearance 2024-05-19 15:56:44 +04:00
Alexei Kotov
908f3891fb Add helper method for texture type recovery 2024-05-19 02:26:40 +03:00
Alexei Kotov
84f4ba4ca1 Support defining the texture type with a state attribute (#6240)
Named textures are still supported for easier native format compatibility (and so that I don't have to edit the documentation)
2024-05-18 23:11:20 +03:00
Sam Hellawell
c1cd8bd900 Check collision before findInteriorPositionfindInteriorPos 2024-05-18 06:33:06 +01:00
elsid
6f70350f2f
Remove unused arguments from preload functions 2024-05-17 19:42:44 +02:00
elsid
7290ce81c0
Avoid allocating std::vector for a single element 2024-05-17 19:42:44 +02:00
elsid
ac891a5eb1
Use algorithms to check if PositionCellGrid(s) is/are contained in a range 2024-05-17 19:42:31 +02:00
Evil Eye
c3d02c0b41 Merge branch 'cleanup_dialogue_api' into 'master'
Cleanup dialogue API

See merge request OpenMW/openmw!4088
2024-05-17 15:02:00 +00:00
psi29a
42db5f4386 Merge branch 'fix_menu_timers' into 'master'
Process menu script timers

See merge request OpenMW/openmw!4103
2024-05-17 08:54:43 +00:00
Alexei Kotov
86ecf3fa0c Make saved game dialog Health and Level lines localizable
Currently providing English, Russian and GMST-based localization.
2024-05-17 05:01:06 +03:00
Alexei Kotov
b8ee467d13 Allow NPCs to activate in-world books for the player (part of #7959) 2024-05-17 01:04:30 +03:00
Alexei Kotov
6bf0d17aa2 Improve Time Played formatting (#7971) 2024-05-16 23:48:13 +03:00
Sam Hellawell
72dbad6fb4 Satisfy king clang 2024-05-16 20:10:32 +01:00
Sam Hellawell
6f7fff409c Empty refid check 2024-05-16 19:38:29 +01:00
trav5
3f26a6c5a0 Merge branch 'master' of https://gitlab.com/OpenMW/openmw into fix7970-remove-removed-spells-on-rest 2024-05-16 20:14:09 +02:00
psi29a
4a3dbb5a80 Merge branch 'default_colors' into 'master'
Change default colors in script editor to support dark themes

See merge request OpenMW/openmw!4097
2024-05-16 11:19:24 +00:00
psi29a
991f887de2 Merge branch 'fix/7562-mouse-position' into 'master'
fix(openmw): MacOS Scaling Bugs

See merge request OpenMW/openmw!3963
2024-05-16 11:15:03 +00:00
Dylan
91a771f851 fix(openmw): MacOS Scaling Bugs 2024-05-16 11:15:02 +00:00
Sam Hellawell
64142dbd51 Merge remote-tracking branch 'origin/master' into fix-infinite-fall-into-void
# Conflicts:
#	CHANGELOG.md
2024-05-16 04:48:27 +01:00
Sam Hellawell
e98c4f86d6 Remove period 2024-05-16 00:14:09 +01:00
elsid
d71b422615
Convert PositionCellGrid into a struct 2024-05-15 22:33:12 +02:00
Sam Hellawell
e1cfd46f87 Do not teleport if dest < lowest point or collision disabled, add debug log 2024-05-15 20:41:48 +01:00
Zackhasacat
20d26a9cda Use random attack type 2024-05-15 14:09:33 -05:00
uramer
a662198903 Process menu script timers 2024-05-15 21:07:23 +02:00
Zackhasacat
0ad64cffdb Add empty line back 2024-05-15 12:41:45 -05:00
Zackhasacat
b62b0a2f00 Check for world AI disable 2024-05-15 11:56:58 -05:00
Zackhasacat
1e05bb20bf Allow Actors to pick an attack type/animation when no AI applies 2024-05-15 11:39:02 -05:00
Sam Hellawell
b43c7238e9 Fix infinite fall into void (#1415) 2024-05-15 05:01:58 +01:00
Alexei Kotov
195599c13c Don't update head animation if the animation is paused (#7980) 2024-05-15 01:38:32 +03:00
Andrei Kortunov
dca452aaca Change default colors in script editor to support dark themes 2024-05-14 13:59:19 +04:00
psi29a
2bed7450b6 Merge branch 'style_change' into 'master'
Minor changes in Qt styles handling

See merge request OpenMW/openmw!4093
2024-05-14 07:43:55 +00:00
trav5
238d68b691 Magic effects are updated once before applying when resting
Fixing #7970.
When the player was resting, all their magic effects were applied throughout
the rest duration, including the effects for already removed spells, which
were applied once more before removal.
This commit calls an update before that applying, so that these removed
spells are executed and removed and only then the real duration-long
execution of remaining magic effects takes place.
2024-05-13 21:41:41 +02:00
Zackhasacat
c63c1e69cf Lua: Add missing light flags, allow creating light record via world.createRecord 2024-05-13 14:14:44 +00:00
Andrei Kortunov
bf568da6de Remove redundant checks 2024-05-12 17:26:18 +04:00
Andrei Kortunov
0262b33067 Update toolbar style sheet when theme changed 2024-05-12 17:26:14 +04:00
Andrei Kortunov
d5bbd75828 Make sure that Open button becomes focused after enabling 2024-05-12 17:26:14 +04:00
Andrei Kortunov
b0930158df Use an auto raise mode to disable the border 2024-05-12 17:26:14 +04:00
Andrei Kortunov
e7d566eb2e Remove border from status bar 2024-05-12 17:26:10 +04:00
Andrei Kortunov
abd4596cf8 Do not use style sheets to set font 2024-05-12 15:34:33 +04:00
psi29a
ea7555c012 Merge branch 'feature/pplLauncherSetting' into 'master'
added force PPL checkbox

See merge request OpenMW/openmw!3857
2024-05-11 07:45:04 +00:00
psi29a
919d1e366e Merge branch 'staticcollections' into 'master'
Place static collections to the scene and fix item modification record loading

See merge request OpenMW/openmw!4085
2024-05-11 07:43:28 +00:00
psi29a
3e8442e749 Merge branch 'fix_build' into 'master'
Add missing include (#7967)

Closes #7967

See merge request OpenMW/openmw!4087
2024-05-11 07:42:55 +00:00
elsid
35f5c8cd15
Add missing includes 2024-05-10 23:27:21 +02:00
jvoisin
c9890fbd4f Merge branch 'fix_disabled_esm4' into 'master'
Make a check for disabled parent recursive

See merge request OpenMW/openmw!4084
2024-05-10 20:13:47 +00:00
elsid
26233e082d
Optimize iteration over dialogue records 2024-05-10 10:38:18 +02:00
Zackhasacat
0e1678b3b8 Merge branch 'mwdialogue-bindings' into 'master'
Add Lua bindings for ESM::Dialogue record stores to openmw.core

Closes #7964

See merge request OpenMW/openmw!4034
2024-05-09 23:22:03 +00:00
Alexei Kotov
29b25ffb26 Formatting 2024-05-09 17:52:34 +03:00
elsid
bad935ff34
Make a check for disabled parent recursive 2024-05-09 16:38:30 +02:00
Alexei Kotov
fd4d3b8a27 Fix item mod record loading 2024-05-09 17:29:47 +03:00
Alexei Kotov
7d979a2dfc Place ESM4 static collections to the scene 2024-05-09 17:26:27 +03:00
psi29a
99ac6c40e5 Merge branch 'wizard_update' into 'master'
UI fixes for Wizard

See merge request OpenMW/openmw!4069
2024-05-09 08:45:29 +00:00
Alexei Kotov
b9069835b2 Merge branch 'scriptedit' into 'master'
Improve appearance of script editor in the OpenMW-CS

See merge request OpenMW/openmw!4076
2024-05-07 13:22:58 +00:00
Alexei Kotov
c95bb4ce59 Merge branch 'split_esm_headers' into 'master'
Split ESM headers

See merge request OpenMW/openmw!4071
2024-05-07 11:57:32 +00:00
trav
fc6695a918 Merge branch openmw:master into mwdialogue-bindings 2024-05-06 18:27:19 +00:00
Andrei Kortunov
b56c255be2 Improve appearance of script editor in the OpenMW-CS 2024-05-06 12:22:30 +04:00
psi29a
2e971ec2e3 Merge branch 'appropriateammunition' into 'master'
Adjust Russian appropriate ammunition setting label/description

See merge request OpenMW/openmw!4062
2024-05-05 20:19:45 +00:00
trav
512b7e46e5 Merge branch openmw:master into mwdialogue-bindings 2024-05-04 14:35:31 +00:00
elsid
f83d388391
Iterate over smaller container when removing blacklisted refs 2024-05-04 13:22:32 +02:00
elsid
a920ca9070
Report loading screens to osg stats 2024-05-04 13:22:32 +02:00
Alexei Kotov
95cef34477 Bump the minimum launcher width to 775 2024-05-04 11:15:57 +03:00
Hristos N. Triantafillou
63a27bbf99 Expose Wander option values to the Lua API (#7916) 2024-05-03 09:40:30 +00:00
elsid
01166b1f26
Split ESM headers 2024-05-03 01:55:20 +02:00
trav5
0e03b9bd32 ESM::Dialogue Lua bindings: filterActorGender returns string 2024-05-01 13:14:59 +02:00
trav5
9001ed1e2f ESM::Dialogue Lua bindings: rank filters start from 1 and filterActorCell->filterPlayerCell 2024-05-01 12:33:25 +02:00
Andrei Kortunov
9252879f0f UI fixes for Wizard 2024-05-01 08:56:35 +04:00
trav5
2cdfaa69b3 ESM::Dialogue Lua bindings: Fixes in speaker faction and DialogueRecordInfo docs [correction] 2024-04-30 21:46:20 +02:00
trav5
9743276332 ESM::Dialogue Lua bindings: Fixes in speaker faction and DialogueRecordInfo docs 2024-04-30 21:37:56 +02:00
psi29a
a57c350c08 Merge branch 'paint_svg' into 'master'
Change SVG icons color in the editor

See merge request OpenMW/openmw!4060
2024-04-30 08:19:51 +00:00
psi29a
bb89717886 Merge branch 'droppinglikeflies' into 'master'
Fix Drop behavior for creatures that don't have an inventory

See merge request OpenMW/openmw!4063
2024-04-30 08:18:22 +00:00
elsid
404940b6e0
Make sure proper number of cells is preloaded
Limit the number of exterior cells around a cell to be preloded based on current
and max cache size not just max cache size. Avoid doing break from inner loop
only.

Log when truncation happens but only once during process lifetime to warn a user.
2024-04-29 02:03:32 +02:00
elsid
2220868fa9
Preload surrounding exterior cells for the teleport door destination
When player teleports to the exterior cell, multiple cells are loaded not only
the target so better to have them preloaded too.
2024-04-29 01:02:49 +02:00
Alexei Kotov
cc4b2e5c58 Fix Drop behavior for creatures that don't have an inventory 2024-04-28 20:07:37 +03:00
psi29a
5b25435260 Merge branch 'fix_osg_stats_report' into 'master'
Report osg stats for frames with loading screens (#7737)

Closes #7737

See merge request OpenMW/openmw!4053
2024-04-28 14:16:41 +00:00
psi29a
1e1fd28136 Merge branch 'fix_anim_state' into 'master'
Fix AnimState initialization

See merge request OpenMW/openmw!4061
2024-04-28 13:14:44 +00:00
psi29a
24fca82f2c Merge branch 'faction_relations' into 'master'
Take in account faction reaction changes

See merge request OpenMW/openmw!4015
2024-04-28 13:05:13 +00:00
trav
c6807465f6 Merge branch openmw:master into mwdialogue-bindings 2024-04-28 10:34:21 +00:00
trav5
0aae0299af ESM::Dialogue Lua bindings: Several post-review fixes 2024-04-28 12:32:56 +02:00
jvoisin
3e63b507d4 Merge branch 'fix_physics_crash' into 'master'
Fix crash in physics worker on removing object (#7950)

Closes #7950

See merge request OpenMW/openmw!4057
2024-04-28 00:25:43 +00:00
trav5
421cf40508 ESM::Dialogue Lua bindings: ref in DialogueInfos 2024-04-27 21:56:22 +02:00
trav5
52e1f32c88 Important change, https://godbolt.org/z/YjjaaqYsc 2024-04-27 21:38:20 +02:00
trav5
897e43ae1e Less complex "index" and "at" 2024-04-27 15:22:19 +02:00
trav5
b9358521cc Better return values 2024-04-27 15:02:45 +02:00
elsid
9d2f132aa7
Fix AnimState initialization
Remove redundant user defined constructor and destructor, make sure all members
are properly initialized including mTime (new float does not initialize the
float).
2024-04-27 14:47:23 +02:00
trav5
4449b66846 Operators and retting rid of 'records' 2024-04-27 13:44:08 +02:00
elsid
41d5d3bf09
Report osg stats for all frames showing loading screens 2024-04-27 12:37:39 +02:00
Andrei Kortunov
070327a259 Change SVG color in the editor 2024-04-27 09:57:47 +04:00
trav
a0989c3481 Merge branch openmw:master into mwdialogue-bindings 2024-04-26 19:21:28 +00:00
elsid
5261f0c5cf
Modify PhysicsTaskScheduler::mCollisionObjects under lock
addCollisionObject is called from the main thread and removeCollisionObject is
usually called from the main thread and rarely from one of the physics worker
threads. This usually happens on cell unloading when object is already removed
from the scene but there is active simulation for it. Which possible because
it's a shared pointer.

There is getUserPointer function which only reads from the container but it's
called only when there is no active simulation so no lock is required.
2024-04-26 16:17:40 +02:00
elsid
acf1e51a28
Call getUserPointer only for not nullptr collision object
nullptr can't have user pointer anyway so it saves a lookup in the
unordered_map.
2024-04-26 15:32:27 +02:00
Benjamin Y
d62fb92b5b Fixed capitalization 2024-04-25 10:09:48 -05:00
Benjamin Y
3146015a00 Fixed Label Capitalization 2024-04-25 09:42:35 -05:00
psi29a
ec8675ba6f Merge branch 'scalable_launcher' into 'master'
Improve launcher appearance

See merge request OpenMW/openmw!4051
2024-04-25 08:46:29 +00:00
psi29a
3980bb15cc Merge branch 'lua_controller_cursor' into 'master'
Add lua bindings for controller cursor mode

See merge request OpenMW/openmw!3623
2024-04-25 08:45:57 +00:00
trav
0986b103c5 Merge branch openmw:master into mwdialogue-bindings 2024-04-24 21:06:58 +00:00
elsid
b4976354a5
Use correct frame and stats for lua worker
When a loading screen appears during the frame processing, the frame number
returned by the viewer is incremented and the stats reporting goes into the
wrong frame. Pass frame number and stats object from the main thread to avoid
this.
2024-04-24 21:53:59 +02:00
trav5
223e315fdb ESM::Dialogue Lua bindings quest change and docs 2024-04-24 21:17:26 +02:00