mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 21:42:13 +00:00
Code Issues Projects Releases Wiki Activity
30,006 Commits 17 Branches 65 Tags 492 MiB
897ee702d1
Commit Graph

30006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
glassmancody.info
897ee702d1 move water normal to vfs 2023-01-29 11:14:08 -08:00
psi29a
22c62a8c38 Merge branch 'join_path' into 'master' 
Join path components using path::operator/ instead of string::operator+

See merge request OpenMW/openmw!2652
 2023-01-27 08:25:59 +00:00
elsid
0961720835
Join path components using path::operator/ instead of string::operator+ 2023-01-27 01:07:15 +01:00
Alexei Kotov
0f9bb71534 Merge branch 'morecicells' into 'master' 
Fix more case issues with cells

See merge request OpenMW/openmw!2648
 2023-01-25 22:16:22 +00: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
psi29a
897b5afd79 Merge branch 'fix_coc_searchExtByName' into 'master' 
fix coc search Store<ESM::Cell>::searchExtByName

See merge request OpenMW/openmw!2646
 2023-01-24 00:15:45 +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
psi29a
e0f7884635 Merge branch 'count_loc' into 'master' 
Improve duration tooltip

See merge request OpenMW/openmw!2644
 2023-01-22 13:20:23 +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
psi29a
90d9cc5042 Merge branch 'old-editor-icons' into 'master' 
Remove old, unused OpenMW-CS icons and their source files.

See merge request OpenMW/openmw!2624
 2023-01-21 22:44:06 +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
psi29a
eb853b1315 Merge branch 'ptmikheev-master-patch-34687' into 'master' 
Fix constexprant

See merge request OpenMW/openmw!2643
 2023-01-21 22:42:03 +00:00
psi29a
f5cacad426 Merge branch 'Revert_CellName_Type' into 'master' 
Revert the usage of ESM::RefID for cell names.

See merge request OpenMW/openmw!2642
 2023-01-21 22:32:29 +00:00
Petr Mikheev
24ef6d29d4 Fix constexprant 2023-01-21 21:58:17 +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
florent.teppe
63e44eddc9 Navigator doesn't use RefId anymore 2023-01-21 18:39:57 +01:00
florent.teppe
150e2ba885 Revert "Use ESM::RefId for worldspace in detournavigator" 
This reverts commit b4ab153418.

# Conflicts:
#	apps/navmeshtool/worldspacedata.cpp
 2023-01-21 18:39:57 +01:00
florent.teppe
3780033837 Reverts Cell name to a string 2023-01-21 18:39:42 +01:00
psi29a
1390c7ed7c Merge branch 'wizard_encodings' into 'master' 
Do not use Qt streams with legacy encodings in the Wizard code

Closes #7165

See merge request OpenMW/openmw!2634
 2023-01-21 16:37:43 +00:00
psi29a
761aef61ae Merge branch 'normal_fix' into 'master' 
Fix pass normals (#7146, #7145)

See merge request OpenMW/openmw!2635
 2023-01-21 16:36:45 +00:00
psi29a
757cf7098d Merge branch 'minor-cleanup' into 'master' 
Use dedicated function to convert QString to std::filesystem::path

See merge request OpenMW/openmw!2636
 2023-01-21 16:36:07 +00:00
Alexei Kotov
fd6e96576a Rework music playback (bug #7172) 2023-01-21 05:56:12 +03:00
glassmancody.info
564c408663 expose more uniforms to postprocessing 2023-01-20 17:43:54 -08:00
Cody Glassman
762eda74f7 Merge branch 'lua_util' into 'master' 
Apply clang-format to the previous commit

See merge request OpenMW/openmw!2639
 2023-01-21 00:55:18 +00:00
AnyOldName3
438b03908d Use dedicated function to convert QString to std::filesystem::path II 
Some missed conversions identified in review.
 2023-01-20 23:39:30 +00:00
Petr Mikheev
95999afefd Apply clang-format to the previous commit 2023-01-20 23:44:12 +01:00
Petr Mikheev
ca48b778c3 Merge branch 'addutils' into 'master' 
Add remap and round to lua utils

See merge request OpenMW/openmw!2605
 2023-01-20 22:28:34 +00:00
Kindi
07da7eddea Add remap and round to lua utils 2023-01-20 22:28:34 +00:00
Andrei Kortunov
9a7c57874d Do not use Qt streams with legacy encodings in the Wizard code 2023-01-20 11:24:23 +04:00
Alexei Kotov
f0e58d1c59 Merge branch 'ensure_utf8_encoding' into 'master' 
Move ensureUtf8Encoding to named namespace

See merge request OpenMW/openmw!2632
 2023-01-20 05:17:44 +00:00
AnyOldName3
f757ac642a Use dedicated function to convert QString to std::filesystem::path 
I noticed this while reviewing something else and trying to find the
function to recommend using it.
 2023-01-19 22:36:51 +00:00
glassmancody.info
27fe8d42ae fix pass normals 2023-01-19 09:28:51 -08:00
elsid
dd89403df0
Move ensureUtf8Encoding to named namespace 
To follow https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#sf21-dont-use-an-unnamed-anonymous-namespace-in-a-header

Add QtGlobal include to define QT_VERSION and QT_VERSION_CHECK macroses before
they're used.
 2023-01-18 22:58:35 +01:00
psi29a
e575c25278 Merge branch 'no_teleporting_before_you_eat_your_veggies' into 'master' 
Delay teleportation till the menu is closed

Closes #7170

See merge request OpenMW/openmw!2631
 2023-01-18 21:55:24 +00:00
Evil Eye
08f998eeb1 Delay teleportation till the menu is closed 2023-01-18 19:57:05 +01:00
psi29a
ee980721b8 Merge branch 'debug_lua_memory' into 'master' 
Additional information in Lua profiler

See merge request OpenMW/openmw!2612
 2023-01-18 14:33:05 +00:00
psi29a
3fea82c06c Merge branch 'remove_ptr_conversion' into 'master' 
Remove implicit conversion MWWorld::Ptr -> bool

See merge request OpenMW/openmw!2626
 2023-01-18 14:32:58 +00:00
psi29a
fbeacc1e0f Merge branch 'navigator_check_agent_bounds' into 'master' 
Check agent bounds on adding agent to navigator

See merge request OpenMW/openmw!2629
 2023-01-18 14:31:22 +00:00
psi29a
54c18ea86d Merge branch 'change-const-to-constexpr' into 'master' 
change const to constexpr

Closes #6797

See merge request OpenMW/openmw!2630
 2023-01-18 14:30:36 +00:00
elsid
cf1d8544e3
Check agent bounds on adding agent to navigator 
Do not add agent bounds which are not supported by recastnavigation with given
settings and log such events.

To avoid reaching navmesh tile generation to find out it can't be generated for
such agent bounds.
 2023-01-18 12:00:48 +01:00
James-Deciutiis
4e61fec14d change const to constexpr 2023-01-17 19:31:52 -08:00
Petr Mikheev
e9420b2b68 Remove implicit conversion MWWorld::Ptr -> bool 2023-01-18 02:40:56 +01:00
psi29a
a7e37509de Merge branch 'xanimphysics' into 'master' 
Fix animated object physics

Closes #7164

See merge request OpenMW/openmw!2623
 2023-01-16 17:15:37 +00:00