mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-27 09:41:16 +00:00
Code Issues Projects Releases Wiki Activity
30,678 Commits 17 Branches 68 Tags
Commit Graph

15226 Commits

Author SHA1 Message Date
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
florent.teppe
f9da66e9ee Greatly improved how the variant on MWWorld::CellRef works 2023-01-28 18:57:55 +01:00
florent.teppe
216ca71149 Applied review comments 
getEditorName => getNameId
restored cosntructor in CoordinateConverter
 2023-01-28 12:14:00 +01:00
florent.teppe
e6e27413d9 gives MWWorld::CellRef the MWWorld::Cell treatment 
MWWorld::CellRef now has a variant, and datas that are part of the intersection of both ESM4::Reference and ESM::CellRef are part of MWWorld::CellRef

For ESM4 most data isn't filled in, so it returns default values.
 2023-01-27 19:40:45 +01:00
florent.teppe
23614ae2ae Renamed esm3esm4bridge => esmbridge 2023-01-27 18:40:15 +01:00
florent.teppe
5037dcf9bc Fixes a crash on launch and some compile issue 
also uses std::visit in cellstore comparison to avoid missing combinasion

split loadrefs in loadref of ESM4 and ESM3.
 2023-01-27 16:41:00 +01:00
florent.teppe
cb8cdd8831 ESM::CellVariant aans MWWorld:Cell now take reference in constructor: signals that nullptr isn't accepted. 
also applied other review comments.
 2023-01-27 14:07:50 +01:00
florent.teppe
531e55e04c Better handling of the esm3 vs esm4 cell problem 
Common attribute are in one structure that has two constructors, one for ESM3 vs ESM4 Cell
Mood part of MWWorld::Cell
 2023-01-27 13:39:39 +01:00
florent.teppe
6d25d4bc13 It loads cells and palce sstatics in them 
Many missing meshes, no lights etc... But can coc into interior cells and see them.
 2023-01-26 22:37:32 +01:00
florent.teppe
3515c8e61a Static references are created as refcells, nothing displayed yet. 2023-01-26 22:37:32 +01:00
florent.teppe
c896a2ca48 Crashfix on launch 2023-01-26 22:37:32 +01:00
florent.teppe
0018bcf7de Should make cellvariant safer to use. 
Hopefully clang tidy agrees.
 2023-01-26 22:37:32 +01:00
florent.teppe
562e129bd0 encapsulations of esm3 cell and esm4 cells. 2023-01-26 22:37:31 +01:00
florent.teppe
08b68fcd48 Cannot load a cell yet, but getting more necessary parts in 2023-01-26 22:36:11 +01:00
florent.teppe
cddf6f29d6 Nothing can be loaded yet. Just foundations. 2023-01-26 22:36:11 +01:00
Evil Eye
7ca25e6467 Fix more case issues with cells 2023-01-25 20:59:10 +01:00
psi29a
9f3025257a Merge branch 'local_nwah' into 'master' 
Use worldspace coords in AiWanderStorage

See merge request OpenMW/openmw!2645
 2023-01-24 09:52:32 +00:00
fteppe
889de35b99 fix coc search extbyname 2023-01-23 22:49:01 +01:00
Evil Eye
d40a9ec5bc Use worldspace coords in AiWanderStorage 2023-01-23 21:06:50 +01:00
psi29a
a9dbb023d7 Merge branch 'lua_create' into 'master' 
Lua commands to create/move/remove objects; consistent handling of disabled objects (#6726, #6893)

See merge request OpenMW/openmw!2627
 2023-01-22 13:27:10 +00:00
Andrei Kortunov
a774a51699 Improve duration tooltip 2023-01-22 14:32:47 +04:00
Petr Mikheev
c294898246 Lua commands to create/move/remove objects; consistent handling of disabled objects (#6726, #6893) 2023-01-22 00:08:21 +01:00
psi29a
7be20301af Merge branch '24-7lofibeatstoachievechimto' into 'master' 
Rework music playback (bug #7172)

Closes #7172

See merge request OpenMW/openmw!2640
 2023-01-21 23:07:25 +00:00
Petr Mikheev
e7120f189b Unset RefNums after copying containers (otherwise copies will have the same RefNums, but they should be unique) 2023-01-21 23:43:00 +01:00
Petr Mikheev
5983f22290 Remember actor in the actor's InventoryStore instead passing the actor in every call 2023-01-21 23:43:00 +01:00
psi29a
1422053fa9 Merge branch 'more_uniforms' into 'master' 
[Postprocessing] Add sky and ambient colors

See merge request OpenMW/openmw!2638
 2023-01-21 22:42:21 +00:00
florent.teppe
a4137e941c std::string_view can be used in map and unordered map 
This avoids some unecessary dynamic allocations.
Also applies some review advice.
 2023-01-21 19:19:26 +01:00