mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 09:23:53 +00:00
Code Issues Releases Wiki Activity
29514 commits 108 branches 66 tags 133 MiB
Commit graph

29514 commits

This branch
This branch
All branches
Author SHA1 Message Date
psi29a
9761ff14f9 Merge branch 'cleanup_openmw_lua_includes' into 'master' 
Cleanup openmw lua includes

See merge request OpenMW/openmw!2293
 2022-08-19 13:34:07 +00:00
psi29a
34c5465709 Merge branch 'clang_format' into 'master' 
Use clang format NamespaceIndentation: All

See merge request OpenMW/openmw!2299
 2022-08-19 10:06:30 +00:00
elsid
4db96186d2
Use clang format NamespaceIndentation: All 
To follow the project styleguide.
 2022-08-18 19:58:27 +02:00
psi29a
7bb1856b74 Merge branch 'font_fixes' into 'master' 
Font fixes

See merge request OpenMW/openmw!2297
 2022-08-18 12:53:37 +00:00
Andrei Kortunov
3117a99391 Fix documentation 2022-08-18 16:12:52 +04:00
Andrei Kortunov
2cae8bea5d Improve layout of Interface tab 2022-08-18 14:21:39 +04:00
Andrei Kortunov
2cd2b42e33 Improve handling of larger font size 2022-08-18 13:29:12 +04:00
Andrei Kortunov
c3d3f3140b Allow to change font settings in the launcher 2022-08-18 13:29:12 +04:00
psi29a
98d0b91b6e Merge branch 'getweapondrawn' into 'master' 
Make getWeaponDrawn return 1 only when the weapon is attached (bug #4816)

Closes #4816

See merge request OpenMW/openmw!2294
 2022-08-18 09:00:30 +00:00
psi29a
0d776d7009 Merge branch 'terraindocs' into 'master' 
Clarify object paging merge factor docs (#5924)

Closes #5924

See merge request OpenMW/openmw!2295
 2022-08-18 08:59:24 +00:00
Alexei Kotov
15f4b5515d Clarify object paging merge factor docs 2022-08-18 05:55:17 +03:00
Alexei Kotov
d458894868 Make getWeaponDrawn return 1 only when the weapon is attached (bug #4816) 2022-08-18 05:04:51 +03:00
elsid
552301c8fb
Cleanup openmw lua includes 2022-08-17 23:47:30 +02:00
psi29a
28d6159b86 Update CHANGELOG.md 2022-08-17 21:29:33 +00:00
psi29a
92f3b4ba82 Merge branch 'windows_save' into 'master' 
[Postprocessing] Mitigate clashes with live reload and external saves on windows

See merge request OpenMW/openmw!2237
 2022-08-17 21:19:14 +00:00
psi29a
1e4dd46688 Merge branch 'fontconfig' into 'master' 
Allow users to decide if they need to import bitmap fonts

See merge request OpenMW/openmw!2270
 2022-08-17 21:16:31 +00:00
psi29a
1564dc6079 Merge branch 'clangformat' into 'master' 
finally introduce .clang-format; request for comments and changes

See merge request OpenMW/openmw!364
 2022-08-17 20:15:29 +00:00
psi29a
bf40f9b287 Merge branch 'name_view' into 'master' 
Make Class::getName return string_view

See merge request OpenMW/openmw!2289
 2022-08-17 20:14:27 +00:00
psi29a
2a892a2525 Merge branch 'swedish-i10n-0-48' into 'master' 
Updated Swedish strings for built-in shaders

See merge request OpenMW/openmw!2284
 2022-08-17 20:09:22 +00:00
psi29a
4f6c97fa10 Merge branch 'cleanup_openmw_includes' into 'master' 
Cleanup openmw render, physics, world, dialogue, gui, input includes

See merge request OpenMW/openmw!2291
 2022-08-17 20:08:43 +00:00
psi29a
2056365159 Merge branch 'autoresize' into 'master' 
Autoresize table subview columns (bug #6939)

Closes #6939

See merge request OpenMW/openmw!2292
 2022-08-17 20:08:03 +00:00
Andrei Kortunov
43f552f48f Allow users to decide if they need to import bitmap fonts 2022-08-17 22:12:15 +04:00
Alexei Kotov
aee8150d65 Autoresize table subview columns (bug #6939) 
Use the contents of the first 500 records, clamp the width to [100, 300]
 2022-08-17 19:58:39 +03:00
elsid
5498c169e3
Cleanup openmw render, physics, world, dialogue, gui, input includes 2022-08-17 18:45:52 +02:00
Andrew Dunn
a61237f265 Cleaned up macOS FFmpeg framework linking 
I'm not sure why but CoreMedia, VideoToolbox, and AudioToolbox aren't
being found by find_library, so I've converted framework imports to a
standard link option. I really don't think this will be an issue given
that this change will only ever apply to Apple platforms.
 2022-08-18 00:22:46 +10:00
psi29a
5b9acd0bb9 Merge branch 'esmstore-fixes' into 'master' 
Some ESMStore fixes

See merge request OpenMW/openmw!2279
 2022-08-17 14:10:54 +00:00
Andrew Dunn
808a2e587a Merge commit '5ee4ce1232b0f334f29dd702f811c58dccf5c00d' into apple-silicon-arm-build 2022-08-17 23:45:51 +10:00
psi29a
5ee4ce1232 Merge branch 'nipixeldata' into 'master' 
Support more NiPixelData formats (feature #6945)

Closes #6945

See merge request OpenMW/openmw!2290
 2022-08-17 12:20:00 +00:00
Alexei Kotov
edbd05a3f7 Support more NiPixelData formats (feature #6945) 2022-08-17 14:22:27 +03:00
psi29a
6346ffca72 Merge branch 'cleanup_components_includes' into 'master' 
Cleanup components includes

See merge request OpenMW/openmw!2287
 2022-08-17 07:50:02 +00:00
psi29a
bcb4215c84 Comment out flatpack build for now. 2022-08-17 06:59:43 +00:00
Alexei Kotov
dd055d6142 Merge branch 'fix_build' into 'master' 
Add missing include

See merge request OpenMW/openmw!2288
 2022-08-16 20:24:52 +00:00
Evil Eye
4ff12d8945 Make Class::getName return string_view 2022-08-16 21:15:03 +02:00
elsid
274afbc7a0
Add missing include 2022-08-16 20:06:25 +02:00
elsid
cc8c7002ea
Cleanup components includes 2022-08-16 19:14:04 +02:00
Andrew Dunn
1d7d3d5765 Get build working on Apple Silicon 
Will validate issues with Intel OSX later
 2022-08-17 02:18:48 +10:00
Evil Eye
11d44fda8f Pull in Allman's rules so modifications to BraceWrapping actually do something instead of being ignored because BreakBeforeBraces isn't set to Custom 2022-08-16 16:09:08 +00:00
psi29a
856fcb7742 Merge branch 'FlatpakCI' into 'master' 
Flatpak CI Build

See merge request OpenMW/openmw!2066
 2022-08-16 10:55:02 +00:00
Joakim Berg
b3b1628439 Update BuiltInShaders/sv.yaml 2022-08-16 09:51:53 +00:00
psi29a
40471666c1 Merge branch 'cherry-pick-cc27baec' into 'master' 
Merge branch 'update-windows-deps' into 'master'

See merge request OpenMW/openmw!2283
 2022-08-16 08:49:24 +00:00
psi29a
b382e92953 Merge branch 'please_dont_copy_my_nfts' into 'master' 
Prevent various values from being copied

See merge request OpenMW/openmw!2267
 2022-08-16 08:36:34 +00:00
psi29a
0e031741e7 Update .gitlab-ci.yml 2022-08-16 07:50:07 +00:00
psi29a
b049d25f1a Merge branch 'CoverityPrepWork' into 'master' 
Coverity Prep Work

See merge request OpenMW/openmw!2266
 2022-08-16 07:41:06 +00:00
psi29a
1f25f430d6 Merge branch 'swimhack' into 'master' 
Remove 0.43.0 death animation backward compatibility hack (#5977)

Closes #5977

See merge request OpenMW/openmw!2274
 2022-08-16 07:40:13 +00:00
psi29a
598af8122b removed clang_no_mold 2022-08-16 07:35:23 +00:00
psi29a
db5ca630f7 Merge branch 'update-windows-deps' into 'openmw-48' 
Update OSGoS dependency package

See merge request OpenMW/openmw!2278

(cherry picked from commit cc27baec62)

14663b83 Update OSGoS dependency package
944e7489 Use the correct debug-suffixes for dependencies
619bb73d Add lost backslash
149d0b2f Increment CI cache key for Windows builds
 2022-08-16 07:21:47 +00:00
psi29a
1d270e1683 Merge branch 'levelincrease' into 'master' 
Update both instances of level detail text

See merge request OpenMW/openmw!2282
 2022-08-16 07:17:04 +00:00
psi29a
823b8ebc22 Merge branch 'cleanup_detournavigator_includes' into 'master' 
Cleanup detournavigator includes

See merge request OpenMW/openmw!2281
 2022-08-16 07:16:01 +00:00
Alexei Kotov
a4427235df Update both instances of level detail text 2022-08-16 01:43:28 +03:00
Evil Eye
9817528011 Merge branch 'STRONGFOLLOW' into 'master' 
Correct follow animation attack strength dependence

See merge request OpenMW/openmw!2280
 2022-08-15 20:22:58 +00:00