mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-01 16:13:28 +00:00
Code Issues Projects Releases Wiki Activity
33,326 Commits 17 Branches 68 Tags
Commit Graph

16475 Commits

Author SHA1 Message Date
AnyOldName3
8c591a0b44 Groundcover should ignore non-geometry Drawables 
Fix https://gitlab.com/OpenMW/openmw/-/issues/7633

Untested - the issue didn't link to a mod using the mesh and I couldn't be bothered setting one up manually.
 2024-02-12 01:16:49 +00:00
Alexei Kotov
3301ebb2cb Merge branch 'localize_screenshot' into 'master' 
Localize screenshot messages

See merge request OpenMW/openmw!3843
 2024-02-10 13:54:05 +00:00
Alexei Kotov
a54d97669f Merge branch 'imnotyourpalbuddy' into 'master' 
Reset friendly hits at the end of combat and don't count hits while in combat

Closes #5755

See merge request OpenMW/openmw!3839
 2024-02-09 21:28:04 +00:00
Andrei Kortunov
6760fa4945 Localize screenshot messages 2024-02-08 12:50:12 +04:00
Alexei Kotov
6be6f47503 Merge branch 'lua_enchantment_charge_nil' into 'master' 
Lua Use nil instead of -1 for default enchantment charge

See merge request OpenMW/openmw!3845
 2024-02-08 08:25:15 +00:00
Evil Eye
5715e6428a Merge branch 'lua_separate_owner' into 'master' 
Group owner bindings into a table

See merge request OpenMW/openmw!3841
 2024-02-07 19:06:18 +00:00
psi29a
557e83d502 Merge branch 'more_move' into 'master' 
Move action argument

See merge request OpenMW/openmw!3844
 2024-02-07 09:18:34 +00:00
uramer
b1773d7e9f Use nil instead of -1 for default enchantment charge 2024-02-06 17:30:48 +01:00
Andrei Kortunov
a8c219f07c Move action argument 2024-02-06 14:18:08 +04:00
psi29a
7793a6d0d9 Merge branch 'modelviewbutnocontroller' into 'master' 
Collect string_views when deciding what to preload

See merge request OpenMW/openmw!3816
 2024-02-06 09:06:57 +00:00
uramer
6792cf02b2 Group owner bindings into a table 2024-02-05 18:48:53 +01:00
Andrei Kortunov
66b2d428c8 Merge branch 'qt_localization' into 'master' 
Localize Launcher and Wizard

See merge request OpenMW/openmw!3571
 2024-02-05 15:11:42 +00:00
psi29a
76842c3ba1 Merge branch 'more_move' into 'master' 
Address Coverity Scan complaints left

See merge request OpenMW/openmw!3837
 2024-02-05 13:22:14 +00:00
jvoisin
838785d5a3 Merge branch 'sworc' into 'master' 
Make StartCombat a no-op for dead targets and don't always play attack lines

Closes #7769 and #5413

See merge request OpenMW/openmw!3803
 2024-02-05 09:48:20 +00:00
Alexei Kotov
a5d88d489b Merge branch 'menu_fixes' into 'master' 
Follow up fixes for Lua Menu MR !3464

See merge request OpenMW/openmw!3834
 2024-02-05 00:41:11 +00:00
Evil Eye
6c2ddc635d Reset friendly hits at the end of combat and don't count hits while in combat 2024-02-04 21:41:03 +01:00
uramer
02accd7a49 Fix statemanager cleanup setting game state to ended by accident 2024-02-04 11:12:12 +01:00
uramer
8c6a1ae8c0 Allow menu scripts to send global events while a game is loaded 2024-02-04 11:12:11 +01:00
Alexei Kotov
62f2f4a011 Merge branch 'clear_lua_actions' into 'master' 
Fix quickload causing a crash with certain Lua queued actions

Closes #7801

See merge request OpenMW/openmw!3833
 2024-02-04 07:25:39 +00:00
Andrei Kortunov
292879d0fb Address Coverity Scan complaints left 2024-02-04 08:56:25 +04:00
Alexei Kotov
8b47381162 Merge branch 'more_move' into 'master' 
Fix some Coverity Scan complaints

See merge request OpenMW/openmw!3829
 2024-02-03 17:24:53 +00:00
uramer
a1970857fd Queue quick loads 2024-02-03 15:18:34 +01:00
Zackhasacat
1338e884a9 Merge branch 'menuscripts' into 'master' 
Add new Lua context: menu scripts

Closes #7805 and #7648

