Frederic Chardon
ad1ab1c880
Follow up to !192
2022-04-27 19:51:54 +00:00
psi29a
66a96bfa5e
Merge branch 'launcher-datadirs' into 'master'
...
Make launcher handle data dirs #2858 and BSA
See merge request OpenMW/openmw!192
2022-04-27 17:31:52 +00:00
madsbuvi
164458dc56
shader fixes
2022-04-27 17:43:51 +02:00
psi29a
cd1a5f2de9
Merge branch 'openmw_aux' into 'master'
...
[Lua] Update openmw_aux.util
See merge request OpenMW/openmw!1797
2022-04-27 15:11:29 +00:00
Petr Mikheev
1fd4ac9168
[Lua] Update openmw_aux.util
2022-04-26 22:47:28 +02:00
madsbuvi
dc3045c970
mono-only version of the shader linking system introduced in the stereo MR
2022-04-26 19:54:24 +02:00
elsid
d2510284ec
Support TES4 in esmtool dump
2022-04-25 17:35:26 +02:00
elsid
4b28d51d5e
Remove virtual modifiers from ESM4 record functions
...
There is no need to have virtual functions.
2022-04-25 17:35:25 +02:00
elsid
2c9b6fffe5
Remove preloading logic from ESM4::Cell
...
This logic does not belong here. If client of ESM4::Cell needs to cache load
results it can be done separately.
2022-04-25 17:35:25 +02:00
elsid
13c970b37a
Add const modifier to encoder type
2022-04-25 17:35:25 +02:00
elsid
c7ba4100e1
Remove undefined and redundant ESM4 record type constructors
2022-04-25 17:35:25 +02:00
elsid
43b2892cc3
Move ESMData, reader and writer out of esmtool Arguments
2022-04-25 17:35:25 +02:00
jvoisin
dd4f1e3044
Merge branch 'increase-timeout' into 'master'
...
Increase CI timeout for windows builds to 2h
See merge request OpenMW/openmw!1801
2022-04-25 10:39:17 +00:00
ζeh Matt
0c2c47810c
Increase CI timeout for windows builds to 2h
2022-04-25 12:35:00 +03:00
psi29a
c930aabf17
Merge branch 'fix_windows_build' into 'master'
...
Fix build on Windows
See merge request OpenMW/openmw!1796
2022-04-25 06:38:33 +00:00
elsid
0dcb1f5aac
Fix build on Windows
...
Use wrapper header over Windows.h to undefine far and near in a single place.
2022-04-25 00:25:46 +02:00
psi29a
eceb7406aa
Merge branch 'lua_storage' into 'master'
...
[Lua] Update openmw.storage
See merge request OpenMW/openmw!1795
2022-04-24 20:13:59 +00:00
jvoisin
3621b9a759
Merge branch 'clean' into 'master'
...
Appease some clang warnings
See merge request OpenMW/openmw!1794
2022-04-24 11:34:29 +00:00
Petr Mikheev
eae1e87081
[Lua] Update openmw.storage
2022-04-23 18:55:12 +02:00
psi29a
f99f818c0c
Merge branch 'esm4_cleanup' into 'master'
...
ESM4 cleanup
See merge request OpenMW/openmw!1792
2022-04-23 15:27:28 +00:00
psi29a
cfcc88f64c
Merge branch 'istream_unique_ptr' into 'master'
...
Use unique_ptr to store istream
See merge request OpenMW/openmw!1793
2022-04-23 11:19:27 +00:00
uramer
1206d30add
Merge branch 'lua_console' into 'master'
...
Lua console
See merge request OpenMW/openmw!1780
2022-04-23 10:30:13 +00:00
fredzio
b88d32ff5b
Add 3 tabs in the "Data Files" page
...
1 with the data directories
2 with the BSA archives
3 with the content selector
When user select a directory to be added, first we walk the directory
hierarchy to make a list of all potential data= entries. If we find
none, the selected directory is added.
If more than one data directory is found, user is presented with a
directory list to check which one(s) are to be added.
Directories containing one or more content file are marked with an icon.
data= and fallback-archive= lines are handled like content= lines:
- they are part of the profile in launcher.cfg, prefixed by the profile
name
- they are updated in openmw.cfg when profile is selected / created
Directories can be moved in the list by drag and drop or by buttons.
Insertion is possible anywhere in the list.
Global data path and data local are shown but are greyed out, as they
are always included.
No attempt is made to ensure that the user choice are valid
(dependencies, overwrite of content).
After a profile is loaded, any added content is highlighted in green.
2022-04-23 09:54:45 +02:00
fredzio
5a1a987f6c
Remove write-only variable.
2022-04-23 09:13:22 +02:00
elsid
4a49bc4941
Remove undefined constructor declaration
2022-04-23 01:27:45 +02:00
elsid
d71a1efa92
Rename components/esm4/acti.hpp -> components/esm4/loadacti.hpp
2022-04-23 00:40:45 +02:00
elsid
d5fb2f8091
Use ESM::fourCC to define ESM4 record types
2022-04-23 00:32:52 +02:00
elsid
761a04ce00
Remove duplicated enum definition
2022-04-23 00:32:52 +02:00
elsid
3abcf3dd0d
Fix style guide
2022-04-23 00:32:52 +02:00
elsid
94c1d0cced
Use unique_ptr to store istream
2022-04-22 18:27:17 +02:00
elsid
c94d8be7bf
Add generic StreamWithBuffer owning the underlying buffer
2022-04-22 18:27:17 +02:00
elsid
9d6d0c6ffb
Move ConstrainedStreamBuf into separate file
2022-04-22 18:27:17 +02:00
psi29a
ddd01ac777
Merge branch 'fix_log_time' into 'master'
...
Use system_clock for time in logs (#6711 )
Closes #6711
See merge request OpenMW/openmw!1791
2022-04-21 23:03:39 +00:00
elsid
e777e35414
Use system_clock for time in logs
...
high_resolution_clock may not give real time. MSVC implements it as
steady_clock that is basically CPU time which is usually desynchronized with
real time.
2022-04-21 23:03:40 +02:00
Petr Mikheev
88d09c336c
Lua console
2022-04-21 21:57:07 +02:00
Petr Mikheev
1363292fc9
Merge branch 'l10n_docs' into 'master'
...
L10n docs
See merge request OpenMW/openmw!1785
2022-04-21 19:44:18 +00:00
Alexei Kotov
6d794cf9ca
Merge branch 'fix-savegamerecords' into 'master'
...
Include random state record in count of saved records
See merge request OpenMW/openmw!1790
2022-04-21 10:38:49 +00:00
psi29a
43f1d27c17
Merge branch 'icu-build-updates' into 'master'
...
ICU Build updates
Closes #6708
See merge request OpenMW/openmw!1789
2022-04-21 09:46:46 +00:00
psi29a
f63cd44f52
Merge branch 'navmesh_debug_async_scene' into 'master'
...
Prepare navmesh scene asynchronously
See merge request OpenMW/openmw!1788
2022-04-21 09:45:11 +00:00
ζeh Matt
51a84aaef8
Include random state record in count of saved records
2022-04-21 11:51:10 +03:00
Benjamin Winger
8179a097f8
Added ICU feature filters to limit the size of the data library when building ICU ourselves
2022-04-20 20:36:06 -04:00
Benjamin Winger
8a09cec0ab
Only disable building ICU tools when doing an android cross-compile
...
Otherwise the icudata library won't be built
2022-04-20 20:35:55 -04:00
Benjamin Winger
206f0d4b1d
Remove some hardcoded values in when building ICU on android
2022-04-20 20:35:51 -04:00
Benjamin Winger
755c161ab7
Display fatal error if OPENMW_ICU_HOST_BUILD_DIR is not set on Android
2022-04-20 20:25:37 -04:00
Benjamin Winger
2f455aa87b
Added fallback details to l10n docs
2022-04-20 20:10:58 -04:00
Benjamin Winger
dac4415699
Moved localisation docs to dedicated page
2022-04-20 20:10:58 -04:00
elsid
a2d596dbc7
Prepare navmesh scene asynchronously
...
It is expensive operation to generate new osg::Group for updated navmesh tile
which noticeably slows down main thread primarily because of
SceneManager::recreateShaders call. Move it to the preload work queue that is
used by RenderingManager. Leave to main thread only manipulations on the root
node.
Also move deallocation of no more needed data to the work queue. It's also
quite expensive operation because SceneManager::recreateShaders allocates a
new state set for each osg::Geometry. Deallocating them takes time.
Avoid creating another work item if there is existing one that is not started
yet.
Make sure results are accepted in the proper serialized order by selecting
completed work item with maximum {id, version}.
2022-04-20 23:14:31 +02:00
Matjaž Lamut
21d46dcf78
Add fallbacks for the moons.
2022-04-20 12:02:22 +00:00
psi29a
9a00ce1c20
Merge branch 'icu_friends_with_android' into 'master'
...
Disable ICU tools for Android
See merge request OpenMW/openmw!1786
2022-04-20 09:28:26 +00:00
Abdu Sharif
6cb36464c3
disable ICU tools for android
2022-04-20 08:14:02 +00:00
