mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 00:53:52 +00:00
Code Issues Releases Wiki Activity
28533 commits 108 branches 66 tags 133 MiB
Commit graph

28533 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrei Kortunov
41a976b5f0 Suppress a GCC 11's format-overflow warning 2022-07-03 18:21:55 +04: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
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
uramer
ebdcb7acbd Merge branch 'undefined_variable' into 'master' 
Fix undeclared shader variable

See merge request OpenMW/openmw!2070
 2022-07-01 14:34:59 +00:00
Cody Glassman
03616ae2d3 Fix undeclared shader variable 2022-07-01 14:34:59 +00:00
jvoisin
7a28d590ef Merge branch 'precompile_headers' into 'master' 
Use target_precompile_headers for the most expensive headers

See merge request OpenMW/openmw!2062
 2022-07-01 14:05:17 +00:00
elsid
7e6c13630a Use target_precompile_headers for the most expensive headers 2022-07-01 14:05:17 +00:00
jvoisin
b10937ecd4 Fix links to the wiki 2022-07-01 15:38:38 +02:00
Evil Eye
c081b8cfa9 Don't load content entries from global and local configs 2022-06-30 20:57:51 +02:00
psi29a
8a13cde778 Merge branch 'schlick' into 'master' 
Superior soft effect fade

See merge request OpenMW/openmw!2067
 2022-06-30 15:40:00 +00:00
glassmancody.info
7b958148d0 better fade 2022-06-30 08:23:28 -07:00
psi29a
56187ad977 Merge branch 'soften_me_up_like_one_of_your_french_meshes' into 'master' 
Allow soft particle effect on any NIF

See merge request OpenMW/openmw!2015
 2022-06-30 13:46:22 +00:00
psi29a
28172c33ca Merge branch 'move360_fix' into 'master' 
Fix move360.lua switching to 3rd person view when it shouldn't

See merge request OpenMW/openmw!2065
 2022-06-30 10:46:18 +00:00
Petr Mikheev
466fc559f4 Fix move360.lua switching to 3rd person view when it shouldn't 2022-06-30 11:25:36 +02:00
glassmancody.info
b09411d396 allow soft particles on meshes and add extra data extensions 2022-06-29 18:15:12 -07:00
psi29a
451cc6a07c Merge branch 'correct_path' into 'master' 
Use existing functions and objects to call correctMeshPath etc (#6837)

Closes #6837

See merge request OpenMW/openmw!2063
 2022-06-29 10:22:08 +00:00
psi29a
e861491127 Merge branch 'quickfix' into 'master' 
Fix a couple typos

See merge request OpenMW/openmw!2052
 2022-06-29 09:22:15 +00:00
elsid
ce263af393
Use existing functions and objects to call correctMeshPath etc 
Remove WindowManager wrappers.

It's not safe to use WindowManager in all places and it's not required.
Environment stores resource system providing VFS required to call these
functions. In the case of ObjectPaging it's available from the member variable.
Also ObjectPaging::createChunk may access WindowManager when it's already
destructed when exiting the game because it's destructed before CellPreloader
finishes all background jobs. Engine::mResourceSystem is destructed after all
other systems so it's safe to use it.
 2022-06-29 00:58:49 +02:00
AnyOldName3
066575821b Merge branch 'fog_alpha' into 'master' 
Several fixes related to sky blending

See merge request OpenMW/openmw!2046
 2022-06-28 22:17:37 +00:00
Andrei Kortunov
d47df964b1 Merge branch '503geek-docs-install-xbox-game-pass-patch' into 'master' 
Update docs/source/manuals/installation/install-game-files.rst

See merge request OpenMW/openmw!1810
 2022-06-28 16:42:20 +00:00
Mick McCuen
cfe6a7d78b Update docs/source/manuals/installation/install-game-files.rst 2022-06-28 16:42:20 +00:00
psi29a
776cae4c95 Merge branch 'assert' into 'master' 
Use string_view in Layout and remove dead code

See merge request OpenMW/openmw!2060
 2022-06-27 20:02:20 +00:00
Petr Mikheev
d0deb37f5c Fix several issues with sky blending 2022-06-27 21:51:41 +02:00
Evil Eye
81ec7e80bb Use string_view in Layout and remove dead code 2022-06-27 19:13:17 +02:00
jvoisin
3403ea1d9e Merge branch 'FixUBOnDoubleMove' into 'master' 
Avoid double move when an area with same coordinates already exists

See merge request OpenMW/openmw!2059
 2022-06-27 16:28:17 +00:00
psi29a
a814d11a39 Merge branch 'move_left_shift_to_cpp' into 'master' 
Move std::ostream& operator<< to .cpp

See merge request OpenMW/openmw!2058
 2022-06-27 09:24:01 +00:00
psi29a
7786519caf Merge branch 'groundcoverstore_hpp' into 'master' 
Remove redundant includes from groundcoverstore.hpp

See merge request OpenMW/openmw!2057
 2022-06-27 09:14:37 +00:00
elsid
1a5932a669
Move std::ostream& operator<< to .cpp 2022-06-26 22:43:53 +02:00
elsid
ffd1bd30ef
Remove redundant includes from groundcoverstore.hpp 2022-06-26 22:28:10 +02:00
Cédric Mocquillon
cbf48b4382 Avoid double move when an area with same coordinates already exists 2022-06-26 21:45:42 +02:00
psi29a
cef4ce2c01 Merge branch 'split_actorutil_hpp' into 'master' 
Split apps/openmw/mwmechanics/actorutil.hpp

See merge request OpenMW/openmw!2056
 2022-06-26 19:38:40 +00:00
elsid
fdf6e58ea3
Split apps/openmw/mwmechanics/actorutil.hpp 2022-06-26 16:42:29 +02:00
glassmancody.info
54e2e74c2a quickfix 2022-06-25 22:41:03 -07:00
psi29a
39d7f2c95b Merge branch 'boost_program_options' into 'master' 
Reduce number of includes for boost/program_options

See merge request OpenMW/openmw!2051
 2022-06-25 21:34:59 +00:00
elsid
10fbf170a2
Reduce number of includes for boost/program_options 2022-06-25 18:32:10 +02:00
psi29a
47cfaef7d2 Merge branch 'ptmikheev-master-patch-74509' into 'master' 
Fast fix in cellbindings.cpp

See merge request OpenMW/openmw!2050
 2022-06-25 07:04:01 +00:00
Petr Mikheev
50b143b53f Fast fix in cellbindings.cpp 2022-06-24 23:41:11 +00:00