See merge request OpenMW/openmw!3464
 2024-02-02 21:46:22 +00:00
uramer
784459a652 Clean up the cleanup code 2024-02-02 22:07:58 +01:00
jvoisin
720573115d Merge branch 'references' into 'master' 
Pass some arguments by references

See merge request OpenMW/openmw!3824
 2024-02-02 16:35:40 +00:00
Andrei Kortunov
69936f3537 Move TextureData 2024-02-02 09:45:42 +04:00
Andrei Kortunov
225e834b88 Fix some Coverity Scan complaints 2024-02-02 09:28:19 +04:00
uramer
b988db9bda Merge branch 'master' into menuscripts 2024-02-01 20:11:02 +01:00
Mads Buvik Sandvei
a59981e3fa Initialize mScripted again. 2024-02-01 20:00:10 +01:00
Andrei Kortunov
66d1e036d2 Pass some arguments by references 2024-02-01 10:02:15 +04:00
Andrei Kortunov
7e345436f4 Localize Launcher and Wizard 2024-02-01 09:47:25 +04:00
Zackhasacat
c7fcd1c31b Fix formatting 2024-01-31 17:00:33 -06:00
psi29a
c9489bad9b Merge branch 'cleanup_esm3_readers_cache' into 'master' 
Remove stateless encoder from ReadersCache

See merge request OpenMW/openmw!3823
 2024-01-31 10:49:53 +00:00
uramer
47d5868e2c creationTime field in save info 2024-01-30 22:09:12 +01:00
uramer
76915ce6e9 Queue auto started scripts until next update 2024-01-30 18:58:34 +01:00
uramer
ad8a05e2a1 Trigger a game ended state handler before loading to allow menu scripts to do cleanup 2024-01-30 18:58:15 +01:00
Alexei Kotov
9350222e1a Merge branch 'deserializeinventory' into 'master' 
Use deserializeText for find and countOf

See merge request OpenMW/openmw!3817
 2024-01-30 04:24:50 +00:00
Alexei Kotov
c86ca0ef01 Merge branch 'cast-fix' into 'master' 
Fix bad cast of loop count in animation bindings.

See merge request OpenMW/openmw!3819
 2024-01-30 04:18:03 +00:00
Evil Eye
340d1423c6 Optimize AI package target comparisons 2024-01-29 22:25:39 +01:00
Evil Eye
8ed7a5319d Exclude deleted actors, prevent copies, and try to avoid a second getActorsSidingWith call 2024-01-29 22:08:00 +01:00
psi29a
4ebedaca99 Merge branch 'npc_model_lua' into 'master' 
Add model to NPC lua record

See merge request OpenMW/openmw!3818
 2024-01-29 11:58:04 +00:00
elsid
f9b69623d3
Remove stateless encoder from ReadersCache 
It was added by https://gitlab.com/OpenMW/openmw/-/merge_requests/2804 without a
good reason. There is already encoder available in the used context.
 2024-01-29 11:09:29 +01:00
psi29a
be6d063b94 Merge branch 'pointlessinisettings' into 'master' 
Support Timescale Clouds and MaxNumberRipples INI settings (#7792, #7795)

Closes #7792 and #7795

See merge request OpenMW/openmw!3812
 2024-01-28 22:13:45 +00:00
Mads Buvik Sandvei
fbffecfd13 ~0ul -> std::numeric_limits<uint32_t>::max() 2024-01-28 21:02:06 +01:00
Mads Buvik Sandvei
0ed94ead4e Check that count is non-zero before decrementing it. 2024-01-28 17:34:22 +01:00
Mads Buvik Sandvei
24a0a0c3bf size_t -> uint32_t 2024-01-28 16:34:44 +01:00
Mads Buvik Sandvei
993cea7d65 MR Comments 2024-01-28 16:31:01 +01:00
Mads Buvik Sandvei
36e1bdab10 Use a smaller integer type instead of dealing with casting issues. 2024-01-28 14:48:49 +01:00
Alexei Kotov
bd84200d4e Merge branch 'bumpbump' into 'master' 
Base GetColliding script functions on collisions detected by the movement solver

Closes #7053

See merge request OpenMW/openmw!3794
 2024-01-28 10:18:02 +00:00
Alexei Kotov
df6e104e6f Merge branch 'tastytastyenchantments' into 'master' 
Use the correct id to absorb enchantments

Closes #7796

See merge request OpenMW/openmw!3813
 2024-01-28 10:15:55 +00:00