mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 03:39:55 +00:00
Code Issues Projects Releases Wiki Activity
33,319 Commits 17 Branches 67 Tags
Commit Graph

699 Commits

Author SHA1 Message Date
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
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
uramer
6792cf02b2 Group owner bindings into a table 2024-02-05 18:48:53 +01: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
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
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
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
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
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
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
Mads Buvik Sandvei
36e1bdab10 Use a smaller integer type instead of dealing with casting issues. 2024-01-28 14:48:49 +01:00
Zackhasacat
4fcacd59aa Add model to NPC lua 2024-01-27 12:02:56 -06:00
Evil Eye
1288ec5cea Use deserializeText for find and countOf 2024-01-27 16:49:20 +01:00
uramer
9cce2e39ba Merge branch 'master' into menuscripts 2024-01-27 15:45:31 +01:00
Alexei Kotov
093d86353f Merge branch 'lua_mwscript_nilvar' into 'master' 
#7791: Require local variables to exist for lua mwscript local variables

Closes #7791

See merge request OpenMW/openmw!3811
 2024-01-27 13:57:26 +00:00
Zackhasacat
cfd67f3ce7 #7791: Require local variables to exist for lua mwscript local variables 2024-01-27 13:57:26 +00:00
Mads Buvik Sandvei
a94add741e Lua: Animation bindings 2024-01-26 21:39:33 +00:00
Alexei Kotov
d1e79028e9 Merge branch 'lua-fix-active-spells-pairs-iterator-return' into 'master' 
Lua: Fix return value for `Actor.ActiveSpells` iterator

See merge request OpenMW/openmw!3808
 2024-01-26 20:38:13 +00:00
Alexei Kotov
30d637f5f6 Merge branch 'lua_water_level' into 'master' 
Lua: Add water level to Core.Cell

See merge request OpenMW/openmw!3766
 2024-01-26 20:37:04 +00:00
Zackhasacat
daa9c5f0e1 Lua: Add water level to Core.Cell 2024-01-26 20:37:04 +00:00
Pharis
3b0d654a3f Return active spell id from pairs 2024-01-25 18:10:10 -06:00
Andrei Kortunov
9e55425b71 Use std::move() in /apps/openmw 2024-01-25 09:03:30 +04:00
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
Mads Buvik Sandvei
1f416d7c8a Lua: Creature skill bindings 2024-01-20 11:56:36 +00: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
uramer
0a2adfee16 SaveInfo.timePlayed field 2024-01-14 17:47:27 +01:00
Andrei Kortunov
14e6af8bea Add a table with fadeOut argument for streamMusic 2024-01-13 15:42:17 +04:00
uramer
b9afd7245c Create separate UI api tables for menu and player contexts 2024-01-13 10:13:13 +01:00
uramer
dd09c9b362 Don't save global storage if global scripts didn't run 2024-01-13 00:42:55 +01:00
uramer
dd6017e81e Avoid making engine handler methods public 2024-01-11 00:55:29 +01:00
uramer
4ed2af7666 Merge branch 'master' into menuscripts 2024-01-10 23:21:42 +01:00
uramer
1afc7ecd58 Test Lua widgets for text inputs correctly 2024-01-10 23:13:27 +01:00
uramer
79deb5f559 Remove settings pages in Lua 2024-01-10 23:13:27 +01:00
uramer
82a125fb6a Replace onUpdate with onFrame for menu scripts 2024-01-10 23:13:27 +01:00
uramer
2107bbc01d Reuse input engine handlers in menu scripts 2024-01-10 23:13:23 +01:00
uramer
962ecc4329 Allow menu scripts to read global sections while a game is loaded 2024-01-10 22:28:57 +01:00
Andrei Kortunov
e67d6c6ebf Refactor Lua properties 2024-01-10 12:37:14 +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
psi29a
5bd2020c23 Merge branch 'inactiveeffects' into 'master' 
Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs

Closes #7440

See merge request OpenMW/openmw!3735
 2024-01-09 08:58:42 +00:00
uramer
539dc1ee43 Remove confusing addPlayerQuestBindings method 2024-01-08 21:57:59 +01:00
uramer
a6e2ceebb8 Don't clear menu UI on game load 2024-01-07 23:29:20 +01:00
uramer
d1268acf95 Merge branch 'master' into menuscripts 2024-01-07 23:15:21 +01:00