mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 18:45:36 +00:00
Code Issues Releases Wiki Activity
32797 commits 108 branches 66 tags 134 MiB
Commit graph

21430 commits

Author SHA1 Message Date
Andrei Kortunov
c5b16d1ba2 Do not include formatting spaces to localizable strings 2023-11-30 13:06:50 +04:00
Evil Eye
76172c73f3 Merge branch 'fix_restocking_remove' into 'master' 
Fix Lua remove interacting with restocking items

See merge request OpenMW/openmw!3615
 2023-11-29 15:43:23 +00:00
jvoisin
d230c89a56 Merge branch 'rework_resolutions' into 'master' 
Rework resolution selection

Closes #7709

See merge request OpenMW/openmw!3622
 2023-11-29 13:18:20 +00:00
Andrei Kortunov
5e96825e6b Highlight new items in launcher by text formatting, not by color 2023-11-29 11:14:44 +04:00
Zackhasacat
ae3f9f8dcf Merge branch 'lua_ui_child_element' into 'master' 
Lua Element as layout children

See merge request OpenMW/openmw!3582
 2023-11-28 21:54:55 +00: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
Alexei Kotov
3bf5b150c5 bsatool: Support extracting files with forward slash paths 2023-11-27 03:09:38 +03:00
Alexei Kotov
3be0ee824a niftest updates 
Properly read archives within the supplied data directories
Don't print quote marks redundantly
Reduce code duplication
Improve logging
 2023-11-27 03:09:38 +03:00
Andrei Kortunov
c945735f3b Fix resolution dropdown in the launcher 2023-11-26 19:07:38 +04:00
uramer
1841341da2 Fix Lua remove interacting with restocking items 2023-11-25 17:39:00 +01:00
jvoisin
d1fc34a0d9 Merge branch 'sdl2_cmake' into 'master' 
Use SDL2 generate cmake files to find the package

See merge request OpenMW/openmw!3612
 2023-11-25 15:02:47 +00: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
uramer
22dbb3e09a Merge branch 'ustringmestring' into 'master' 
Use MyGUI::UString's new string_view support

See merge request OpenMW/openmw!3610
 2023-11-25 14:23:59 +00:00
uramer
416fa331f1 Implement UI Element tostring 2023-11-24 20:36:45 +01:00
elsid
f08ab9af56
Use SDL2 generate cmake files to find the package 2023-11-24 15:56:54 +01:00
Alexei Kotov
9873ab25df Merge branch 'endoftheearth' into 'master' 
Don't try to escort to nowhere

See merge request OpenMW/openmw!3603
 2023-11-24 11:30:18 +00:00
Zackhasacat
5623a5cf01 Merge branch 'lua_sgetcurrent_conditionofitem_itemdata_idea' into 'master' 
Lua API to get/set item condition

See merge request OpenMW/openmw!3421
 2023-11-23 23:10:39 +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
a38d17a918 Merge branch 'api_inconsistencies' into 'master' 
Minor API inconsistencies

See merge request OpenMW/openmw!3601
 2023-11-21 03:04:24 +00:00
uramer
c9eaeb47d5 Minor API inconsistencies 2023-11-21 03:04:24 +00:00
Zackhasacat
ad1d6c0d0f Merge branch 'find_nearest_nav_mesh_position' into 'master' 
Add Navigator and Lua API function to find nearest position on navmesh

See merge request OpenMW/openmw!2681
 2023-11-21 03:01:51 +00: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
kuyondo
9ebbdc3a22 expell->expel 2023-11-20 15:59:11 +08: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
kuyondo
a96c038f19 prefer previous tools over best tools 2023-11-19 19:10:12 +08:00
Evil Eye
8ca6f1ad49 Use destination cell 2023-11-19 10:53:50 +01:00
Evil Eye
1b820b980a Don't try to escort to nowhere 2023-11-19 10:25:20 +01:00
elsid
94b085af9e
Add Navigator and Lua API function to find nearest position on navmesh 2023-11-18 23:54:37 +01:00
elsid
1322f7b75b
Deduplicate height field data definition 2023-11-18 22:38:00 +01:00
elsid
9c526b6639
Add Navigator test for zero distance path 2023-11-18 22:35:10 +01:00
Evil Eye
5a1a54b959 Merge branch 'lua_class_data' into 'master' 
Add class records to lua

