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
trav5
4449b66846
Operators and retting rid of 'records'
2024-04-27 13:44:08 +02: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
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
trav5
223e315fdb
ESM::Dialogue Lua bindings quest change and docs
2024-04-24 21:17:26 +02:00
psi29a
5f926bd129
Merge branch 'scalable_wizard' into 'master'
...
Use scalable icons for wizard
See merge request OpenMW/openmw!4050
2024-04-24 13:20:36 +00:00
psi29a
a20f456a5c
Merge branch 'mudcrabcanhazsoulgem' into 'master'
...
Allow running soulgem instructions on all actors (#7943 )
Closes #7943
See merge request OpenMW/openmw!4048
2024-04-24 13:20:09 +00:00
psi29a
a628c658a9
Merge branch 'lessgoofymaterialptr' into 'master'
...
Simplify material file pointer acrobatics
See merge request OpenMW/openmw!4049
2024-04-24 08:39:52 +00:00
Andrei Kortunov
5e8dc9cc03
Fix stub icon color
2024-04-24 11:14:50 +04:00
psi29a
6d0df9f686
Merge branch 'window_clamp' into 'master'
...
Do not take in account UI scaling factor twice
See merge request OpenMW/openmw!4046
2024-04-23 10:28:51 +00:00
Andrei Kortunov
d97838def1
Improve launcher appearance
2024-04-23 12:28:37 +04:00
Andrei Kortunov
0873eb6e62
Use scalable icons for wizard
2024-04-23 11:49:33 +04:00
psi29a
02cdeb6252
Merge branch 'scalable_editor' into 'master'
...
Treat editor icons as scalable
See merge request OpenMW/openmw!4042
2024-04-23 07:04:59 +00:00
psi29a
9662586947
Merge branch 'editor-crash' into 'master'
...
Clamp widgets coordinates to avoid editor crashes
See merge request OpenMW/openmw!4043
2024-04-23 07:04:09 +00:00
Alexei Kotov
78eda530ac
Simplify material file pointer acrobatics
2024-04-23 00:34:38 +03:00
Alexei Kotov
1c1df996be
Allow running soulgem instructions on all actors ( #7943 )
2024-04-23 00:02:06 +03:00
Andrei Kortunov
d10b0d503b
Do not take in account UI scaling factor twice
2024-04-22 13:36:34 +04:00
psi29a
023c0f7a46
Merge branch 'vfs_normalized_path_6' into 'master'
...
Use normalized path for music related functions
See merge request OpenMW/openmw!4038
2024-04-22 07:02:14 +00:00
Andrei Kortunov
1bb48bcef7
Treat editor icons as scalable
2024-04-21 20:56:06 +04:00
Andrei Kortunov
2264d067fc
Clamp widgets coordinates to avoid crashes
2024-04-21 17:15:33 +04:00
elsid
a863899eb1
Use normalized path for SoundManager::streamMusic
2024-04-20 21:14:09 +02:00
trav5
277d830530
ESM::Dialogue Lua bindings 6
2024-04-20 20:23:37 +02:00
trav5
c1639e54b1
ESM::Dialogue Lua bindings 6
2024-04-20 19:53:56 +02:00
Alexei Kotov
6f9206428d
Don't ignore material files in NifLoader tests
2024-04-20 19:43:42 +03:00
Alexei Kotov
4e3d45db1b
Deduplicate file handling in niftest
2024-04-20 19:43:42 +03:00
Alexei Kotov
1d65aaee71
Formatting
2024-04-20 19:43:42 +03:00
Alexei Kotov
1a961f3021
Extremely early handling for BGSM/BGEM files
2024-04-20 19:43:41 +03:00
Alexei Kotov
4a03555d53
Add BGEM/BGSM file support to niftest
2024-04-20 19:43:40 +03:00
psi29a
2438fb4c98
Merge branch 'windows_qt6' into 'master'
...
Use Qt6 on Windows by default
See merge request OpenMW/openmw!4016
2024-04-20 16:39:47 +00:00
psi29a
ddd64c893a
Merge branch 'noyoudumbtoolyourflipingwrong' into 'master'
...
Don't flip the water normal map twice
See merge request OpenMW/openmw!4022
2024-04-20 16:39:09 +00:00
psi29a
f21453f0b7
Merge branch 'twoahahidles' into 'master'
...
Change wander package column names to match reality
See merge request OpenMW/openmw!4032
2024-04-20 16:38:41 +00:00
psi29a
29d6c76f93
Merge branch 'log_not_supported_agent_bounds_ptr' into 'master'
...
Log ptr for which agent bounds are not supported
See merge request OpenMW/openmw!4040
2024-04-20 16:37:37 +00:00
trav5
1e36b17679
ESM::Dialogue Lua bindings 5
2024-04-20 17:44:36 +02:00
AnyOldName3
04f1dc282b
Merge branch 'fix-osga-rotate-wildly' into 'master'
...
Fix OSGAnimation issues
See merge request OpenMW/openmw!3989
2024-04-20 15:37:09 +00:00
trav5
3bb7bf1a4a
ESM::Dialogue Lua bindings 4
2024-04-20 15:47:34 +02:00
trav5
d14fc1d28c
ESM::Dialogue Lua bindings 3
2024-04-20 14:29:11 +02:00
trav
807d78a0d0
Merge branch openmw:master into mwdialogue-bindings
2024-04-20 12:27:47 +00:00
elsid
5b0eb0b5b0
Log ptr for which agent bounds are not supported
...
To make it easier to find what NPC or mod makes this happen.
2024-04-20 14:15:26 +02:00
elsid
40cc16046b
Use normalized path for sound decoder
2024-04-19 22:46:38 +02:00
elsid
e11a5a4352
Use normalized path for SoundManager::playPlaylist
2024-04-19 22:43:20 +02:00
