psi29a
651a7d569c
Merge branch 'activatebooks' into 'master'
...
Allow NPCs to activate in-world books for the player (part of #7959 )
See merge request OpenMW/openmw!4080
2024-05-20 12:46:01 +00:00
psi29a
d67bc1defd
Merge branch 'timeplayedhours' into 'master'
...
Improve Time Played formatting (#7971 )
Closes #7971
See merge request OpenMW/openmw!4107
2024-05-20 12:45:49 +00:00
Alexei Kotov
a3bfd3a337
Merge branch 'fix-infinite-fall-into-void' into 'master'
...
Fix infinite fall into void (#1415 )
Closes #1415
See merge request OpenMW/openmw!4100
2024-05-19 20:47:13 +00:00
Alexei Kotov
e96ebec2cf
Merge branch 'fix_lua_attack' into 'master'
...
Allow Actors to pick an attack type/animation when no AI applies (fix #7583 )
Closes #7583
See merge request OpenMW/openmw!4102
2024-05-19 20:40:09 +00:00
Alexei Kotov
03652104fe
Merge branch 'cleanup_preloading' into 'master'
...
Cleanup preloading code
See merge request OpenMW/openmw!4104
2024-05-19 20:39:28 +00: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
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
