1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 21:45:35 +00:00
Commit graph

29126 commits

Author SHA1 Message Date
psi29a
33d85635fd Merge branch 'terraindocs' into 'master'
Clarify object paging merge factor docs (#5924)

Closes #5924

See merge request OpenMW/openmw!2295

(cherry picked from commit 0d776d7009)

15f4b551 Clarify object paging merge factor docs
2022-08-18 08:59:50 +00:00
psi29a
18de21cf13 Update CHANGELOG.md 2022-08-17 23:30:41 +02:00
psi29a
bbfc573b15 Merge branch 'windows_save' into 'master'
[Postprocessing] Mitigate clashes with live reload and external saves on windows

See merge request OpenMW/openmw!2237

(cherry picked from commit 92f3b4ba82)

0f9a7594 wait a brief moment before reading a file marked as modified
2022-08-17 21:19:36 +00:00
psi29a
341161ba03 Merge branch 'fontconfig' into 'master'
Allow users to decide if they need to import bitmap fonts

See merge request OpenMW/openmw!2270

(cherry picked from commit 1e4dd46688)

43f552f4 Allow users to decide if they need to import bitmap fonts
2022-08-17 21:16:56 +00:00
psi29a
f45bb18614 Merge branch 'swedish-i10n-0-48' into 'master'
Updated Swedish strings for built-in shaders

See merge request OpenMW/openmw!2284

(cherry picked from commit 2a892a2525)

b3b16284 Update BuiltInShaders/sv.yaml
2022-08-17 20:09:38 +00:00
psi29a
efa4b52e9a Comment out flatpack build for now. 2022-08-17 09:01:46 +02:00
psi29a
3fdb2201b4 Merge branch 'cherry-pick-856fcb77' into 'openmw-48'
Merge branch 'FlatpakCI' into 'master' flatpack RC1

See merge request OpenMW/openmw!2285
2022-08-16 10:58:39 +00:00
psi29a
fda1127b5c Merge branch 'FlatpakCI' into 'master'
Flatpak CI Build

See merge request OpenMW/openmw!2066

(cherry picked from commit 856fcb7742)

274ad078 add flatpak ci
2022-08-16 10:55:40 +00:00
psi29a
d444b1b350 Merge branch 'coverity' into 'master'
Do not copy data when it is not needed

See merge request OpenMW/openmw!2277

(cherry picked from commit f42ab6a3e7)

e3ad30a5 Do not copy data when it is not needed
2022-08-16 07:27:29 +00:00
psi29a
cc27baec62 Merge branch 'update-windows-deps' into 'openmw-48'
Update OSGoS dependency package

See merge request OpenMW/openmw!2278
2022-08-16 07:18:58 +00:00
Alexander Olofsson
149d0b2f29
Increment CI cache key for Windows builds 2022-08-15 23:52:29 +02:00
Alexander Olofsson
619bb73d44
Add lost backslash 2022-08-15 10:36:46 +02:00
Alexander Olofsson
944e748971
Use the correct debug-suffixes for dependencies 2022-08-15 10:23:06 +02:00
Alexander Olofsson
14663b8314
Update OSGoS dependency package 2022-08-15 10:15:29 +02:00
psi29a
df3ebf6b87 Merge branch 'cs-tables-doc-fix' into 'master'
OpenMW-CS tables doc polish

See merge request OpenMW/openmw!2269
2022-08-14 09:54:55 +02:00
psi29a
15ed99be5b 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 12:05:11 +02:00
psi29a
0fb2c96a69 Merge branch 'stagger' into 'openmw-48'
Stagger fixes, 0.48.0 edition

See merge request OpenMW/openmw!2259
2022-08-10 16:16:18 +00:00
Alexei Kotov
2f5f2bdbad Stagger fixes, 0.48.0 edition 2022-08-10 17:30:43 +03:00
psi29a
f61cc5c60c Merge branch 'changelog2' into 'master'
Additional fixes for 0.48 changelog

See merge request OpenMW/openmw!2257
2022-08-10 12:06:17 +02:00
psi29a
bc79de4934 Merge branch 'sheerheartattackhasnoweaknesses' into 'master'
Animation regression fixes

See merge request OpenMW/openmw!2255
2022-08-10 09:56:03 +02:00
psi29a
cec1429c0f Merge branch 'cleanup' into 'master'
#5534 remove OSG 3.4 support and require at least 3.6.5 support

Closes #3180 and #5534

See merge request OpenMW/openmw!2228
2022-08-09 23:08:37 +02:00
psi29a
105be76d81 Merge branch 'localization-fr-1' into 'openmw-48'
French i10n translations

See merge request OpenMW/openmw!2250
2022-08-09 18:01:33 +00:00
Arnaud Dochain
5f69af582e French i10n translations 2022-08-09 18:01:33 +00:00
psi29a
0339e32c0c Merge branch 'ubb_fix' into 'master'
Remove excessive allocations in lightmanager

See merge request OpenMW/openmw!2251
2022-08-09 11:03:51 +02:00
psi29a
69654b6697 Merge branch 'revert_active' into 'master'
Revert traversal mode to default

See merge request OpenMW/openmw!2249
2022-08-07 16:23:19 +00:00
psi29a
6ee20835fc Merge branch 'main_pp' into 'master'
[Postprocessing] Remove default shader and simplify pipeline

Closes #6920

See merge request OpenMW/openmw!2248
2022-08-07 14:50:08 +00:00
cody glassman
ac4b29be08 cleanup default shaders and remove confusing main shader 2022-08-07 06:42:48 -07:00
psi29a
e75d3285cf Merge branch 'paged_refs_vector' into 'master'
Use std::vector to store paged ref nums

See merge request OpenMW/openmw!2245
2022-08-07 13:35:54 +00:00
psi29a
6d7216adba Merge branch 'coverity' into 'master'
Use ubuntu:20.04 docker image for Coverity

See merge request OpenMW/openmw!2244
2022-08-07 09:47:20 +00:00
cody glassman
c770c462e4 revert traversal nodes, discovered to break some NIFs with UV controllers 2022-08-06 11:39:23 -07:00
Alexei Kotov
bc1a6bfd72 Merge branch 'changelog' into 'master'
Cleanup 0.48 changelog

See merge request OpenMW/openmw!2247
2022-08-06 15:43:12 +00:00
Andrei Kortunov
af542a873f Cleanup 0.48 changelog 2022-08-06 15:05:51 +04:00
Alexei Kotov
0fd817150e Merge branch 'ordinator_farming_restored' into 'master'
Save state for disposed actors if they can respawn

Closes #6923

See merge request OpenMW/openmw!2232
2022-08-06 11:03:06 +00:00
Alexei Kotov
263a955290 Merge branch 'coverity' into 'master'
Avoid possible null dereference

See merge request OpenMW/openmw!2243
2022-08-06 10:53:38 +00:00
Alexei Kotov
43db803938 Merge branch 'race_scroll' into 'master'
Allow mouse scrolling in the race preview widget

See merge request OpenMW/openmw!2246
2022-08-06 10:49:02 +00:00
Andrei Kortunov
7dd668bf12 Allow mouse scrolling in the race preview widget (feature 6925) 2022-08-06 11:25:27 +04:00
elsid
dffb12ac05
Use std::vector to store paged ref nums 2022-08-06 02:11:58 +02:00
Andrei Kortunov
8812705838 Avoid possible null dereference - throw an exception instead 2022-08-05 20:26:27 +04:00
Alexei Kotov
86a4d530c4 Merge branch 'luaprofiler' into 'master'
Implementing profiler stats for LuaManager::synchronizedUpdate

See merge request OpenMW/openmw!2215
2022-08-05 16:19:57 +00:00
Christian Haro
19a08d19d6 Implementing profiler stats for LuaManager::synchronizedUpdate 2022-08-05 16:19:57 +00:00
elsid
a5a3ccd0d2
Use ubuntu:20.04 docker image for Coverity 2022-08-05 11:46:05 +02:00
psi29a
00f8c9760a Merge branch 'fixed_string_tests' into 'master'
Replace deprecated std::is_pod

See merge request OpenMW/openmw!2239
2022-08-04 09:55:51 +00:00
psi29a
b55a511ad8 Merge branch 'idlechance' into 'master'
Fix Wander random idle chance

See merge request OpenMW/openmw!2242
2022-08-04 09:55:05 +00:00
psi29a
9c4ca98421 Merge branch 'sheathing' into 'master'
Avoid cosmetic view-mode dependent issues in shield sheathing

Closes #6845

See merge request OpenMW/openmw!2241
2022-08-04 09:54:43 +00:00
psi29a
77b82add49 Merge branch 'google_test_fetch_content' into 'master'
Use FetchContent to get googletest

See merge request OpenMW/openmw!2240
2022-08-04 09:53:52 +00:00
Alexei Kotov
19dc4cda9b Avoid cosmetic view-mode dependent issues in shield sheathing 2022-08-04 05:33:54 +03:00
elsid
8e4f6fc4e4
Use FetchContent to get googletest 2022-08-04 01:12:11 +02:00
elsid
da0a1ac9ba
Do compile time checks in compile time instead of tests 2022-08-03 21:47:00 +02:00
elsid
c42c0dcbc9
Replace deprecated std::is_pod
apps/openmw_test_suite/esm/test_fixed_string.cpp:99:23: warning: ‘template<class _Tp> struct std::is_pod’ is deprecated: use is_standard_layout && is_trivial instead [-Wdeprecated-declarations]
   99 |      ASSERT_TRUE(std::is_pod<ESM::NAME>::value);
      |                       ^~~~~~
2022-08-03 21:47:00 +02:00
psi29a
17fcc254c0 Merge branch 'test' into 'master'
[Postprocessing] Dont ignore tested objects in postpass

See merge request OpenMW/openmw!2236
2022-08-03 16:09:46 +00:00