1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 19:29:56 +00:00
Commit graph

31735 commits

Author SHA1 Message Date
Alexei Kotov
f2a9ab52db Merge branch 'fix_crach_missing_content_file' into 'master'
Fix crash if content file is not found (was caused by !3249)

See merge request OpenMW/openmw!3323
2023-08-11 18:29:52 +00:00
Alexei Kotov
8307a3d82e Merge branch 'fix_fog_of_war' into 'master'
Always enable fog of war in map window (#7525)

Closes #7525

See merge request OpenMW/openmw!3330
2023-08-11 18:11:57 +00:00
elsid
1c4b6a552f
Always enable fog of war in map window 2023-08-10 20:49:35 +02:00
jvoisin
f1c3b42cfb Merge branch 'minorfix_local' into 'master'
Add missing 'local' in playercontrols.lua

See merge request OpenMW/openmw!3324
2023-08-10 15:09:36 +00:00
Petr Mikheev
b5f4cec725 Fix crash if content file is not found (was caused by !3249) 2023-08-09 10:32:35 +02:00
Petr Mikheev
b34930d3f2 Add missing 'local' in playercontrols.lua 2023-08-09 10:18:26 +02:00
psi29a
84e71f4977 Merge branch 'hashtagcornyphrase' into 'master'
Don't replace tags when dealing with console input

See merge request OpenMW/openmw!3291
2023-08-08 08:54:23 +00:00
psi29a
3151452e25 Merge branch 'pandorasbox' into 'master'
Launcher, content selector: support ESM4 files, allow using game files as addon files

See merge request OpenMW/openmw!3219
2023-08-08 08:54:10 +00:00
psi29a
7b4f7b7f07 Merge branch 'adjust_refnum' into 'master'
Adjust FormId in FormIdRefId and for items in containers when loading saves

See merge request OpenMW/openmw!3293
2023-08-08 08:54:00 +00:00
psi29a
33d0774637 Merge branch 'healplz' into 'master'
Tweak AI rating to reduce healing spam

Closes #4207

See merge request OpenMW/openmw!2553
2023-08-08 08:53:22 +00:00
Evil Eye
fb10014d6e Remove heal cooldown 2023-08-07 22:44:24 +02:00
Evil Eye
ee92ae7e34 Simplify restore magicka priority 2023-08-07 22:43:39 +02:00
Evil Eye
7c82405c9f Tweak AI rating to reduce healing spam 2023-08-07 22:43:35 +02:00
psi29a
e4a6f70011 Merge branch 'fix_esm4_terrain' into 'master'
Support terrain sample size greater than cell size (#7505)

Closes #7505

See merge request OpenMW/openmw!3313
2023-08-07 08:57:38 +00:00
elsid
8e7fe44514
Support terrain sample size greater than cell size 2023-08-06 23:47:35 +02:00
elsid
2a49919b53
Move esm3terrain to esmterrain 2023-08-06 19:17:44 +02:00
elsid
28436557b1
Validate fillVertexBuffers arguments 2023-08-06 19:17:44 +02:00
elsid
fbd3d1f61d
Rename increment to sampleSize 2023-08-06 19:17:44 +02:00
elsid
0da156bdc2
Skip getLand call when no vertices are used 2023-08-06 19:17:44 +02:00
elsid
5fda4b3cfd
Precompute height cooridnates offsets 2023-08-06 19:17:43 +02:00
elsid
2c2a60b86c
Simplify filling positions 2023-08-06 19:17:43 +02:00
elsid
4a2a320e08
Use const where possible 2023-08-06 19:17:43 +02:00
elsid
d3e61e4578
Replace C-style cast by static_cast 2023-08-06 19:17:43 +02:00
elsid
e4584ce5dd
Reduce scope for normal and color 2023-08-06 19:17:43 +02:00
elsid
829f325500
Use proper name and scope for vertex coordinate variables 2023-08-06 19:17:43 +02:00
elsid
a23c98d468
Use std::size_t type for vertex coordinates 2023-08-06 19:17:43 +02:00
elsid
51b24c2b70
Fix variable name 2023-08-06 19:17:43 +02:00
elsid
c10f28a413
Pass references to fillVertexBuffers instead of osg::ref_ptr 2023-08-06 19:17:43 +02:00
psi29a
fadfffe22c Merge branch 'settings_values_map' into 'master'
Use settings values for Map settings (#6876)

See merge request OpenMW/openmw!3284
2023-08-06 16:14:09 +00:00
psi29a
0c5faf8fbb Merge branch 'save_apply_lua_actions' into 'master'
Apply delayed Lua actions before making a save

See merge request OpenMW/openmw!3294
2023-08-06 16:13:33 +00:00
psi29a
ba4298f36d Merge branch 'refactor_esm4' into 'master'
Refactor components/esm4 to make it easier to load records to ESMStore

See merge request OpenMW/openmw!3301
2023-08-06 16:13:07 +00:00
psi29a
806fe0a9c3 Merge branch 'noqt6formacosyet' into 'master'
Have macos use Qt5 instead of Qt6

See merge request OpenMW/openmw!3316
2023-08-06 16:06:28 +00:00
psi29a
088e8ea4c8 Have macos use Qt5 instead of Qt6 2023-08-06 16:06:28 +00:00
psi29a
3e56f4eaf8 Merge branch 'feature/7358_mygui_342_req' into 'master'
[#7358] Make MyGui 3.4.2 required for 0.49

See merge request OpenMW/openmw!3261
2023-08-06 16:06:00 +00:00
psi29a
8d1a19a6f4 [#7358] Make MyGui 3.4.2 required for 0.49 2023-08-06 16:05:59 +00:00
Petr Mikheev
957880d515 Add to ESMStore the records that are needed to render ESM4 actors; cleanup usage of records.hpp 2023-08-05 13:18:09 +02:00
Petr Mikheev
5d54ca6fdb Refactor components/esm4 2023-08-05 13:12:24 +02:00
psi29a
e6cffa5494 Merge branch '7248-Extend_console_search_with_regex_and_case_sensitivity' into 'master'
Resolve "Extend searching in the console with regex and toggleable case-sensitivity"

Closes #7248

See merge request OpenMW/openmw!3248
2023-08-05 10:02:08 +00:00
Chris Vigil
996f5fd7ad Resolve "Extend searching in the console with regex and toggleable case-sensitivity" 2023-08-05 10:02:07 +00:00
psi29a
2a4440e5b1 Merge branch 'theprojectileswereswords' into 'master'
Fix price enchantment price calculation to use the correct item count

Closes #7472

See merge request OpenMW/openmw!3227
2023-08-04 09:05:02 +00:00
psi29a
ed81baf864 Merge branch 'chrono_fix' into 'master'
Simplify file_time_type to time_t conversion

See merge request OpenMW/openmw!3161
2023-08-03 21:47:40 +00:00
psi29a
c290754077 Revert "Merge branch 'loadSSEAlchemyTable' into 'master'"
This reverts merge request !3267
2023-08-03 19:55:06 +00:00
psi29a
9c2a2e1946 Merge branch 'nvpp_fixes' into 'master'
Improve safety of NVPP ESM records

See merge request OpenMW/openmw!3307
2023-08-03 07:15:43 +00:00
psi29a
4aaffa72e5 Merge branch 'more_coverity_fixes' into 'master'
More coverity fixes

See merge request OpenMW/openmw!3304
2023-08-03 07:15:34 +00:00
psi29a
4557d20f0b Merge branch 'coverity_strings' into 'master'
Simplify strings construction

See merge request OpenMW/openmw!3310
2023-08-03 07:15:06 +00:00
psi29a
9cd81c21eb Merge branch 'coverity_lua' into 'master'
Do not copy objects twice where possible

See merge request OpenMW/openmw!3311
2023-08-03 07:14:45 +00:00
Andrei Kortunov
f5b18d2d5d Do not copy objects twice where possible 2023-08-02 20:03:48 +04:00
Andrei Kortunov
b3a981e0fc Simplify strings construction 2023-08-02 17:59:40 +04:00
psi29a
5160fbc2a0 Merge branch 'fixedtimestamp' into 'master'
Move TimeStamp to ESM3 and remove sized reads

See merge request OpenMW/openmw!3295
2023-08-02 08:11:33 +00:00
psi29a
b643e58e71 Merge branch 'esm4_cell_description' into 'master'
Always log something for loading and unloading ESM4 cell

See merge request OpenMW/openmw!3298
2023-08-02 08:10:59 +00:00