1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00

30081 Commits

Author SHA1 Message Date
psi29a
aee7716c3a Merge branch 'launcher_typed_settings' into 'master'
Typed launcher settings

See merge request OpenMW/openmw!2650
2023-02-04 23:41:59 +00:00
psi29a
8b0e55dd5f Merge branch 'remove-water-walking-teleport-underwater' into 'master'
teleporting to an underwater marked location will remove water walking spell effects from actor

Closes #7122

See merge request OpenMW/openmw!2656
2023-02-04 23:41:29 +00:00
psi29a
822c6ac6a7 Merge branch 'fix_warnings' into 'master'
Enable and fix new warnings

See merge request OpenMW/openmw!2679
2023-02-04 23:40:06 +00:00
psi29a
f67896893d Merge branch 'editwidgetfixes' into 'master'
Minor fixes to editwidget.cpp

See merge request OpenMW/openmw!2680
2023-02-04 23:39:51 +00:00
James-Deciutiis
273a2ae323 teleporting to an underwater marked location will remove water walking spell effects from actor
fix formatting

addressing hasWaterWalking comment

refactor to address remaining comments

clean up formatter changes

adding suggested condition to if statement

move isWaterWalking check into if statement

refactor if block to see if actor needs to have water walking purged

added entry to changelog.md and authors.md

removing redundant check from if statement

Sort previous changelog entry
2023-02-04 11:30:37 -08:00
unelsson
fe70285ac1 Fixes 2023-02-04 15:32:17 +02:00
elsid
6f1a434234
Check for more warnings 2023-02-04 00:10:32 +01:00
elsid
f1dbd9b959
Fix -Wduplicated-branches warnings 2023-02-04 00:10:30 +01:00
elsid
c79c14da91
Fix -Wnon-virtual-dtor warnings 2023-02-03 23:00:09 +01:00
elsid
a8a3ff9548
Fix setting OPENMW_CXX_FLAGS
Using ${OPENMW_CXX_FLAGS} as variable name means using underlying string value
which is not correct for fixed cases.
2023-02-03 22:59:26 +01:00
psi29a
3f9cae7947 Merge branch 'dragdetails' into 'master'
[OpenMW-CS] Generate record filters based on cell content and column header

Closes #7161

See merge request OpenMW/openmw!2617
2023-02-03 09:29:36 +00:00
unelsson
e4809976dd add changelog 2023-02-02 20:13:06 +02:00
psi29a
537f5b1b8e Merge branch 'changelog' into 'master'
Add changelog entries

See merge request OpenMW/openmw!2669
2023-02-02 09:53:35 +00:00
Andrzej Głuszak
27a5fd6439 Add changelog entries 2023-02-02 09:53:35 +00:00
psi29a
00978ed7a4 Merge branch 'wherefore_art_thou_horatius' into 'master'
Fix global variable replacement in dialogue

Closes #7197

