elsid
4613840914
Use single implementation to check whether marker is hidden
2022-07-05 00:36:37 +02:00
Cody Glassman
cec7f1e7bc
Merge branch 'shader_error' into 'master'
...
Add a missing 0 in fog.glsl
See merge request OpenMW/openmw!2089
2022-07-04 17:31:03 +00:00
Abdu Sharif
c09648c349
Add a missing 0 in fog.glsl
2022-07-04 17:31:03 +00:00
psi29a
c9264de22a
Merge branch 'warnfix' into 'master'
...
Suppress a GCC 11's format-overflow warning
See merge request OpenMW/openmw!2080
2022-07-04 12:08:31 +00:00
psi29a
bc3421642d
Merge branch 'light' into 'master'
...
Fix emissive in character preview
See merge request OpenMW/openmw!2088
2022-07-04 06:56:23 +00:00
psi29a
9da84480f0
Merge branch 'misc_ui' into 'master'
...
Improved settings window
Closes #6780
See merge request OpenMW/openmw!2087
2022-07-04 06:55:42 +00:00
psi29a
1e56ac9878
Merge branch 'sizable' into 'master'
...
Movable and resizable log window
See merge request OpenMW/openmw!2086
2022-07-04 06:48:58 +00:00
glassmancody.info
9a0e9ac4fe
fix emissives in character preview
2022-07-03 18:46:22 -07:00
glassmancody.info
63d9fa55c6
settings window cleanup
2022-07-03 12:49:37 -07:00
Andrei Kortunov
f6a07ab603
Merge branch 'fix_image_button_scale' into 'master'
...
Use float based scale factor for ImageButton texture (#6849 )
Closes #6849
See merge request OpenMW/openmw!2076
2022-07-03 17:46:51 +00:00
elsid
a16c55c93f
Use float based scale factor for ImageButton texture
2022-07-03 19:41:13 +02:00
jvoisin
bbcc12262f
Merge branch 'fix_icu_from_utf8_debug_crash' into 'master'
...
Avoid constructing icu::StringPiece from std::string directly (#6782 )
Closes #6782
See merge request OpenMW/openmw!2073
2022-07-03 17:37:00 +00:00
jvoisin
498a835b77
Merge branch 'coverity' into 'master'
...
Fix some Coverity issues
See merge request OpenMW/openmw!2082
2022-07-03 16:29:05 +00:00
jvoisin
0f649ce544
Merge branch 'fix-appstream-images' into 'master'
...
Fix the screenshot URLs in the appstream XML
See merge request OpenMW/openmw!2081
2022-07-03 16:21:43 +00:00
glassmancody.info
fcab4fe1ab
make debug window a movable and resizable window
2022-07-03 09:09:16 -07:00
Andrei Kortunov
41a976b5f0
Suppress a GCC 11's format-overflow warning
2022-07-03 18:21:55 +04:00
elsid
f3dfb5d939
Merge branch 'const_casts' into 'master'
...
Don't cast away const when we can avoid it
See merge request OpenMW/openmw!2085
2022-07-03 14:06:58 +00:00
Petr Mikheev
cae7bc92d8
Merge branch 'locale_ru' into 'master'
...
Add a Russian localization for built-in Lua content
See merge request OpenMW/openmw!2079
2022-07-03 12:54:14 +00:00
Petr Mikheev
132031c136
Merge branch 'project_warp_speed' into 'master'
...
[Lua] Set simulation time scale
See merge request OpenMW/openmw!2053
2022-07-03 12:51:29 +00:00
Cody Glassman
051832d7ae
[Lua] Set simulation time scale
2022-07-03 12:51:28 +00:00
Andrei Kortunov
fe785ea788
Don't cast away const when we can avoid it
2022-07-03 16:36:41 +04:00
Andrei Kortunov
14b5674d32
Init missing data members
2022-07-03 15:44:50 +04:00
Andrei Kortunov
124db67496
Add an assert to detect possible nullptr dereference
2022-07-03 15:44:50 +04:00
Andrei Kortunov
5d94a94a98
Use a Boost API to resolve symlinks instead of low-level code
2022-07-03 15:44:50 +04:00
Andrei Kortunov
03cdffb555
Init some missing variables
2022-07-03 15:44:50 +04:00
Andrei Kortunov
7cce341822
Fix initializer
2022-07-03 15:44:50 +04:00
Andrei Kortunov
1274a229d1
Remove pointless null check
2022-07-03 15:44:50 +04:00
Andrei Kortunov
e97172bbb2
Add a check for null
2022-07-03 15:44:50 +04:00
Andrei Kortunov
d2a1cc954f
Remove unused variable
2022-07-03 15:44:50 +04:00
Andrei Kortunov
aa349f2ed9
Initialize some missing variables
2022-07-03 15:44:50 +04:00
Andrei Kortunov
523ad825c2
There is no point to compare an unsigned value with 0
2022-07-03 15:44:31 +04:00
Andrei Kortunov
62f5bedef5
Remove pointless check
2022-07-03 15:44:31 +04:00
Andrei Kortunov
0989e273d4
Add a Russian localization for built-in Lua content
2022-07-03 09:59:10 +04:00
Alexander Olofsson
84259d312b
Fix the screenshot URLs in the appstream XML
2022-07-02 19:49:25 +02:00
AnyOldName3
6609243c87
Merge branch 'dont_notice_me_launcher_senpai' into 'master'
...
Don't load content entries from global and local configs
Closes #6441
See merge request OpenMW/openmw!2068
2022-07-02 16:02:10 +00:00
Petr Mikheev
11d1a54626
Merge branch 'more-stereo-woes' into 'master'
...
More stereo-postprocessing integration
See merge request OpenMW/openmw!2054
2022-07-02 15:26:35 +00:00
Mads Buvik Sandvei
6dc727cf8f
More stereo-postprocessing integration
2022-07-02 15:26:35 +00:00
Alexei Kotov
3ba39f977b
Merge branch 'FIX_COMPRESSED_BSA_LOAD' into 'master'
...
Fixes compressed BSA loading
Closes #6847
See merge request OpenMW/openmw!2075
2022-07-02 14:46:26 +00:00
florent.teppe
4f832f479b
Fixes compressed BSA loading
...
When creating the folders map, the folder name without / is hashed, but when trying to get a file record, when looking for a folder it was hashed wit the /
So now in getFileRecord parent_path is used instead
2022-07-02 15:37:26 +02:00
elsid
fa29dd05fc
Merge branch 'fix_wiki_links' into 'master'
...
Fix links to the wiki
See merge request OpenMW/openmw!2069
2022-07-02 10:00:50 +00:00
Evil Eye
478ad07607
Only load global cfg if local wasn't found
2022-07-02 11:19:36 +02:00
AnyOldName3
58593a1e62
Merge branch 'disable_crash_catcher' into 'master'
...
Allow to disable crash catcher on Windows
See merge request OpenMW/openmw!2072
2022-07-01 23:17:32 +00:00
AnyOldName3
fdd920ed72
Merge branch 'fix_msvc_warnings' into 'master'
...
Fix msvc warnings
See merge request OpenMW/openmw!2071
2022-07-01 23:02:09 +00:00
elsid
d2ed62ec3a
Allow to disable crash catcher on Windows
2022-07-01 22:44:03 +02:00
elsid
316f666e77
Avoid constructing icu::StringPiece from std::string directly
...
Otherwise it causes a crash on Windows when OpenMW is built in debug
mode but ICU not.
2022-07-01 22:31:06 +02:00
elsid
e074ebde96
Fix C4389 msvc warning
...
'==': signed/unsigned mismatch
2022-07-01 18:47:47 +02:00
elsid
2eae3227ba
Fix C4305 msvc warning
...
'argument': truncation from 'double' to 'float'
2022-07-01 18:47:46 +02:00
elsid
5891d58f63
Fix C4456 msvc warning
...
declaration of 'it' hides previous local declaration
2022-07-01 18:47:44 +02:00
elsid
8544aa481c
Fix C4459 msvc warning
...
declaration of 'navMeshVersion' hides global declaration
2022-07-01 18:47:40 +02:00
elsid
2d6e048d88
Fix C4589 msvc warning
...
Constructor of abstract class 'SceneUtil::KeyframeController' ignores initializer for virtual base class 'osg::Object'
2022-07-01 18:47:06 +02:00
