psi29a
7888a11c36
Merge branch 'lushemptyplants' into 'master'
...
Don't display the harvested plant if graphic herbalism is off
See merge request OpenMW/openmw!4193
2024-06-22 16:35:59 +00:00
psi29a
e88cbf86a4
Merge branch 'roundinguicornerssaveseyes' into 'master'
...
Don't assume execution of an internal Lua script can't fail
Closes #7627
See merge request OpenMW/openmw!4190
2024-06-22 16:34:13 +00:00
Evil Eye
5b82c7a95d
Don't assume execution of an internal Lua script can't fail
2024-06-22 11:26:32 +02:00
psi29a
ca3f89045c
Merge branch 'fix-the-launcher-again' into 'master'
...
Don't attempt to continue an outer loop from an inner loop
Closes #8034
See merge request OpenMW/openmw!4192
2024-06-22 09:06:01 +00:00
psi29a
0013a44b71
Merge branch 'datadisplaydelegate' into 'master'
...
React to scale or color changes in editor tables
See merge request OpenMW/openmw!4098
2024-06-22 09:03:19 +00:00
AnyOldName3
decfe75ae5
Don't attempt to continue an outer loop from an inner loop
2024-06-21 14:05:52 +01:00
AnyOldName3
82285dadc4
Merge branch 'teal_ci' into 'master'
...
Fix Teal CI job
See merge request OpenMW/openmw!4191
2024-06-21 13:04:00 +00:00
Evil Eye
2edbabd3d7
Don't display the harvested plant if graphic herbalism is off
2024-06-21 12:15:11 +02:00
elsid
828367d0c8
Fix Teal CI job
2024-06-20 22:35:15 +02:00
psi29a
81ceb497a1
Merge branch 'fix_cmake_doxygen_flow' into 'master'
...
consolidate cmake documentation (BUILD_DOCS) flow
See merge request OpenMW/openmw!4177
2024-06-20 12:47:06 +00:00
psi29a
3a686dd8af
Merge branch 'lua_travel_dest_2' into 'master'
...
Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered
See merge request OpenMW/openmw!3592
2024-06-19 21:38:27 +00:00
Zackhasacat
533ce499e0
Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered
2024-06-19 21:38:27 +00:00
psi29a
6653502567
Merge branch 'isrunning' into 'master'
...
add world.mwscript.isRunning
See merge request OpenMW/openmw!4181
2024-06-18 08:02:53 +00:00
AnyOldName3
02bcd17b58
Merge branch 'quick-cache-with-no-strings-attached' into 'master'
...
Fix CI
Closes #8031
See merge request OpenMW/openmw!4183
2024-06-17 23:42:43 +00:00
AnyOldName3
1d8c50f089
Check checksums
2024-06-17 22:32:18 +01:00
AnyOldName3
8efc399859
Switch to GitLab-hosted Lua archvies
...
lua.org has been down all day, so CI has been dead.
2024-06-17 21:39:11 +01:00
AnyOldName3
9d378ded0c
Hide Ninja cache init job after all as we're not running Ninja jobs.
2024-06-17 15:13:56 +01:00
AnyOldName3
11b25e20fe
Don't hide the jobs - they're already on a manual trigger
2024-06-17 14:54:22 +01:00
AnyOldName3
fb1c4dc786
Add manual-trigger job to initialise Windows dependency cache.
2024-06-17 14:52:41 +01:00
psi29a
3d248247d5
Merge branch 'remove-unused-scripts' into 'master'
...
Remove unused CI scripts
See merge request OpenMW/openmw!4156
2024-06-17 07:01:40 +00:00
psi29a
ce8e8615ad
Merge branch 'qt_663' into 'master'
...
Upgrade Qt to 6.6.3
See merge request OpenMW/openmw!4176
2024-06-17 06:58:50 +00:00
Kindi
ecb07c9bc7
add mwscript.isRunning
2024-06-17 08:05:52 +08:00
psi29a
cb14af943d
Merge branch 'playerscale' into 'master'
...
Fully reset the player's cell reference when the player is reset (#8021 )
Closes #8021
See merge request OpenMW/openmw!4167
2024-06-15 12:04:01 +00:00
Bret Curtis
1ccf101a92
REQUIRED flag will get rid of need to have extra if check
2024-06-15 11:12:11 +02:00
Bret Curtis
1edcd80501
consolidate cmake documentation flow
2024-06-15 11:07:35 +02:00
Alexei Kotov
39a231233c
Fully reset the player's cell reference when the player is reset ( #8021 )
2024-06-15 11:49:12 +03:00
psi29a
218e19d8f7
Merge branch 'mapshenanigans' into 'master'
...
Fix local map issues
Closes #8004
See merge request OpenMW/openmw!4174
2024-06-15 08:42:36 +00:00
psi29a
9523aab18e
Merge branch 'objectisinstance(lockable)' into 'master'
...
Doc: Add objectisinstance to lockable
See merge request OpenMW/openmw!4175
2024-06-15 08:42:24 +00:00
psi29a
05a70b29c5
Merge branch 'rangingareas' into 'master'
...
Don't apply area of effect for potions and improve range handling
Closes #8018
See merge request OpenMW/openmw!4172
2024-06-15 08:42:11 +00:00
psi29a
8e20967511
Merge branch 'collisionswitch' into 'master'
...
Don't let the optimizer mess with collision switch nodes (again)
See merge request OpenMW/openmw!4173
2024-06-15 08:41:44 +00:00
Andrei Kortunov
819ba42be2
Upgrade Qt to 6.6.3
2024-06-14 16:18:19 +04:00
psi29a
98ba2120b6
Merge branch 'zerotohero' into 'master'
...
Use -1 as the plugin index for LandTextures
See merge request OpenMW/openmw!4121
2024-06-14 07:22:27 +00:00
psi29a
31102a2076
Merge branch 'utfconversionfixsize' into 'master'
...
Use fixed-size type to hold a whole code point
See merge request OpenMW/openmw!4163
2024-06-14 07:21:51 +00:00
psi29a
6caac886ea
Merge branch 'equalopportunity' into 'master'
...
Support light fade settings in legacy lighting method, remove launcher lighting settings that support runtime changes
See merge request OpenMW/openmw!4168
2024-06-14 07:21:19 +00:00
psi29a
a1cacbe164
Merge branch 'getactivegroup' into 'master'
...
Throw on invalid bone group indices in getActiveGroup
See merge request OpenMW/openmw!4171
2024-06-14 07:20:55 +00:00
Kindi
cdc77a1d2c
add missing objectisinstance to lockable
2024-06-14 12:19:25 +08:00
Evil Eye
5a54cd9406
Fix local map issues
2024-06-13 23:03:57 +02:00
Alexei Kotov
4f8856f887
Don't let the optimizer mess with collision switch nodes (again)
2024-06-13 22:24:40 +03:00
Evil Eye
a934902f12
Don't apply area of effect for potions and improve range handling
2024-06-13 18:00:44 +02:00
Alexei Kotov
d226b72592
Throw on invalid bone group indices in getActiveGroup
2024-06-12 23:26:16 +03:00
Alexei Kotov
6ad914919b
Remove launcher lighting settings that support runtime changes
...
Also update lighting method descriptions
2024-06-12 22:44:12 +03:00
Alexei Kotov
ccd36e9413
Support light fade settings in legacy lighting method
...
This doesn't change launcher descriptions because the launcher settings are going to be omitted
2024-06-12 22:44:12 +03:00
psi29a
b001deeff7
Merge branch 'landfalloutbutnothingtodowithfallout' into 'master'
...
Fix terrain CMake and testing fallout (unbreaks CI)
See merge request OpenMW/openmw!4170
2024-06-12 18:26:05 +00:00
Evil Eye
fbc6629d40
Rework land texture handling
2024-06-12 17:09:28 +02:00
Alexei Kotov
5c6fbc332f
Fix endif conditions in cmake
2024-06-12 15:43:04 +03:00
Alexei Kotov
a189b6fb88
Merge branch 'tabs' into 'master'
...
Remove unused CI/check_tabs.sh script
See merge request OpenMW/openmw!4157
2024-06-12 12:20:23 +00:00
psi29a
321b84a4d2
Merge branch 'remove-tab-comment' into 'master'
...
components/esm4/loadwrld.hpp: clarify comment
See merge request OpenMW/openmw!4169
2024-06-12 10:43:44 +00:00
Alexei Kotov
65a9f78943
Fix flags used in terrain saving/loading tests
2024-06-12 12:50:20 +03:00
Austin English
338902c247
components/esm4/loadwrld.hpp: clarify comment
...
Also convert tabs to spaces
2024-06-11 20:19:55 -05:00
psi29a
c1d74763ed
Merge branch 'i-have-no-land-and-i-must-scream' into 'master'
...
Fix(CS): Add landscape flag if it doesn't exist at all and improve landscape QOL
Closes #7707
See merge request OpenMW/openmw!3617
2024-06-11 11:10:33 +00:00