mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-31 15:32:45 +00:00
Code Issues Projects Releases Wiki Activity
31,560 Commits 18 Branches 66 Tags
Commit Graph

3349 Commits

Author SHA1 Message Date
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
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
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
psi29a
dd0d66513d Merge branch 'clickbait' into 'master' 
Mostly dehardcode attributes

See merge request OpenMW/openmw!3164
 2023-06-25 20:11:19 +00:00
Evil Eye
9663f4f473 Address jvoisin's remarks 2023-06-21 22:11:01 +02:00
psi29a
47b1247fa2 Merge branch 'l10n' into 'master' 
Make configurable whether GMST strings have priority over built-in interface messages

See merge request OpenMW/openmw!3134
 2023-06-21 06:52:30 +00:00
Evil Eye
abcebd49d2 Allow for more than 8 attributes 2023-06-19 20:41:54 +02:00
Evil Eye
8edbb9f005 Add attributes to the level up dialog dynamically 2023-06-18 22:55:05 +02:00
Evil Eye
9a4bfed852 Dynamically build the attribute list in the review dialog 2023-06-18 20:08:10 +02:00
Evil Eye
75f0ad4e95 Dynamically build the attribute selection dialog 2023-06-18 19:55:33 +02:00
Evil Eye
ea2cedb5ea Build the attribute list in the stats window dynamically 2023-06-18 19:10:29 +02:00
Evil Eye
bac6777fae Reduce the number of magic numbers 2023-06-18 16:21:06 +02:00
Evil Eye
e9bcad4e05 Autocalculate enchantment costs and charges 2023-06-17 22:25:47 +02:00
Bret Curtis
ff6944701f Be more explicit about use of CLAMP_TO_EDGE instead of defaulting to GL CLAMP 2023-06-16 09:16:07 +02:00
psi29a
1630e04d1b Merge branch 'fix_7423' into 'master' 
Fix #7422, #7423, #7424

Closes #7424, #7423, and #7422

See merge request OpenMW/openmw!3136
 2023-06-15 11:02:21 +00:00
psi29a
807893eb45 Merge branch 'clickbait' into 'master' 
Mostly dehardcode skills

See merge request OpenMW/openmw!3112
 2023-06-15 07:03:13 +00:00
Petr Mikheev
ab7eebb356 Fix #7423 (too strict fallback validation) 2023-06-14 20:04:16 +02:00
Petr Mikheev
718d5e4a71 Add setting "gmst overrides l10n" 2023-06-13 10:06:59 +02:00
Petr Mikheev
be45b8199e Whitelist and type validation for fallbacks 2023-06-12 17:59:40 +02:00
Evil Eye
f62ba346e1 Appease the formatting gods 2023-06-08 18:35:52 +02:00
Evil Eye
2cb77ed48f Dehardcode skill selection 2023-06-08 18:35:52 +02:00
Evil Eye
9a93dcc39e Dehardcode the list of skills in the stats window 2023-06-08 18:35:51 +02:00