1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-29 08:15:35 +00:00
Commit graph

34464 commits

Author SHA1 Message Date
elsid
73d48720ef
Do not change output names for targets
Changing them does not solve any problem but only creates some.
2024-07-13 10:35:16 +02:00
elsid
b3abc436dd
Keep separation between openmw and openmw-lib on Android
They are not set up properly so CMake configuration fails because of not found
openmw-lib target since it's not defined for Android.
2024-07-13 10:35:12 +02:00
psi29a
b1de8ed720 Merge branch 'profilersort' into 'master'
Reorder F3 profiler stats according to timeline

Closes #8005

See merge request OpenMW/openmw!4196
2024-06-29 09:21:48 +00:00
psi29a
4da35c7e7f Merge branch 'free_range_containers' into 'master'
FEAT: Add organic/respawning flags to containers (Close #8038)

Closes #8038

See merge request OpenMW/openmw!4205
2024-06-29 09:21:12 +00:00
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
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
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
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
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
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
Dave Corley
fbdc4f4881 CLEANUP(contentmodel): Use ranges::find_if instead of a loop 2024-06-23 18:15:27 -05: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
holorat
cd4b7db02d Reorder profiler stats according to timeline 2024-06-22 00:27:49 +03:00
Evil Eye
83e8729256 Check the result of loading from bytecode 2024-06-21 22:35:34 +02:00
elsid
5c3ae3d94c
Make loading and saving script record more robust
* Check the header presence before using it.
* Write the header based on the actual content.
2024-06-21 20:37:37 +02:00
Alexei Kotov
c6156011c8 Remove unnecessary lines in actor bindings 2024-06-21 20:22:26 +03:00
Alexei Kotov
348ef6ff2f Update settings-default.cfg light bounds multiplier comment 2024-06-21 20:22:26 +03:00
Alexei Kotov
479d4931d7 Handle negative MaxNumberRipples more sensibly 2024-06-21 20:16:43 +03:00
elsid
447c4bb6a0
Extend ESM3 Script record tests 2024-06-21 18:01:34 +02:00
elsid
4571a8b88a
Remove unused SCHD type 2024-06-21 15:39:17 +02:00
AnyOldName3
decfe75ae5 Don't attempt to continue an outer loop from an inner loop 2024-06-21 14:05:52 +01:00