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

16352 Commits

Author SHA1 Message Date
Mads Buvik Sandvei
f4cc16e469 feedback 2023-11-30 21:46:00 +01:00
Mads Buvik Sandvei
b7a4cb0c83 The anim queue should still update when underwater. CharState_SpecialIdle should be retained until the animation queue is done. 2023-11-30 21:45:59 +01: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
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
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
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
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
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