See merge request OpenMW/openmw!2675
2023-02-01 23:38:32 +00:00
psi29a
68b3b90255 Merge branch 'ui_content_leak' into 'master'
Move implementation of UI Content to Lua (#7155)

See merge request OpenMW/openmw!2661
2023-02-01 22:51:47 +00:00
psi29a
9c92a8ab57 Merge branch 'fix_gpu_osg_stats' into 'master'
Delay OSG stats reporting for 3 frames

See merge request OpenMW/openmw!2677
2023-02-01 22:49:18 +00:00
Evil Eye
8d2b5ed8ee Combine initializer_lists 2023-02-01 22:27:22 +01:00
psi29a
c28eba53e4 Merge branch 'global_view' into 'master'
Don't lowerCase twice when getting globals

See merge request OpenMW/openmw!2676
2023-02-01 21:08:17 +00:00
psi29a
6cf1e8e49c Merge branch 'lost_archives' into 'master'
Restore 0936d716d96cd45b3efc2d1a3697614f7f96952d

See merge request OpenMW/openmw!2674
2023-02-01 21:07:48 +00:00
elsid
96ea1903c5
Delay OSG stats reporting for 3 frames
Instead of 2 to make sure GPU draw time taken is always reported.
2023-02-01 22:01:55 +01:00
Evil Eye
d3bc79e9b2 Reduce code duplication 2023-02-01 21:57:50 +01:00
Evil Eye
31b2112e4a Don't lowerCase twice when getting globals 2023-02-01 18:15:49 +01:00
Evil Eye
32ac7406ab Fix global variable replacement in dialogue 2023-02-01 17:49:11 +01:00
Evil Eye
571e11cd42 Restore 0936d716d96cd45b3efc2d1a3697614f7f96952d 2023-02-01 17:26:39 +01:00
uramer
e96681151c Get rid of the LuaUI::Content namespace 2023-02-01 17:18:50 +01:00
uramer
d24c506b0e Move metatable protection asserts to tests 2023-02-01 16:34:32 +01:00
uramer
2a35bae655 Use range_error for invalid indexes 2023-02-01 16:24:58 +01:00
uramer
fb0646dda1 Remove Ui Content counter in Lua profiler 2023-01-31 19:52:28 +01:00
uramer
bbbef96087 Switch to loadInternalLib 2023-01-31 19:50:33 +01:00
psi29a
613453c799 Merge branch 'ptmikheev-master-patch-07827' into 'master'
Do several additional passes of garbage collecting in LuaManager::clear()

See merge request OpenMW/openmw!2672
2023-01-31 13:22:37 +00:00
psi29a
fd16257da6 Merge branch 'fix-title-too-short' into 'master'
Fix title underline too short Sphinx warning

See merge request OpenMW/openmw!2671
2023-01-31 11:56:17 +00:00
Petr Mikheev
c4e8d38e30 Do several passes of garbage collecting in LuaManager::clear() 2023-01-31 11:08:01 +00:00
psi29a
3a986d9a51 Merge branch 'macos_water_compile_fix' into 'master'
Fix building water.cpp on macos

See merge request OpenMW/openmw!2670
2023-01-31 11:00:55 +00:00
psi29a
a0c04db222 repair brew taps 2023-01-31 08:54:44 +00:00
uramer
539ee77888 Note Layout names colliding with Content methods 2023-01-30 23:29:00 +01:00
uramer
192e765bf3 Fix title underline too short Sphixn warning 2023-01-30 22:26:28 +00:00
uramer
c7b0c0a406 Protecd UI Content's metatable 2023-01-30 23:22:18 +01:00
psi29a
92f88c16a9 Merge branch 'remove-strerror' into 'master'
Remove strerror usages

Closes #7151

See merge request OpenMW/openmw!2664
2023-01-30 17:09:39 +00:00
psi29a
68ad3f8f10 Fix building water.cpp on macos 2023-01-30 17:04:41 +00:00
psi29a
bc90636316 Merge branch 'fix-7117' into 'master'
Replace boost::scoped_array with std::vector

Closes #7117

See merge request OpenMW/openmw!2662
2023-01-30 14:12:04 +00:00
psi29a
ac8ae3f226 Merge branch 'journalbooks' into 'master'
Use string_view in journalbooks

See merge request OpenMW/openmw!2663
2023-01-30 13:25:12 +00:00
psi29a
6559860310 Merge branch 'water_nm_to_vfs' into 'master'
Move water normal to vfs (#7180)

Closes #7180

See merge request OpenMW/openmw!2657
2023-01-30 13:18:27 +00:00
psi29a
ef0a81e811 Merge branch 'integration_tests_crash_log' into 'master'
Use proper log paths and print crash log in integration tests CI job

See merge request OpenMW/openmw!2668
2023-01-30 12:12:21 +00:00
Petr Mikheev
3096111abb Merge branch 'docs_fixes' into 'master'
Documentation and API fixes (part of !2529)

See merge request OpenMW/openmw!2649
2023-01-30 10:13:26 +00:00
uramer
c17eedd348 Documentation and API fixes (part of !2529) 2023-01-30 10:13:26 +00:00
elsid
c44bc5ade5
Setup logging with properly initialized configuration manager
Default constructed instance may provide different paths from initialized one.
2023-01-30 09:30:55 +01:00
elsid
9c8a110efb
Print crash log in integration tests CI job 2023-01-30 09:30:55 +01:00
elsid
007ad4e4d1
Write crash log to temporary directory
To make sure current user has rights to do so.
2023-01-30 09:30:55 +01:00
Andrzej Głuszak
9b0a499b58 Remove strerror usages 2023-01-29 22:41:59 +01:00