See merge request OpenMW/openmw!3515
 2023-11-18 20:55:45 +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
Andrei Kortunov
f88b99201a Display missing plugins upon savegame loading (feature 7608) 2023-11-18 14:12:18 +04:00
Evil Eye
63875a7954 Merge branch 'concepts' into 'master' 
Use concepts for some argument types

See merge request OpenMW/openmw!3598
 2023-11-18 09:59:39 +00:00
jvoisin
2150e4cae6 Merge branch 'warningfixes' into 'master' 
Fix warnings

See merge request OpenMW/openmw!3587
 2023-11-17 23:41:47 +00:00
Zackhasacat
3e3a39539c Reorder, remove comment 2023-11-17 14:51:19 -06:00
Zackhasacat
13deb0fba8 Merge branch 'imod' into 'master' 
Fill out item modification records and add them to the scene

See merge request OpenMW/openmw!3540
 2023-11-17 18:22:17 +00:00
kuyondo
d2d99a4348 give gcc satisfaction 2023-11-18 01:04:31 +08: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
elsid
b17afc4641
Use concepts for some argument types 2023-11-16 22:22:46 +01:00
elsid
fb0b95a2dd
Define editor settings as typed struct members 2023-11-16 22:14:58 +01:00
elsid
755fef62f7
Mark State copy constructor and assignment operators as delete 2023-11-16 22:05:05 +01:00
elsid
e07d8f3066
Add separate setting type for subcategory 2023-11-16 22:05:05 +01:00
elsid
fb6e429dad
Remove "separators" from cs settings 
Those are just empty widgets which do not make significant visible difference in
the UI.
 2023-11-16 22:05:05 +01:00
elsid
335dbffe6e
Avoid std::string to QString conversion for label 2023-11-16 22:05:05 +01:00
Zackhasacat
35da9578ca Merge gitlab.com:openmw/openmw into lua_class_data 2023-11-16 11:33:44 -06:00
Zackhasacat
bc63737488 Update Formatting 2023-11-16 11:20:08 -06:00
uramer
6484e2e411 Merge branch 'serices_are_readonly' into 'master' 
Make actor.providedServices read only

See merge request OpenMW/openmw!3570
 2023-11-16 15:23:09 +00:00
Zackhasacat
cbfcd21d98 Make actor.providedServices read only 2023-11-16 15:23:09 +00:00
Andrei Kortunov
ba71eefbae Fix GCC warnings 2023-11-16 18:53:46 +04:00
Zackhasacat
16f178b80e Remove character 2023-11-16 07:43:45 -06:00
Zackhasacat
10030a55e0 Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-11-16 07:37:03 -06:00
Zackhasacat
a2b47f44d2 Fix misspelling 2023-11-16 07:36:40 -06: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
jvoisin
edd69885ce Merge branch 'fixpartialequipagain' into 'master' 
Properly reset variable for partial equipping

See merge request OpenMW/openmw!3586
 2023-11-15 22:39:34 +00:00
jvoisin
9b1cb99b1a Merge branch 'ncroot' into 'master' 
Improve BulletNifLoader handling of extra data

See merge request OpenMW/openmw!3590
 2023-11-15 22:37:57 +00:00
