1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 21:32:42 +00:00

3468 Commits

Author SHA1 Message Date
psi29a
2a4440e5b1 Merge branch 'theprojectileswereswords' into 'master'
Fix price enchantment price calculation to use the correct item count

Closes #7472

See merge request OpenMW/openmw!3227
2023-08-04 09:05:02 +00:00
psi29a
4aaffa72e5 Merge branch 'more_coverity_fixes' into 'master'
More coverity fixes

See merge request OpenMW/openmw!3304
2023-08-03 07:15:34 +00:00
Andrei Kortunov
d3d7a663c6 Move some objects instead of copying 2023-07-31 20:43:46 +04:00
Andrei Kortunov
b1c8a968ae Do not use invalid iterators 2023-07-31 17:53:33 +04:00
psi29a
b2f669ca48 Merge branch 'fix_async_load' into 'master'
Fix crash related to async content loading (#7508)

Closes #7508

See merge request OpenMW/openmw!3290
2023-07-31 10:49:33 +00:00
Petr Mikheev
0487bf95d1 Merge branch 'coverity49' into 'master'
Fix some Coverity warnings

See merge request OpenMW/openmw!3286
2023-07-31 00:09:14 +00:00
Petr Mikheev
2b601eea6d Fix crash related to async content loading (#7508) 2023-07-29 21:13:57 +02:00
Evil Eye
c47489ef6e Don't replace tags when dealing with console input 2023-07-29 17:07:37 +02:00
elsid
c9c32d9a0d
Cleanup includes 2023-07-29 00:16:43 +02:00
Andrei Kortunov
d8ec78d732 Fix some Coverity warnings 2023-07-28 20:58:18 +04:00
elsid
9acb93ab29
Use settings values for Map settings 2023-07-27 22:53:53 +02:00
psi29a
b9460afdfd Merge branch 'save-game-string-view' into 'master'
Refactor saveGame to use string_view

See merge request OpenMW/openmw!3271
2023-07-25 11:14:51 +00:00
psi29a
baf7ef2525 Merge branch 'copying' into 'master'
Avoid unnecessary LiveCellRef copying; Fix potential use-after-free in WorldModel

See merge request OpenMW/openmw!3276
2023-07-25 08:21:17 +00:00
AnyOldName3
6246b479ea Merge branch 'async_content_load' into 'master'
Speedup loading - load content files during logo video playing

See merge request OpenMW/openmw!3249
2023-07-24 23:42:46 +00:00
Petr Mikheev
4d004e4730 Avoid unnecessary LiveCellRef copying in a couple of places; change initialization order in WorldModel; 2023-07-24 23:36:24 +02:00
Christian Bouwense
4b5d64f9e5 inline asUTF8() instead of constructing a whole new string_view 2023-07-24 14:41:17 -04:00
Christian Bouwense
7d0caf9eec refactor saveGame to use string_view instead of a const standard string reference 2023-07-23 14:45:01 -04:00
psi29a
4973230b84 Merge branch 'settings_values_hud' into 'master'
Use settings values for HUD settings (#6876)

See merge request OpenMW/openmw!3250
2023-07-21 08:36:45 +00:00
psi29a
03dbe1c9f3 Merge branch 'stringrefidskills' into 'master'
Assign StringRefIds to skills

See merge request OpenMW/openmw!3146
2023-07-20 07:15:49 +00:00
Petr Mikheev
1bfe59e2fb Load content files during playing logo video 2023-07-20 01:22:01 +02:00
elsid
fac1927f5e
Use settings values for HUD settings 2023-07-19 22:53:35 +02:00
psi29a
baa67893b6 Merge branch 'settings_values_gui' into 'master'
Use settings values for GUI settings (#6876)

See merge request OpenMW/openmw!3238
2023-07-18 10:25:36 +00:00
psi29a
5a31320d8d Merge branch 'preserve-refnum-on-drop' into 'master'
Preserve refnum when dropping items from inventory to ground.

Closes #6148

See merge request OpenMW/openmw!3207
2023-07-18 10:25:28 +00:00
Mads Buvik Sandvei
61f1f4a013 signed/unsigned comparison warning. 2023-07-17 20:41:49 +02:00
Mads Buvik Sandvei
fe0b640f85 Use copyItem() when not moving full stack. 2023-07-17 17:58:39 +02:00
Mads Buvik Sandvei
b8a9fcad68 fixes based on comments by ptmikheev 2023-07-17 17:06:28 +02:00
Mads Buvik Sandvei
e22eec0585 optimize moveItem() by unsetting refnum instead of calling unstackItem. 2023-07-17 15:15:27 +02:00
elsid
d113f0fc44
Use settings values for GUI settings 2023-07-16 20:46:54 +02:00
Mads Buvik Sandvei
64e55b37ec Clang'd 2023-07-15 18:59:16 +02:00
Mads Buvik Sandvei
6e03d710ba Remove ItemModel::copyItem(), it is obsolete. 2023-07-15 18:19:52 +02:00
Evil Eye
a0127dd7e4 Allow compilation with MYGUI_DONT_USE_OBSOLETE 2023-07-15 15:02:27 +02:00
Evil Eye
b082afd5b0 Fix price enchantment price calculation to use the correct item count 2023-07-14 17:06:33 +02:00
Evil Eye
ac9378fa08 Replace Skill::mIndex with Skill::refIdToIndex 2023-07-13 18:55:21 +02:00
Alexei Dobrohotov
39c84c84da Cap global map cell size (bug #6222) 2023-07-13 14:53:08 +03:00
Alexei Kotov
4bbbfe74b3 Merge branch 'finishdrag' into 'master'
Finish draganddrop before startdrag

See merge request OpenMW/openmw!3186
2023-07-11 12:29:35 +00:00
Kindi
00e5f31242 Finish draganddrop before startdrag 2023-07-11 12:29:35 +00:00
psi29a
a755fa0f34 Merge branch 'cleanup_includes' into 'master'
Cleanup includes

See merge request OpenMW/openmw!3203
2023-07-09 10:15:09 +00:00
Alexei Dobrohotov
3b85f9f8cf Autocomplete ESM4::Cell editor IDs 2023-07-09 01:34:18 +03:00
Mads Buvik Sandvei
8c3c5238d7 Preserve refnum when dropping items from inventory to ground. 2023-07-08 17:24:13 +02:00
elsid
f6fce5ee15
Cleanup includes 2023-07-08 11:28:56 +02:00
elsid
ebb8fdc698
Use settings values for General settings 2023-07-04 21:40:04 +02:00
psi29a
8a33edd64a Merge branch 'cleanup_includes' into 'master'
Cleanup includes

See merge request OpenMW/openmw!3191
2023-07-03 16:01:48 +00:00
psi29a
050fc20379 Merge branch 'settings_values_game' into 'master'
Use settings values for Game settings (#6876)

See merge request OpenMW/openmw!3188
2023-07-03 07:20:36 +00:00
elsid
05a42a1816
Cleanup includes 2023-07-01 13:52:09 +02:00
Dave Corley
dfa4f5da8a pass time on OnTrainingFinished callback instead of before the fadeScreenIn 2023-07-01 08:48:57 +00:00
elsid
6e8dcc16c6
Use settings values for Game settings 2023-07-01 00:59:35 +02:00
psi29a
fc5d73648a Merge branch 'schooled' into 'master'
Merge magic schools into skills

See merge request OpenMW/openmw!3148
2023-06-28 09:32:48 +00:00
Kindi
a176e0f9ea Partial ammo equipping 2023-06-28 09:32:15 +00:00
Evil Eye
73c2387708 Merge schools into skills 2023-06-26 20:42:52 +02:00
Evil Eye
9947a41c37 Combine magic school properties into structs 2023-06-26 16:34:12 +02:00