mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 21:32:42 +00:00
Code Issues Projects Releases Wiki Activity
28,715 Commits 19 Branches 66 Tags
Commit Graph

28715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
elsid
f1ded70366
Remove redundant condition 
apps/openmw/mwmechanics/character.cpp:500:14: warning: redundant condition 'isRealWeapon' [bugprone-redundant-branch-condition]
        else if (isRealWeapon)
             ^~~~~~~~~~~~~~~~~
 2022-07-06 13:52:25 +02:00
Alexei Kotov
c38e342c99 Merge branch 'psi29a-master-patch-21668' into 'master' 
DeathKnockOut when KnockOut...

See merge request OpenMW/openmw!2106
 2022-07-06 10:52:48 +00:00
psi29a
95a6fa8d0c DeathKnockOut when KnockOut... 2022-07-06 10:48:22 +00:00
psi29a
bd8b2b005b Merge branch 'android-no-space-left-workaround' into 'master' 
disable android's install step to work around no space left

See merge request OpenMW/openmw!2105
 2022-07-06 09:31:16 +00:00
psi29a
b2cf0918f5 Update .gitlab-ci.yml 2022-07-06 08:41:54 +00:00
psi29a
a793749aa3 Merge branch 'sun_fix' into 'master' 
Flickering sun

Closes #6854

See merge request OpenMW/openmw!2104
 2022-07-06 08:39:51 +00:00
psi29a
9519764a74 Update .gitlab-ci.yml 2022-07-06 07:56:31 +00:00
psi29a
94ea3e3a23 disable android's install step to work around no space left 2022-07-06 07:54:23 +00:00
psi29a
9ed4d17f8a Merge branch 'hidden_marker' into 'master' 
Use single implementation to check whether marker is hidden

See merge request OpenMW/openmw!2096
 2022-07-06 07:30:56 +00:00
glassmancody.info
89bc756732 tmp_sun_fix 2022-07-05 23:47:23 -07:00
psi29a
b2766b0650 Merge branch 'sdl2_point_22' into 'master' 
Fix mouse clicking with sdl2 2.0.22

Closes #6678

See merge request OpenMW/openmw!2101
 2022-07-06 06:32:24 +00:00
jvoisin
2a16fddf21 Merge branch 'psi29a-master-patch-40957' into 'master' 
No attack animation while blocking fix

Closes #6855

See merge request OpenMW/openmw!2103
 2022-07-05 21:43:56 +00:00