jvoisin
710b560f91 Merge branch 'dont_reset_luminance' into 'master' 
consistent average scene luminance (#7679)

See merge request OpenMW/openmw!3579
 2023-11-14 10:56:26 +00:00
Alexei Kotov
c7d5ea9fbf Improve BulletNifLoader handling of extra data 
Only handle extra data for the root node(s)
Properly handle MRK flag editor marker filtering
Fix BSXFlags test
 2023-11-14 01:30:36 +03:00
elsid
1fa5d2ca98
Use settings values for GUI tags 2023-11-12 16:33:48 +01:00
elsid
8f27178a0b
Use settings values for navigator in the launcher 2023-11-12 16:33:44 +01:00
elsid
01316f15b8
Avoid redundant conversion to string 2023-11-12 16:33:38 +01:00
Andrei Kortunov
155b07f341 Do not update WindowManager by world data when there is no game 2023-11-12 12:23:29 +04: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
Cody Glassman
85fcfbafda apply same logic to render targets, remove UB 2023-11-10 21:22:11 -08:00
Cody Glassman
dec120f38c consistent average scene luminance 2023-11-10 21:00:47 -08:00
Alexei Kotov
49f13c53c0 Merge branch 'makeunlocksoundwhenlocking' into 'master' 
Play a sound when lock spell succeeds

See merge request OpenMW/openmw!3578
 2023-11-09 20:00:55 +00:00
jvoisin
9fb5fe26e6 Merge branch 'render_target_fixes' into 'master' 
[Postprocessing] Fix dirty flag and share luminance calculator between frames

See merge request OpenMW/openmw!3566
 2023-11-08 22:50:51 +00:00
Cody Glassman
cdaa44f24c [Postprocessing] Fix dirty flag and share luminance calculator between frames 2023-11-08 22:50:50 +00:00
jvoisin
32a9581394 Merge branch 'deepdepths' into 'master' 
Depth flag handling fixes (bug #7380)

See merge request OpenMW/openmw!3568
 2023-11-08 22:47:29 +00:00
AnyOldName3
9b6d82566f Merge branch 'unbound' into 'master' 
Don't use Bounding Box node bounds as the original collision shape

See merge request OpenMW/openmw!3562
 2023-11-08 16:33:16 +00:00
Kindi
a7a48aaa91 make successful lockspell play unlock sound 2023-11-09 00:27:07 +08:00
Zackhasacat
ec81bd7f1b rename specilizationIndexToLuaId 2023-11-07 12:01:54 -06:00
Zackhasacat
cb705ff02a Revert redundant changes 2023-11-07 11:52:53 -06:00
Zackhasacat
ae4eafdfd4 Move classes to types.NPC 2023-11-07 11:50:09 -06:00
Zackhasacat
81da58478d Remove test use 2023-11-07 11:41:14 -06:00
Zackhasacat
76f872aaa2 use std:;array 2023-11-07 11:40:43 -06:00
Evil Eye
76843aff19 Merge branch 'getcellnametes4' into 'master' 
Use the display name instead of the editor ID for World::getCellName

See merge request OpenMW/openmw!3564
 2023-11-07 16:45:55 +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
Zackhasacat
5a0de322a3 Merge branch 'fix_use_item' into 'master' 
Fix #7674

Closes #7674

See merge request OpenMW/openmw!3567
 2023-11-07 03:07:43 +00:00
Alexei Kotov
bdc019647a Merge branch 'figure-skaters' into 'master' 
Use accumulated movement when possible

Closes #5062

See merge request OpenMW/openmw!3549
 2023-11-07 03:01:56 +00:00
Alexei Kotov
d5dbbfb570 Merge branch '75_chameleon' into 'master' 
Make "isTargetMagicallyHidden" include 75% Chameleon

See merge request OpenMW/openmw!3565
 2023-11-07 02:59:37 +00:00
Abdu Sharif
0f3dba28a7 Consider 75% Chameleon magical invisibility as well 2023-11-07 02:59:37 +00:00
Alexei Kotov
116ef1c62b Depth flag handling fixes (bug #7380) 
Properly disable depth test while allowing depth writes to happen
Remove NiStencilProperty interaction
Don't set up depth flags for BSShaderPPLightingProperty
 2023-11-06 02:19:56 +03:00
Petr Mikheev
a60726ce35 Fix #7674 2023-11-05 21:32:18 +01:00
Zackhasacat
231803c6ea Merge branch 'sunvisibility' into 'master' 
Make sun specularity behavior more intuitive (bug #6190)

Closes #6190

See merge request OpenMW/openmw!3535
 2023-11-05 17:55:27 +00:00
jvoisin
e88f8e09c3 Merge branch 'fixed' into 'master' 
Replace more variable width integers in ESM code

See merge request OpenMW/openmw!3518
 2023-11-05 16:36:13 +00:00
jvoisin
e4c5c1bc43 Merge branch 'govna' into 'master' 
Expose governing attributes to Lua

See merge request OpenMW/openmw!3556
 2023-11-05 16:35:27 +00:00