mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-29 10:41:34 +00:00
Code Issues Releases Wiki Activity
29052 commits 112 branches 72 tags 140 MiB
Commit graph

29052 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
psi29a
856fcb7742 Merge branch 'FlatpakCI' into 'master' 
Flatpak CI Build

See merge request OpenMW/openmw!2066
 2022-08-16 10:55:02 +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
Alexei Kotov
1ce162a95c Correct follow animation attack strength dependence 2022-08-15 22:08:59 +03:00
elsid
b1fb42a28c
Cleanup detournavigator includes 2022-08-15 19:46:10 +02:00
psi29a
6756f4397e Merge branch 'aidisplay' into 'master' 
Fix display for some package settings

See merge request OpenMW/openmw!2271
 2022-08-15 12:32:30 +00:00
psi29a
f42ab6a3e7 Merge branch 'coverity' into 'master' 
Do not copy data when it is not needed

See merge request OpenMW/openmw!2277
 2022-08-15 12:30:09 +00:00
Alexei Kotov
c857346f7b Remove 0.43.0 death animation backward compatibility hack (#5977) 2022-08-15 14:58:01 +03:00
psi29a
cdec6495aa Merge branch 'fnv_support' into 'master' 
Use Fowler-Noll-Vo hash instead of std::hash

See merge request OpenMW/openmw!2273
 2022-08-15 08:01:00 +00:00
psi29a
be947bfcf6 Merge branch 'hackercenturions' into 'master' 
Override non-biped follow animation by movement

See merge request OpenMW/openmw!2276
 2022-08-15 07:58:28 +00:00
psi29a
593853636c Merge branch 'backupyourcenturion' into 'master' 
Remove cooldown for ranged back up (bug #5129)

Closes #5129

See merge request OpenMW/openmw!2275
 2022-08-15 07:57:11 +00:00
Andrei Kortunov
e3ad30a517 Do not copy data when it is not needed 2022-08-15 11:52:09 +04:00
Alexei Kotov
6b07acbbae Override non-biped follow animation by movement 2022-08-15 04:14:57 +03:00
Alexei Kotov
ff5a042f5b Remove cooldown for ranged back up (bug #5129) 2022-08-15 03:51:16 +03:00
Matt
e6868fd211 Allow constexpr hashing 2022-08-14 19:06:29 +00:00
Evil Eye
de8d9b8db3 Use Fowler-Noll-Vo hash instead of std::hash 2022-08-14 19:55:32 +02:00
Alexei Kotov
e537f2b6f3 Fix display for some package settings 2022-08-14 19:51:43 +03:00
Evil Eye
eaa108d25d Return string_view from SoundId methods 2022-08-14 14:39:58 +02:00
Evil Eye
4e9335f10a Fix include 2022-08-13 11:15:12 +02:00
psi29a
16922f8000 Merge branch 'cs-tables-doc-fix' into 'master' 
OpenMW-CS tables doc polish

See merge request OpenMW/openmw!2269
 2022-08-13 08:12:22 +00:00
Matjaž Lamut
d67b1e1320 OpenMW-CS tables doc polish 2022-08-13 08:12:22 +00:00
psi29a
5b4e2ab843 Merge branch 'unitedstatesofswish' into 'master' 
Character controller, round 9: melee hit evaluation, swish sound (bug #5057)

Closes #5057

See merge request OpenMW/openmw!2268
 2022-08-13 07:09:03 +00:00
Alexei Kotov
7f3d2c18e1 Evaluate melee hits on weapon release (bug #5057) 2022-08-13 01:15:42 +03:00
Alexei Kotov
6c05192afa Fix swish sound volume and pitch (bug #5057) 2022-08-13 01:15:41 +03:00
Evil Eye
2deec591cd Use heterogenous maps for scripts 2022-08-12 20:56:50 +02:00
Evil Eye
51938f9ef7 Use string_view in Interpreter::Context 2022-08-12 19:42:35 +02:00
Evil Eye
4eb6c48285 Avoid copying in InputManager 2022-08-12 18:42:12 +02:00
psi29a
8e7ddc7c0d Merge branch 'attackattackattack' into 'master' 
Character controller, round 8: rewrite attack animation logic (bug #4127)

Closes #4127

See merge request OpenMW/openmw!2263
 2022-08-12 15:17:51 +00:00
psi29a
64a72fcb16 Merge branch 'getScript_view' into 'master' 
Make getScript return string_view

See merge request OpenMW/openmw!2264
 2022-08-12 14:12:42 +00:00
psi29a
feacc1b837 Merge branch 'sky-doc-small-fixes' into 'master' 
Better wording and formatting of the Sky Structure doc

See merge request OpenMW/openmw!2265
 2022-08-12 10:03:16 +00:00
Matjaž Lamut
fe4001d96b Better wording and formatting of the Sky Structure doc 2022-08-12 10:03:16 +00:00