1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 18:59:57 +00:00
Commit graph

34626 commits

Author SHA1 Message Date
psi29a
db4e3e3f9e Merge branch 'master' into 'master'
remove cmakefix.patch

See merge request OpenMW/openmw!4211
2024-06-29 09:20:58 +00:00
psi29a
11d405dcdf Merge branch 'buyfrommebestprices' into 'master'
Add a showInDialogue parameter to ui.showMessage and use it for level up messages

Closes #8041

See merge request OpenMW/openmw!4209
2024-06-29 09:20:27 +00:00
Evil Eye
ad7fb3d13f Avoid a few copies in mwscript 2024-06-29 10:31:49 +02:00
Evil Eye
72b62f845e Merge branch 'delegate_crash_fix' into 'master'
Add a missing null pointer check

See merge request OpenMW/openmw!4210
2024-06-29 07:54:17 +00:00
elsid
89bb04e8fd
Exit with fatal error on duplicated instruction code
Instead of causing SIGABRT which is more confusing.
2024-06-28 22:24:24 +02:00
Evil Eye
8a022651f7 Move index from ActiveEffect to ActiveSpellEffect 2024-06-28 17:23:51 +02:00
Dave Corley
77fa41b8c6 CLEANUP(container): Make organic/respawning field names more consistent 2024-06-28 09:26:35 -05:00
Dave Corley
fccf75377d FEAT: Add organic/respawning flags to containers 2024-06-28 09:21:44 -05:00
Max Yari
1497dae4fa Better mUse out-of-range handling 2024-06-28 10:00:04 +02:00
holorat
18164b16b9 Add fix to changelog and name to authors 2024-06-27 22:39:24 +03:00
Jared Davenport
fcb9fafd15 remove cmakefix.patch
for android this is an issue during the cmake process.
2024-06-27 18:00:42 +00:00
Andrei Kortunov
5390634e22 Add a missing null pointer check 2024-06-27 21:10:38 +04:00
Evil Eye
91bcd0a556 Add a showInDialogue parameter to ui.showMessage and use it for level up messages 2024-06-27 17:16:49 +02:00
Max Yari
3eadb84142 Fixed wrong mUse wrapping 2024-06-26 01:25:25 +02:00
psi29a
daada262d7 Merge branch 'revert-456ac2a8' into 'master'
Revert "Merge branch 'were_engineers_not_salt_miners' into 'master'"

See merge request OpenMW/openmw!4207
2024-06-25 20:58:59 +00:00
psi29a
6754b8d941 Revert "Merge branch 'were_engineers_not_salt_miners' into 'master'"
This reverts merge request !4178
2024-06-25 20:58:31 +00:00
psi29a
8471cfb576 Merge branch 'localpairs' into 'master'
Allow mwscript variable iteration

See merge request OpenMW/openmw!4180
2024-06-25 07:20:14 +00:00
psi29a
9a864f309a Merge branch 'theluareloaded' into 'master'
Check the result of loading from bytecode

Closes #7787

See merge request OpenMW/openmw!4189
2024-06-25 07:19:33 +00:00
psi29a
64dd6e36d1 Merge branch 'openmw-cs-error-verify-refnums' into 'master'
OpenMW-CS verify duplicate RefNums

See merge request OpenMW/openmw!4012
2024-06-24 18:03:59 +00:00
cykoder
57e7bf3748 OpenMW-CS verify duplicate RefNums 2024-06-24 18:03:59 +00:00
psi29a
cd365b4e8c Merge branch 'youre_outta_range_joe' into 'master'
FIX: check we're not going out of range while listing content files, fix #8029

Closes #8029

See merge request OpenMW/openmw!4201
2024-06-24 18:02:31 +00:00
psi29a
18859d5cf0 Merge branch 'psi29a-master-patch-87451' into 'master'
https://github.com/OpenMW/openmw/pull/3235

See merge request OpenMW/openmw!4202
2024-06-24 17:59:42 +00:00
psi29a
11c2cf0780 Merge branch 'esm_script' into 'master'
Make loading and saving ESM3 script record more robust

See merge request OpenMW/openmw!4195
2024-06-24 17:59:20 +00:00
Evil Eye
152073a42e Don't trigger onNewExterior while loading saves 2024-06-24 12:47:24 +02:00
psi29a
57adb93075 Merge branch 'coverity' into 'master'
Coverity fixes

See merge request OpenMW/openmw!4198
2024-06-24 07:10:28 +00:00
psi29a
b8d861ca16 Merge branch 'unscriptedrealitytv' into 'master'
Don't try to show unallocated or uninitialized profiling data

See merge request OpenMW/openmw!4188
2024-06-24 07:09:43 +00:00
psi29a
456ac2a85b Merge branch 'were_engineers_not_salt_miners' into 'master'
FEAT: Lua Engine Handler for MWScript `startscript` functionality

See merge request OpenMW/openmw!4178
2024-06-24 07:09:24 +00:00
Dave Corley
1a79e79f57 FEAT: Lua Engine Handler for MWScript startscript functionality 2024-06-24 07:09:23 +00:00
psi29a
d3c3d0cf44 Merge branch 'indexthemoon' into 'master'
Move Lua index helpers to components and make owner.factionRank match other ranks

See merge request OpenMW/openmw!4186
2024-06-24 07:06:24 +00:00
Dave Corley
d03f25437b CLEANUP(contentmodel): Use auto for insertPosition declaration to
avoid possible narrowing
2024-06-23 20:06:23 -05:00
Max Yari
13918e3b70 AttackType -> ATTACK_TYPE 2024-06-24 01:15:43 +02:00
Dave Corley
fbdc4f4881 CLEANUP(contentmodel): Use ranges::find_if instead of a loop 2024-06-23 18:15:27 -05:00
elsid
89a30532b7
Fix getAnglesZYX implementation 2024-06-23 16:08:09 +02:00
elsid
40dee30596
Add more integration tests for rotation
Some tests might fail due to wrong implementation of the functions.
2024-06-23 16:08:05 +02:00
Dave Corley
40aee53831 CLEANUP(contentmodel): Actually, no, I hate while loops 2024-06-23 06:07:16 -05:00
Dave Corley
b43743212e FIX: check we're not going out of range while listing content files, fix #8029 2024-06-23 06:07:12 -05:00
psi29a
b00df7cbfc https://github.com/OpenMW/openmw/pull/3235 2024-06-23 08:42:00 +00:00
Evil Eye
5cf809f39b Merge branch 'ocd' into 'master'
Assorted nitpicks

See merge request OpenMW/openmw!4194
2024-06-23 07:10:07 +00:00
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
Alexei Kotov
b0671c76d8 Throw on setting tags that can't provide the setting name 2024-06-22 14:34:09 +03:00
Alexei Kotov
162ac6a75e Avoid copying shader material shared_ptr in NifLoader 2024-06-22 14:34:09 +03:00
Evil Eye
5b82c7a95d Don't assume execution of an internal Lua script can't fail 2024-06-22 11:26:32 +02:00
Alexei Kotov
43b381f592 Loop by const ref in activeSpells.add 2024-06-22 12:08:40 +03: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
Max Yari
88e4ec198d Changed value type in the docs 2024-06-22 00:15:19 +02:00
holorat
cd4b7db02d Reorder profiler stats according to timeline 2024-06-22 00:27:49 +03:00
Max Yari
b01b76b81e Introduced attacktype enum, fixed lua docs 2024-06-21 23:18:48 +02:00
Max Yari
2ef0568dda Changed lua enum name, tweaked docs 2024-06-21 23:18:48 +02:00