1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-11 06:40:34 +00:00

15102 Commits

Author SHA1 Message Date
psi29a
d3874644c1 Merge branch 'oripaging' into 'master'
Try printing template textures if instance textures are unavailable for any reason

See merge request OpenMW/openmw!2709
2023-02-10 16:53:02 +00:00
Alexei Kotov
7b62d47abc Support /-separated big effect icon paths 2023-02-10 18:34:20 +03:00
Alexei Kotov
e96448d66f Use model template as a fallback in BetaComment 2023-02-10 17:24:02 +03:00
Alexei Kotov
f356d0a2fc Check if the console's selected object is available (bug #5870) 2023-02-10 16:08:38 +03:00
psi29a
b385f27f86 Merge branch 'console_history' into 'master'
Remembering console commands between sessions

Closes #7125

See merge request OpenMW/openmw!2603
2023-02-10 11:54:45 +00:00
Kindi
044d82a842 Remembering console commands between sessions 2023-02-10 11:54:45 +00:00
psi29a
f14031b30b Merge branch 'ori' into 'master'
Print bound textures in BetaComment (feature #7194)

See merge request OpenMW/openmw!2705
2023-02-10 07:45:57 +00:00
Alexei Kotov
192f79841b Print bound textures in BC (feature #7194) 2023-02-10 03:05:33 +03:00
Alexei Kotov
5340c2c816 Fix Lua ingredient bindings 2023-02-10 02:50:13 +03:00
elsid
2c43a8558a
Add option to disable debug log for unsupported nif files
It becomes quite extensive and not very useful when loading oblivion content
files.
2023-02-08 22:59:29 +01:00
elsid
36b33cc1a5
Support absence of player and other actors in physics system 2023-02-08 20:19:59 +01:00
psi29a
944931c9bf Merge branch 'load_esm4_lights' into 'master'
Adds ESM4 light into ESM4 Cells

See merge request OpenMW/openmw!2692
2023-02-07 16:50:10 +00:00
florent.teppe
486d15b19e moved light common to its own file
moved esm4light to it's own file
2023-02-07 16:29:17 +01:00
florent.teppe
dc961e3189 Adds the light into the scene.
Common struct for ESM3 and ESM4 light
2023-02-07 10:07:59 +01:00
elsid
f09789002a
Define hardcoded global variable names as constants 2023-02-07 00:47:34 +01:00
elsid
af003d94f8
Log error when failed to open stats file 2023-02-06 21:52:35 +01:00
florent.teppe
a71a86e64a Load light models in the engine. Doesn't emit light 2023-02-06 20:22:17 +01:00
Evil Eye
97c6d25d54 Use correct exterior cell when positioning 2023-02-06 16:36:45 +01:00
psi29a
4032c447e9 Merge branch 'load-ESM4-Cell' into 'master'
Can load and coc into an interrior oblivion cell

See merge request OpenMW/openmw!2647
2023-02-06 08:56:23 +00:00
glassmancody.info
e778ffee9b po2 scaling for average luminance 2023-02-05 12:30:38 -08: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
florent.teppe
084207af64 Avoids a lot a special cases for ESM3 vs ESM4 cells. 2023-02-04 23:25:06 +01: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
florent.teppe
f3d5f6345e Fixed large lambdas that affected readability. 2023-02-04 17:16:42 +01:00
florent.teppe
1caed2de2a Applies some review comments.
Proper visit for ESM::CellVariant

Fixed MWWorldCell constructor
2023-02-04 17:09:54 +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
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
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
31b2112e4a Don't lowerCase twice when getting globals 2023-02-01 18:15:49 +01:00
uramer
e96681151c Get rid of the LuaUI::Content namespace 2023-02-01 17:18:50 +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
Petr Mikheev
c4e8d38e30 Do several passes of garbage collecting in LuaManager::clear() 2023-01-31 11:08:01 +00:00
florent.teppe
4e7cde5d72 applied some review changes.
crashfix tests
2023-01-30 20:49:34 +01:00
psi29a
68ad3f8f10 Fix building water.cpp on macos 2023-01-30 17:04:41 +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
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
Andrzej Głuszak
66e5fbb286 Use string_view in journalbooks 2023-01-29 21:31:21 +01:00
glassmancody.info
897ee702d1 move water normal to vfs 2023-01-29 11:14:08 -08:00
uramer
fc1430af95 Move implementation of UI Content to Lua 2023-01-29 17:07:38 +01:00
florent.teppe
144e0197fb fix charge int + struct vs class mismatch 2023-01-29 12:27:41 +01:00
florent.teppe
ebfee18e35 implements std::visit for CellVariant, fixes struct vs class forward decl 2023-01-29 11:28:39 +01:00
florent.teppe
0723c32428 flags no longer bitfield 2023-01-29 10:59:39 +01:00
florent.teppe
aa29f86efe fixed struct vs class. 2023-01-29 10:59:39 +01:00
fteppe
808c7367c9 Fix compile 2023-01-29 10:54:21 +01:00
glassmancody.info
165013ddd6 remove redunant conditional checks when getting uniforms 2023-01-28 10:40:24 -08:00
florent.teppe
9054722f4a std::visit everywhere! 2023-01-28 19:21:13 +01:00