AnyOldName3
2bb28b5e27 Merge branch 'fix_typo' into 'master' 
Fix particle flags typo (#6857)

Closes #6857

See merge request OpenMW/openmw!2102
 2022-07-05 19:31:37 +00:00
psi29a
cec707e994 No attack animation while blocking fix 2022-07-05 18:29:21 +00:00
psi29a
715b8497f9 Merge branch 'live_cell_ref' into 'master' 
Use descriptive names for range elements

See merge request OpenMW/openmw!2092
 2022-07-05 18:26:40 +00:00
glassmancody.info
0954597fa7 fix typo with wrong flags in particle nifloader 2022-07-05 11:00:28 -07:00
psi29a
f8f2e00eca Fix mouse clicking with sdl2 2.0.22 2022-07-05 17:44:22 +00:00
psi29a
7470f6971d Merge branch 'TisIPickles27-test' into 'master' 
[WIP] Maybe force dedicated GPU on dual-AMD machines

See merge request OpenMW/openmw!1214
 2022-07-05 15:56:02 +00:00
psi29a
33a5f27b18 Merge branch 'soft_docs' into 'master' 
Update soft effect docs

See merge request OpenMW/openmw!2090
 2022-07-05 15:51:23 +00:00
psi29a
46694a5e81 Merge branch 'coverity' into 'master' 
Coverity issues, part 2

See merge request OpenMW/openmw!2100
 2022-07-05 15:47:19 +00:00
Andrei Kortunov
38042fd7a2 Init missing variables 2022-07-05 17:47:52 +04:00
Andrei Kortunov
aed0da46a9 Check a result of dynamic_cast 2022-07-05 17:47:49 +04:00
jvoisin
f451b09f10 Merge branch 'rm_stream_include' into 'master' 
Remove redundant ostream, istream, iostream and sstream includes

See merge request OpenMW/openmw!2097
 2022-07-05 11:00:50 +00:00
Petr Mikheev
1fa25f48db Merge branch 'ci_integration_tests' into 'master' 
Run integration tests in CI

See merge request OpenMW/openmw!1995
 2022-07-05 10:22:16 +00:00
psi29a
9003e83470 Merge branch 'particle_vertex' into 'master' 
Soft enforce vertex lighting on particle systems (i.e. with exception of normal maps)

See merge request OpenMW/openmw!2098
 2022-07-05 10:15:36 +00:00
psi29a
85a8359b36 Merge branch 'only_when_necassary' into 'master' 
Conditional soft particles

See merge request OpenMW/openmw!2078
 2022-07-05 10:14:32 +00:00
glassmancody.info
7bed2208e9 only force ppl on particles with normal maps 2022-07-04 18:28:29 -07:00
elsid
bef15edf0b
Remove redundant ostream, istream, iostream and sstream includes 
* Replace by std::to_string and operator+ where possible.
* Move the code requiring to include <sstream> from .hpp to .cpp files.
 2022-07-05 01:41:28 +02:00
elsid
20c15b30de
Move getLuaType out of MWWorld::PtrBase 
This function is used only for Lua related code and don't need to be present
everywhere ptr.hpp is included.
 2022-07-05 00:53:19 +02:00
AnyOldName3
c81e94ebee Merge branch 'store_multiview' into 'master' 
Avoid calling getMultiview from ~StereoFrustumManager

See merge request OpenMW/openmw!2091
 2022-07-04 22:38:09 +00:00
elsid
4613840914
Use single implementation to check whether marker is hidden 2022-07-05 00:36:37 +02:00
elsid
c476437b6e
Mark Actors member functions as const where possible 2022-07-04 22:37:27 +02:00
elsid
ae4ec0a1d0
Convert static const to constexpr where possible 2022-07-04 22:16:38 +02:00
elsid
2ec757ab0f
Remove unnecessary member functions from Actors 2022-07-04 22:16:38 +02:00
elsid
0132b6e19c
Use range-based for loop 2022-07-04 22:16:37 +02:00
elsid
5e8df40718
Mark not changing variables as const 2022-07-04 22:16:37 +02:00
elsid
f8b8569f3b
Initialize variables on declaration 2022-07-04 21:38:26 +02:00
elsid
a05ed48a57
Move lua controls update into a separate function 2022-07-04 21:31:55 +02:00
elsid
03792eebdb
Reuse isPlayer variable instead of using operator != 2022-07-04 21:26:44 +02:00
elsid
77eaf2082f
Move head tracking update into a separate function 2022-07-04 21:26:42 +02:00
elsid
fe206c1526
Remove updateHeadTracking from member functions 2022-07-04 21:17:07 +02:00
elsid
1b117af5e1
Use descriptive names for range elements 
iter does not describe the nature of the object. Range-based for loop provides
elements of the iterator range, not iterators.
 2022-07-04 21:03:45 +02:00
elsid
782d3d9680
Avoid calling getMultiview from ~StereoFrustumManager 
Otherwise coverity complains about a function throwing exceptions called from a
destructor.
 2022-07-04 20:44:41 +02:00
elsid
7989d1645f
Run integration tests in CI 2022-07-04 20:38:29 +02:00
Abdu Sharif
eddd72be62 Remove this line 2022-07-04 18:08:08 +00:00
Abdu Sharif
ed7e68524e Update custom-shader-effects.rst 2022-07-04 17:47:50 +00: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