1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 18:29:55 +00:00
Commit graph

30772 commits

Author SHA1 Message Date
Andrei Kortunov
1be1f72f6c Improve shaders formatting 2023-04-21 09:02:12 +04:00
AnyOldName3
629300eee8 Merge branch 'ci_clang_tidy' into 'master'
Split Ubuntu_Clang_Tidy job

See merge request OpenMW/openmw!2948
2023-04-20 22:35:02 +00:00
psi29a
a6584557e5 Merge branch 'lua_magic' into 'master'
Lua bindings for magic

See merge request OpenMW/openmw!2928
2023-04-20 19:44:39 +00:00
Petr Mikheev
90397662bc Lua bindings for magic. Based on the work made by @bharbich in !2765. 2023-04-20 18:48:34 +02:00
psi29a
0a9d937cfe Merge branch 'getcell-ref' into 'master'
WorldImp functions return reference instead of ptr when ptr is never nullptr.

See merge request OpenMW/openmw!2946
2023-04-20 16:41:46 +00:00
psi29a
55a162e3dd Merge branch 'load_esm4' into 'master'
Activation handler for ESM4 Door

See merge request OpenMW/openmw!2915
2023-04-20 15:38:49 +00:00
florent.teppe
5bb9bfd224 CellPreloader::preload(CellStore& 2023-04-20 16:58:19 +02:00
florent.teppe
a3a2685b9a More MWWorld::CellStore* -> MWWorld::CellStore& 2023-04-20 16:16:17 +02:00
florent.teppe
53cc9f3614 functions return reference instead of ptr
because the function can never return an nullptr, we return a reference.
2023-04-20 15:55:40 +02:00
Petr Mikheev
480951207c Activation handler for ESM4 Door 2023-04-20 13:42:17 +02:00
psi29a
2a6e301925 Merge branch 'activation' into 'master'
Allow Lua scripts to extend or override standard activation mechanics

See merge request OpenMW/openmw!2935
2023-04-20 11:29:21 +00:00
psi29a
cace3e6566 Merge branch 'fix_teleporting' into 'master'
Fix bugs related to Lua commands `obj:teleport` and `obj:moveInto`

See merge request OpenMW/openmw!2937
2023-04-20 11:28:02 +00:00
psi29a
0204cb51c0 Merge branch 'fix-#7335' into 'master'
Fix issue #7335

Closes #7335

See merge request OpenMW/openmw!2940
2023-04-20 11:26:33 +00:00
elsid
8e9c78d20c
Split Ubuntu_Clang_Tidy job 2023-04-20 11:15:32 +02:00
florent.teppe
fc3d113d29 fix tests 2023-04-20 10:25:10 +02:00
florent.teppe
6b5d9f3344 fixes reference saving stage 2023-04-20 10:03:35 +02:00
florent.teppe
cb4a97e50b Displays references in exterior cells. A bit hackish. 2023-04-20 10:03:35 +02:00
florent.teppe
3bbf60373a Keep things coherent between references and and cell table 2023-04-20 10:03:34 +02:00
florent.teppe
69f2285a95 fix issue #7335 2023-04-20 09:55:17 +02:00
psi29a
70ddca78bf Merge branch 'ref_id_print_tests' into 'master'
Add more tests for printing RefId and clarify some constants

See merge request OpenMW/openmw!2945
2023-04-20 07:29:05 +00:00
psi29a
5212f4f623 Merge branch 'lua_esm4' into 'master'
Initial Lua bindings for ESM4 types

See merge request OpenMW/openmw!2916
2023-04-20 07:28:11 +00:00
elsid
7db14b3392
Add more tests for printing RefId and clarify some constants 2023-04-20 02:35:14 +02:00
elsid
c97df7d770
Check FormIdRefId value in constructor 2023-04-20 02:19:05 +02:00
Petr Mikheev
3546d2b3e5 Make Store<ESM4::Reference> to use FormId instead of RefId 2023-04-20 01:47:16 +02:00
Petr Mikheev
1c3903f155 Support ESM4 types in cell:getAll 2023-04-20 01:47:16 +02:00
Petr Mikheev
00beb06391 Initial Lua bindings for ESM4 types; bindings for ESM4Door. 2023-04-20 01:47:16 +02:00
Petr Mikheev
16845aa38e Reorganize ESM4 MWClasses; Add tooltips that are needed for activation. 2023-04-20 01:47:16 +02:00
psi29a
4738f0ff4d Merge branch 'fix_lua' into 'master'
Restore logic that was accidentally removed in !2852.

See merge request OpenMW/openmw!2943
2023-04-19 10:56:42 +00:00
psi29a
f15e371e89 Merge branch 'pathstore' into 'master'
Unify pathgrid store containers

See merge request OpenMW/openmw!2941
2023-04-19 10:54:55 +00:00
unknown
9368941f62 Address feedback 2023-04-19 02:31:40 +02:00
Petr Mikheev
75e47f859c Restore logic that was accidentally removed in !2852. Because of it onUpdate handler in local Lua scripts doesn't work. 2023-04-18 23:31:44 +02:00
Petr Mikheev
35f8cef469 Merge branch 'fix_format' into 'master'
Fix code format

See merge request OpenMW/openmw!2942
2023-04-18 21:31:11 +00:00
elsid
b8525e8e3d
Fix code format 2023-04-18 20:23:03 +02:00
unknown
ea1abf8485 Unify pathgrid store containers 2023-04-18 20:18:11 +02:00
psi29a
ed4e75df65 Merge branch 'fix_includes' into 'master'
Add missing and remove redundant includes

See merge request OpenMW/openmw!2938
2023-04-18 11:46:52 +00:00
psi29a
b530d8e669 Merge branch 'master' into 'master'
OpenSUSE Tumbleweed build fix

See merge request OpenMW/openmw!2939
2023-04-18 11:02:41 +00:00
AnyOldName3
3313326e6d Merge branch 'ci_rules' into 'master'
Use merge_request_event as a source for CI jobs when there is MR

See merge request OpenMW/openmw!2933
2023-04-17 23:37:54 +00:00
fall-leaf
cc7e29c9a2 opensuse build fix 2023-04-17 23:40:15 +03:00
elsid
b33d12b8e1
Add missing and remove redundant includes 2023-04-17 22:02:36 +02:00
Petr Mikheev
0cebaec360 Fix bug: world.createObject(id):moveTo(inventory) produces disabled objects that are visible in inventory, but can not be droped to the ground. 2023-04-17 19:07:44 +02:00
Petr Mikheev
60a8d08e66 Refactor teleporting in Lua; fix a bug in worldmodel.cpp 2023-04-17 19:07:30 +02:00
Petr Mikheev
61d207bd78 Allow Lua scripts to extend or override standard activation mechanics 2023-04-16 23:50:27 +02:00
psi29a
a82b7cb872 Merge branch 'windows_typed_settings' into 'master'
Use typed settings storage for windows (#6876)

See merge request OpenMW/openmw!2921
2023-04-16 19:36:27 +00:00
Petr Mikheev
91c85294d7 Merge branch 'soul_set_lua' into 'master'
Allow Soul values on Misc Items to be set by Lua

See merge request OpenMW/openmw!2927
2023-04-16 19:28:26 +00:00
Zackhasacat
224b7a0bf8 Allow Soul values on Misc Items to be set by Lua 2023-04-16 19:28:26 +00:00
elsid
74e38148f3
Use merge_request_event as a source for CI jobs when there is MR 2023-04-16 18:49:11 +02:00
psi29a
a14bbcb62f Merge branch 'doc-collada-texture-path' into 'master'
Documentation - more information on COLLADA texture paths

See merge request OpenMW/openmw!2925
2023-04-13 19:46:23 +00:00
Matjaž Lamut
1ab268d775 Documentation - more information on COLLADA texture paths 2023-04-13 19:46:23 +00:00
psi29a
6d2b0f3044 Merge branch 'interiorvention' into 'master'
Fix exterior check when finding markers

Closes #7330 and #7326

See merge request OpenMW/openmw!2923
2023-04-13 19:45:34 +00:00
Evil Eye
2deff337d8 Fix global map position 2023-04-13 17:44:23 +02:00