unelsson
|
5b0713517a
|
Clang-format
|
2023-01-05 01:40:36 +02:00 |
|
unelsson
|
bfa0e751dd
|
Skip merging for only animated models (Collada)
|
2023-01-05 01:34:26 +02:00 |
|
unelsson
|
d065dbbefa
|
Add named-based Collada recognition
|
2023-01-04 16:07:47 +02:00 |
|
unelsson
|
ba9c2c9928
|
Add TemplateRef to animated Collada model
|
2023-01-03 22:51:46 +02:00 |
|
psi29a
|
a24fa3ea51
|
Merge branch 'collada_animation_layering' into 'master'
Collada animation layering
See merge request OpenMW/openmw!2475
|
2023-01-03 08:53:23 +00:00 |
|
psi29a
|
28dcde8909
|
Merge branch 'controls' into 'master'
Fix jumping (was broken by !2541)
See merge request OpenMW/openmw!2572
|
2023-01-03 08:51:21 +00:00 |
|
jvoisin
|
5fd4d1a097
|
Merge branch 'FIX_Dangling_reference' into 'master'
Fix dangling reference in openCS
See merge request OpenMW/openmw!2573
|
2023-01-02 21:35:29 +00:00 |
|
florent.teppe
|
1b66be9c70
|
Fix dangling reference.
|
2023-01-02 19:47:12 +01:00 |
|
Petr Mikheev
|
18088e3e31
|
Fix jumping (was broken by !2541)
|
2023-01-02 17:37:31 +01:00 |
|
Alexei Kotov
|
563324bcff
|
Merge branch 'swedish-translations-omwcontrols' into 'master'
Updates to Swedish translations (OMWControls)
See merge request OpenMW/openmw!2569
|
2023-01-02 11:28:34 +00:00 |
|
Alexei Kotov
|
c823b66cac
|
Merge branch 'fix_docs' into 'master'
Fix incorrect description in Lua docs
See merge request OpenMW/openmw!2570
|
2023-01-02 11:27:01 +00:00 |
|
Petr Mikheev
|
1a2d6514ba
|
Fix incorrect description is Lua docs
|
2023-01-01 20:19:56 +01:00 |
|
Joakim Berg
|
f120622dad
|
Updates to Swedish translations
|
2023-01-01 14:00:32 +00:00 |
|
jvoisin
|
500e8bdf4c
|
Merge branch 'fix_magic' into 'master'
Fix 'toggle spell' control (was broken by !2541)
See merge request OpenMW/openmw!2566
|
2022-12-31 15:05:44 +00:00 |
|
Petr Mikheev
|
aabd5a98c7
|
Fix 'toggle spell' control (was broken by !2541)
|
2022-12-31 13:12:12 +01:00 |
|
unelsson
|
fe7660eec8
|
clang-format again
|
2022-12-31 00:53:36 +02:00 |
|
unelsson
|
d60fd86719
|
clang format
|
2022-12-31 00:52:05 +02:00 |
|
unelsson
|
c71504eeb0
|
Better comments
|
2022-12-31 00:35:50 +02:00 |
|
unelsson
|
4676ac4ac9
|
Cleaner code part 2
|
2022-12-31 00:35:50 +02:00 |
|
unelsson
|
960019cf65
|
Cleaner code
|
2022-12-31 00:35:50 +02:00 |
|
unelsson
|
33afcbdc13
|
Use common function for blendmask detection, remove extra debug logs
|
2022-12-31 00:35:50 +02:00 |
|
unelsson
|
2efc691736
|
clang format
|
2022-12-31 00:35:50 +02:00 |
|
unelsson
|
7ef6b3cb62
|
automatic clang format
|
2022-12-31 00:35:50 +02:00 |
|
unelsson
|
d8de56e33c
|
Coding style improvements, add Torso animation layer
|
2022-12-31 00:35:50 +02:00 |
|
unelsson
|
ffc64205c5
|
Force collada animation layers, remove nif blend mask detection.
|
2022-12-31 00:35:50 +02:00 |
|
psi29a
|
3f6b33820a
|
Merge branch 'fix_recastnavigation_compatibility' into 'master'
Reset rcPolyMeshDetail members after rcFree
See merge request OpenMW/openmw!2564
|
2022-12-30 20:54:09 +00:00 |
|
elsid
|
c71862a8df
|
Reset rcPolyMeshDetail members after rcFree
To avoid double free causing by later recastnavigation versions.
|
2022-12-30 19:26:48 +01:00 |
|
psi29a
|
d5f5e53714
|
Merge branch 'playercontrols' into 'master'
Move some of player controls logic from C++ to Lua
See merge request OpenMW/openmw!2541
|
2022-12-30 16:57:40 +00:00 |
|
psi29a
|
e6064645db
|
Merge branch 'esm_ref_id_refactor' into 'master'
Simplify ESM::RefId
See merge request OpenMW/openmw!2563
|
2022-12-30 13:27:35 +00:00 |
|
psi29a
|
4b6fd63044
|
Merge branch 'detournavigator_ref_id' into 'master'
Use ESM::RefId for worldspace in detournavigator
See merge request OpenMW/openmw!2562
|
2022-12-30 13:26:55 +00:00 |
|
Alexei Kotov
|
7c5493307e
|
Merge branch 'move_changelog_record_7121' into 'master'
Move #7121 changelog record to 0.48
See merge request OpenMW/openmw!2561
|
2022-12-29 23:37:43 +00:00 |
|
elsid
|
755067f0f3
|
Remove redundant ESM::RefId member functions
|
2022-12-30 00:32:47 +01:00 |
|
elsid
|
fe57aec2a4
|
Move ESM::RefId comment to make sure IDEs recognize it and show in tooltips
|
2022-12-30 00:04:02 +01:00 |
|
elsid
|
b4ab153418
|
Use ESM::RefId for worldspace in detournavigator
|
2022-12-29 23:49:49 +01:00 |
|
elsid
|
9c91fdcf5d
|
Move #7121 changelog record to 0.48
|
2022-12-29 22:28:54 +01:00 |
|
psi29a
|
ae1b3083b5
|
Merge branch 'ificialintelligence' into 'master'
Minor AI priority changes
See merge request OpenMW/openmw!2558
|
2022-12-29 21:27:55 +00:00 |
|
Evil Eye
|
0a4f65c20b
|
Prioritise Absorb Attribute and Skill similarly to Damage and Drain
|
2022-12-29 12:41:37 +01:00 |
|
Evil Eye
|
dfca5d95c2
|
Don't apply spell multiplier to on hit enchantments
|
2022-12-29 12:40:10 +01:00 |
|
psi29a
|
114daa5938
|
Merge branch 'ptr3' into 'master'
Refactoring related to WorldModel
See merge request OpenMW/openmw!2549
|
2022-12-28 23:59:45 +00:00 |
|
Petr Mikheev
|
103908ffc7
|
Move getNorthVector out of MWWorld::World (used only in one place)
|
2022-12-28 22:06:49 +01:00 |
|
Petr Mikheev
|
310acaeee9
|
Don't pass MWLua::WorldView to MWLua::Action
|
2022-12-28 22:06:49 +01:00 |
|
Petr Mikheev
|
aef2e9d8de
|
Replace World::getExterior with WorldModel::getCell
|
2022-12-28 22:06:49 +01:00 |
|
Petr Mikheev
|
1879c70d1e
|
Return back old settings description and mention that they are moved to the in-game menu
|
2022-12-28 22:04:19 +01:00 |
|
Petr Mikheev
|
1869aeae5c
|
Move some of player controls logic from C++ to Lua
|
2022-12-28 22:04:19 +01:00 |
|
Petr Mikheev
|
0fef8f12d0
|
Remove functions WorldModel::rest and WorldModel::recharge
|
2022-12-28 12:45:11 +01:00 |
|
Petr Mikheev
|
b8fb013edf
|
Merge MWLua::ObjectRegistry and MWWorld::WorldModel
|
2022-12-28 12:45:11 +01:00 |
|
psi29a
|
80e2cd79ec
|
Merge branch 'boat_closer_to_todd' into 'master'
Ignore special characters preceding script commands
Closes #6807
See merge request OpenMW/openmw!2555
|
2022-12-28 11:21:24 +00:00 |
|
psi29a
|
ba2ececa93
|
Merge branch 'resolution' into 'master'
Improve window mode change
Closes #7087
See merge request OpenMW/openmw!2530
|
2022-12-28 10:45:14 +00:00 |
|
psi29a
|
56b493877b
|
Merge branch 'fonts' into 'master'
Improve Mystic cards font
See merge request OpenMW/openmw!2516
|
2022-12-28 10:44:21 +00:00 |
|
psi29a
|
7827d3ae8f
|
Merge branch 'fix_hour_modulo' into 'master'
Fix hour modulo expression (#7121)
Closes #7121
See merge request OpenMW/openmw!2556
|
2022-12-28 10:33:20 +00:00 |
|