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

3468 Commits

Author SHA1 Message Date
jvoisin
ec6ac8058b Merge branch 'vfs_normalized_path' into 'master'
Add type for normalized VFS path and use for VFS::Manager file map key

See merge request OpenMW/openmw!3781
2024-01-23 20:42:48 +00:00
Andrei Kortunov
a340b49cbc Enhance light settings tweaking 2024-01-16 10:23:13 +04:00
elsid
a2147d70cc
Use forward declaration for some VFS types
This will allow to save on preprocessed code size in the future changes.
2024-01-16 01:32:11 +01:00
Alexei Kotov
c4ed812567 Properly redraw the topics list when disposition bar state changes 2024-01-11 03:28:34 +03:00
Andrei Kortunov
fbd99583ca Move local variables in GUI code 2024-01-09 16:11:44 +04:00
psi29a
a0c0509e3f Merge branch 'rm_unused_apps_includes' into 'master'
Use "" to quote apps/openmw includes and remove unused

See merge request OpenMW/openmw!3727
2024-01-09 08:59:23 +00:00
Evil Eye
97dee00263 Merge branch 'remove_klass' into 'master'
Replace 'klass' by meaningful names

See merge request OpenMW/openmw!3745
2024-01-08 16:50:40 +00:00
elsid
067957f57b
Use "" to quote apps/openmw includes and remove unused
Using "" makes clangd to find unused includes which makes it quite easy to
remove them.
2024-01-07 17:57:11 +01:00
Andrei Kortunov
8879d89e4a Replace 'klass' by meaningful names 2024-01-07 19:12:49 +04:00
Andrei Kortunov
4f65b7167a Do not copy vector for every door marker 2024-01-07 18:53:07 +04:00
Evil Eye
72c382aca6 Don't crash when clicking the logo video 2024-01-06 14:23:08 +01:00
jvoisin
689efa6d69 Merge branch 'mapnotes' into 'master'
Shorten global map marker notes like vanilla (bug #7619)

Closes #7619

See merge request OpenMW/openmw!3719
2024-01-05 13:05:56 +00:00
Alexei Kotov
7310418984 Downgrade Settings GUI mode to a modal (bug #6758) 2024-01-02 22:32:52 +03:00
Alexei Kotov
14942d7541 Shorten global map marker notes like vanilla (bug #7619) 2024-01-02 18:50:32 +03:00
Evil Eye
e63933efa6 Use NAM9 for stack count 2023-12-31 17:12:46 +00:00
jvoisin
dcb403c114 Merge branch 'training' into 'master'
Use modified value for governing attribute training limit (#7742)

Closes #7742

See merge request OpenMW/openmw!3692
2023-12-27 22:49:23 +00:00
Alexei Kotov
1b594d874e Use modified value for governing attribute training limit (#7742) 2023-12-26 21:53:49 +03:00
Andrei Kortunov
ffffb427f5 Implement crime disposition modifier (bug 4683) 2023-12-26 14:04:23 +04:00
Evil Eye
1223d12b29 Make ingredient order affect effect order 2023-12-20 11:56:12 +01:00
Alexei Kotov
27bd70a976 For constant enchantments, allow on-self range for any effect (bug #7643) 2023-12-14 15:55:24 +03:00
Evil Eye
0da620b3f9 Don't crash on spells or enchantments without effects 2023-12-09 15:40:23 +01:00
Andrei Kortunov
623510c073 Use multiplication character in the launcher instead of 'x' 2023-11-28 22:47:27 +04:00
Andrei Kortunov
81a6a7cd2f Rework resolution selection (feature 7709) 2023-11-28 22:22:34 +04:00
jvoisin
881f41cf79 Merge branch 'fix_hud' into 'master'
Fix HUD cleanup from main menu

See merge request OpenMW/openmw!3596
2023-11-25 15:02:13 +00:00
Evil Eye
81b8328bdd Include UString 2023-11-23 19:52:18 +01:00
Evil Eye
da9b0c5119 Use MyGUI::UString's new string_view support 2023-11-22 22:02:06 +01:00
Zackhasacat
f3770a2364 Merge branch 'i-know-what-time-it-is' into 'master'
Fix(Log): Don't Put Timestamps Mid-Message

Closes #6982

See merge request OpenMW/openmw!3593
2023-11-21 03:00:36 +00:00
Dave Corley
5cc1b117ea Fix(Log): Don't Put Timestamps Mid-Message 2023-11-21 03:00:36 +00:00
Zackhasacat
abd2c5326f Merge branch 'makealchemygreatagain' into 'master'
Allow choosing different apparatus in alchemy window

Closes #7665

See merge request OpenMW/openmw!3580
2023-11-20 18:08:06 +00:00
Zackhasacat
6fb6c7a32f Merge branch 'misisng_plugins' into 'master'
Display missing plugins upon savegame loading

Closes #7608

See merge request OpenMW/openmw!3594
2023-11-20 00:19:43 +00:00
Andrei Kortunov
9bbb89e268 Allow to set default focus for interactive messagebox 2023-11-18 18:00:40 +04:00
Andrei Kortunov
ff418f16f2 Do not wait one frame for blocking messageboxes 2023-11-18 16:47:06 +04:00
kuyondo
f3ad16620a refactor and maintenance alchemywindow and alchemy 2023-11-18 00:41:44 +08:00
kuyondo
60711cedb0 use std::distance 2023-11-17 23:20:20 +08:00
Kindi
6d0dceae34 Allow choosing different apparatus in alchemy window 2023-11-17 23:16:09 +08:00
Andrei Kortunov
99939022bd Remove redundant code 2023-11-17 11:18:59 +04:00
Andrei Kortunov
fa8f92b5ab Do not keep outdated references in the UserData 2023-11-17 11:13:13 +04:00
Andrei Kortunov
1440bcaf2a Fix HUD cleanup from main menu 2023-11-17 10:38:58 +04:00
Alexei Kotov
d495e5af62 Merge branch 'missing_settings_values' into 'master'
Use settings values for missed cases (#6876)

See merge request OpenMW/openmw!3589
2023-11-16 11:54:04 +00:00
elsid
1fa5d2ca98
Use settings values for GUI tags 2023-11-12 16:33:48 +01:00
elsid
01316f15b8
Avoid redundant conversion to string 2023-11-12 16:33:38 +01:00
kuyondo
a2de470804 minor partial equipping fix 2023-11-12 12:22:35 +08:00
uramer
fe68ff7807 Merge branch 'controller_can_tab' into 'master'
Allow Shoulder Buttons on Controller to act as Tab and Shift Tab in menus

Closes #7554

See merge request OpenMW/openmw!3397
2023-11-11 16:30:16 +00:00
Zackhasacat
96178a2605 Allow Shoulder Buttons on Controller to act as Tab and Shift Tab in menus 2023-11-11 16:30:16 +00:00
Evil Eye
5356f54526 Merge branch 'savedgamehealth' into 'master'
Cast displayed health to int in saved game dialog (#7656)

Closes #7656

See merge request OpenMW/openmw!3563
2023-11-07 16:45:42 +00:00
Alexei Kotov
48c1c2cf08 Merge branch 'partialequippingp2' into 'master'
Fix partial ammo equipping

See merge request OpenMW/openmw!3434
2023-11-07 03:55:58 +00:00
Alexei Kotov
515a90e9e0 Cast displayed health to int in saved game dialog (#7656) 2023-11-04 04:30:40 +03:00
Alexei Kotov
876f6ea2da Validate enchantment records (bug #7654)
Clean up spell validation
Fix a flaw in spell effect tooltip code
2023-11-03 15:08:16 +03:00
Alexei Kotov
4445a55084 Merge branch 'font_fix' into 'master'
Fix TrueType fonts scaling

See merge request OpenMW/openmw!3541
2023-11-02 13:09:17 +00:00
Alexei Kotov
6e069161a4 Merge branch 'sortalphabetcalinrechargeandrepairmenu' into 'master'
Sort repair and recharge menu list alphabetically

See merge request OpenMW/openmw!3524
2023-10-31 21:27:43 +00:00