mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 21:32:42 +00:00
Code Issues Projects Releases Wiki Activity
33,207 Commits 19 Branches 66 Tags
Commit Graph

4252 Commits

Author SHA1 Message Date
uramer
9cce2e39ba Merge branch 'master' into menuscripts 2024-01-27 15:45:31 +01:00
Evil Eye
f62e4f5707 Merge branch 'more_move' into 'master' 
Use std::move() in /apps/openmw

See merge request OpenMW/openmw!3805
 2024-01-26 16:21:00 +00:00
Andrei Kortunov
9e55425b71 Use std::move() in /apps/openmw 2024-01-25 09:03:30 +04:00
psi29a
cdf2459ed8 Merge branch 'constpreload' into 'master' 
Make cell models preloading a const operation

See merge request OpenMW/openmw!3777
 2024-01-24 21:35:05 +00:00
Andrei Kortunov
b37aee21e3 Fix tooltips in the main menu 2024-01-19 15:16:46 +04:00
psi29a
6ced0ab397 Merge branch 'sundirection' into 'master' 
Fix exterior sun direction/position (bug #4898)

Closes #4898

See merge request OpenMW/openmw!3733
 2024-01-19 08:27:50 +00:00
Evil Eye
fba4055877 Move return comments to a new line 2024-01-18 22:32:46 +01:00
Evil Eye
6ff14e19d1 Make cell models preloading a const operation 2024-01-14 16:41:55 +01:00
Alexei Kotov
1a629cbf07 Play shield hit sound for the shield that was hit (#7774) 2024-01-14 10:33:21 +03:00
psi29a
4c88ab5e07 Merge branch 'thunderstorm' into 'master' 
Interrupt thunder SFX indoors (bug #6402)

Closes #6402

See merge request OpenMW/openmw!3741
 2024-01-11 16:23:16 +00:00
uramer
4ed2af7666 Merge branch 'master' into menuscripts 2024-01-10 23:21:42 +01:00
uramer
82a125fb6a Replace onUpdate with onFrame for menu scripts 2024-01-10 23:13:27 +01:00
psi29a
a6e07dd33a Merge branch 'paging' into 'master' 
Unbreak un-paging (#7768)

Closes #7768

See merge request OpenMW/openmw!3754
 2024-01-10 19:06:43 +00:00
psi29a
a0c0509e3f Merge branch 'rm_unused_apps_includes' into 'master' 
Use "" to quote apps/openmw includes and remove unused

See merge request OpenMW/openmw!3727
 2024-01-09 08:59:23 +00:00
Alexei Kotov
9e3b427a98 Unbreak un-paging (#7768) 2024-01-08 23:41:51 +03:00
Alexei Kotov
3af28439d6 Interrupt thunder SFX indoors (bug #6402) 2024-01-08 12:06:51 +03:00
elsid
067957f57b
Use "" to quote apps/openmw includes and remove unused 
Using "" makes clangd to find unused includes which makes it quite easy to
remove them.
 2024-01-07 17:57:11 +01:00
Alexei Kotov
1f26485c47 Fix exterior sun direction/position (bug #4898) 2024-01-07 04:57:02 +03:00
Alexei Kotov
ed31a0354a Support playing ambient and rain weather SFX at the same time (bug #7761) 2024-01-07 04:56:36 +03:00
psi29a
c3c8fa1e61 Merge branch 'sceneleak' into 'master' 
Set paged refs' base node to null (#6335)

Closes #6335

See merge request OpenMW/openmw!3715
 2024-01-06 11:07:07 +00:00
Alexei Kotov
2fbdde34c6 Set paged refs' base node to null (#6335) 2024-01-02 02:31:47 +03:00
Evil Eye
03c791e61a Move animation handling to NpcAnimation 2024-01-01 13:58:55 +01:00
Evil Eye
84c15344ee Address feedback 2024-01-01 13:07:43 +01:00
Evil Eye
5bd5c84018 Replace missing NPC races and default animations 2024-01-01 13:07:43 +01:00
Evil Eye
e63933efa6 Use NAM9 for stack count 2023-12-31 17:12:46 +00:00
Evil Eye
c97d0b5252 Merge branch 'weather' into 'master' 
Make rain and snow ripple settings global rather than per-weather (#7748)

See merge request OpenMW/openmw!3706
 2023-12-31 11:01:14 +00:00
psi29a
7647af6e4e Merge branch 'friendlyhit' into 'master' 
Correct friendly fire reaction for different damage sources (bug #7646)

Closes #7646

See merge request OpenMW/openmw!3694
 2023-12-30 09:43:19 +00:00
Alexei Kotov
640fa53bb8 Make rain and snow ripple settings global rather than per-weather (#7748) 2023-12-30 04:24:18 +03:00
Mads Buvik Sandvei
9d3ede7575 Revert "Merge branch 'skating-olympics' into 'master'" 
This reverts merge request !3631
 2023-12-27 19:11:49 +00:00
Alexei Kotov
f1782ad8df Merge branch 'rm_unused_vfs' into 'master' 
Remove unused vfs argument from correctMeshPath

See merge request OpenMW/openmw!3691
 2023-12-27 17:23:16 +00:00
Alexei Kotov
94c052dfef Classify the damage passed to Class::onHit 2023-12-27 20:05:08 +03:00
elsid
81a483fc7f
Remove unused vfs argument from correctMeshPath 2023-12-26 14:14:52 +01:00
elsid
145f7b5672
Avoid using osg::ref_ptr when reference is enough 2023-12-26 11:35:03 +01:00
Alexei Kotov
099c39ae87 Use fallback weather ripple settings (bug #7292) 2023-12-23 11:46:08 +03:00
jvoisin
2873f971a6 Merge branch 'downsized' into 'master' 
Remove explicitly sized reads

See merge request OpenMW/openmw!3663
 2023-12-21 22:50:10 +00:00
Alexei Kotov
78a8f9d692 Merge branch 'skating-olympics' into 'master' 
De-jank stationary animations

Closes #3330

See merge request OpenMW/openmw!3631
 2023-12-20 12:35:41 +03:00
Evil Eye
a9e6e63c4e Remove fixed size reads 2023-12-17 13:00:14 +01:00
Alexei Kotov
7e3270abc9 Merge branch 'unsave' into 'master' 
Drop support for saves made prior to 0.40

See merge request OpenMW/openmw!3645
 2023-12-13 00:33:20 +00:00
Evil Eye
521cff08f8 Drop support for save game format 1 2023-12-09 17:22:11 +01:00
Mads Buvik Sandvei
c79446818e Add a flag for jump when queueing movement, so inertia can be added accurately. 2023-12-09 16:48:04 +01:00
Mads Buvik Sandvei
32d391f548 Revert accumulating movement in the reset accum root callback. 2023-12-09 15:50:17 +01:00
Evil Eye
0da620b3f9 Don't crash on spells or enchantments without effects 2023-12-09 15:40:23 +01:00
Mads Buvik Sandvei
18a6422c1c clang format 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
cedc5289d7 Dejank movement solver vs animation movement accumulation 2023-12-09 14:49:42 +01:00
Alexei Kotov
571a097be7 Merge branch 'avoid_copies' into 'master' 
Avoid redundant copies

See merge request OpenMW/openmw!3637
 2023-12-07 18:42:42 +00:00
Andrei Kortunov
6f68df9ac2 Avoid redundant copies 2023-12-06 23:45:25 +04:00
Evil Eye
194bcb0187 Drop support for save game format 0 (pre 0.37) 2023-12-01 16:37:29 +01:00
Zackhasacat
5623a5cf01 Merge branch 'lua_sgetcurrent_conditionofitem_itemdata_idea' into 'master' 
Lua API to get/set item condition

See merge request OpenMW/openmw!3421
 2023-11-23 23:10:39 +00:00
jvoisin
2150e4cae6 Merge branch 'warningfixes' into 'master' 
Fix warnings

See merge request OpenMW/openmw!3587
 2023-11-17 23:41:47 +00:00
Zackhasacat
13deb0fba8 Merge branch 'imod' into 'master' 
Fill out item modification records and add them to the scene

See merge request OpenMW/openmw!3540
 2023-11-17 18:22:17 +00:00