Commit Graph

25950 Commits (05d349e4a760f453a61c5fe6e054971c45a457ca)
 

Author SHA1 Message Date
Matjaž Lamut 05d349e4a7 Source svg file used to generate OpenMW-CS icons. 3 years ago
psi29a 56939b478e Merge branch 'windowing-system-cleanup' into 'master'
sdlcursormanager: Clarify ANDROID check

See merge request OpenMW/openmw!556
3 years ago
Petr Mikheev 200ccfab69 Merge branch 'Allow-Zoom-levels-on-the-World-Map' into 'master'
Allow Zoom levels on the World Map

See merge request OpenMW/openmw!275
3 years ago
Alexei Dobrohotov 41a10a7007 Merge branch 'd'oh' into 'master'
Update AABB also in sync cases, that was broken in !778

See merge request OpenMW/openmw!1053
3 years ago
fredzio 7145ef4ce0 Update AABB also in sync cases 3 years ago
Petr Mikheev e371831086 Merge branch 'esmstore_infix' into 'master'
Use prefix increment for iterators in esmstore.cpp

See merge request OpenMW/openmw!1041
3 years ago
Cédric Mocquillon 1051745f29 [Launcher] Add new setting 'allow zooming' to advanced tab in the launcher 3 years ago
CedricMocquillon a6f9e7274f Update changelog 3 years ago
CedricMocquillon 9fee9dbc9c [Global map] Regroup markers when the zoom out 3 years ago
CedricMocquillon 18f5853279 [Global <-> Local] Auto switch between local and global map when zoom in/out 3 years ago
CedricMocquillon 8c87defddf [Local map] Use the distance view in the local map 3 years ago
CedricMocquillon ed04ebe9ff [Local map] Allow zoom on local map 3 years ago
CedricMocquillon 9fadbd5b7a [Global map] Allow zoom on global map 3 years ago
Cédric Mocquillon 3373afcc83 [Settings] Set values 3 years ago
CedricMocquillon 99cd4b6742 [Refactoring] Several refactorings:
[Refactoring] Add marker size method instead of using magic constant

[Refactoring] Simplify worldPosToImageSpace and cellTopLeftCornerToImageSpace usage

[Refactoring] Add a missing 'f' to specify the float type

[Refactoring] Make cellTopLeftCornerToImageSpace more homogenous with worldPosToImageSpace

[Refactoring] Extract createmakrercoords method

[Refactoring] Use worldPosToImageSpace instead of cellTopLeftCornerToImageSpace
Remove cellTopLeftCornerToImageSpace as it is not used anymore
Remove getCellSize as it is not used anymore

[Refactoring] Extract new method createMarker

[Refactoring] Extract new method getMarkerCoordinates

[Refactoring] Extract new method getPosition

[Refactoring] Extract new method centerView

[Refactoring] Extract new method createDoorMarker

[Refactoring] Simplify for loop

[Refactoring] Make the test before the loop
3 years ago
Evil Eye 3a7fc04535 Merge branch 'master' into 'master'
Fix #6174

Closes #6174

See merge request OpenMW/openmw!1050
3 years ago
Abdu Sharif 216d91837f Fix #6174 3 years ago
psi29a b45e1d1f34 Merge branch 'OpenCS-jump-to-modified' into 'master'
OpenCS - Jump To Modified

See merge request OpenMW/openmw!1047
3 years ago
cc9cii 33dcd7585a OpenCS - Jump To Modified 3 years ago
psi29a 2eea590762 Merge branch 'spawn_fix' into 'master'
Fix #6173

Closes #6173

See merge request OpenMW/openmw!1046
3 years ago
fredzio f348b70733 Set mCanWaterWalk and mOnGround when adding Actor to the scene.
mCanWaterWalk was set to false and updated during next frame's simulation
mOnGround is set to true but then was updated as part of the scene
loading logic.
3 years ago
Petr Mikheev ec79f26320 Merge branch 'minor' into 'master'
Minor code cleanup

See merge request OpenMW/openmw!1038
3 years ago
Petr Mikheev 54f901ff4d Merge branch 'const_quat' into 'master'
Use a const-ref for an osg::Quat

See merge request OpenMW/openmw!1039
3 years ago
jvoisin 73c20be29a Use prefix increment for iterators in esmstore.cpp
See https://pvs-studio.com/en/docs/warnings/v803/
for the rationale.
3 years ago
jvoisin 74fab99b89 Use a const-ref for an osg::Quat
Since an osg::Quat contains at least 4 floats,
it should be worth it to use a const-ref instead
of passing it by value.
3 years ago
jvoisin f86ddef4db Minor code cleanup 3 years ago
psi29a 469cc44ef7 Merge branch 'tweaks' into 'master'
Change settings for async physics

See merge request OpenMW/openmw!778
3 years ago
psi29a 59c7e9f7c4 Merge branch 'infinite_splash' into 'master'
Fail on invalid water levels

Closes #6051

See merge request OpenMW/openmw!1034
3 years ago
Evil Eye 5f84494046 Fail on invalid water levels 3 years ago
psi29a 82eb0c6a7a Merge branch 'esmreader_log' into 'master'
Improve a bit two esmreader logging call

See merge request OpenMW/openmw!1037
3 years ago
jvoisin 7b32458aec Improve a bit two esmreader logging call 3 years ago
psi29a eda9171dca Merge branch 'coverity_boolapha' into 'master'
Add a std::noboolalpha to a std::boolalpha

See merge request OpenMW/openmw!1036
3 years ago
jvoisin 5e3f000b66 Add a std::noboolalpha to a std::boolalpha 3 years ago
psi29a c264c307a4 Merge branch 'fix_gcc_7_build' into 'master'
Fix build for gcc 7

See merge request OpenMW/openmw!1035
4 years ago
elsid d2b935684d
Add missing include 4 years ago
psi29a 1c4ccb6d66 Merge branch 'master' into 'master'
Added checks for paralysis, knocked down, and death when picking up items from inventory. Fixes #6165

Closes #6165

See merge request OpenMW/openmw!1031
4 years ago
Nuri 36657698fb Added checks for paralysis, knocked down, and death when picking up items from inventory. Fixes #6165 4 years ago
psi29a cc642b5335 Merge branch 'slimfast' into 'master'
Reduce size of physics objects by 1/3

See merge request OpenMW/openmw!1024
4 years ago
psi29a 7c246b28e7 Merge branch 'fix-iterator-badness' into 'master'
Actually increment iterators to be erased.

Closes #6163

See merge request OpenMW/openmw!1027
4 years ago
Alexei Dobrohotov e5f96ab4ae Merge branch 'lol_so_random' into 'master'
Set the ptr's custom data before filling the store so leveled lists have access to the level

See merge request OpenMW/openmw!1028
4 years ago
Evil Eye b95cf4fd00 Set the ptr's custom data before filling the store so leveled lists have access to the level 4 years ago
jvoisin e5dc8e1ec9 Merge branch 'fix_ub' into 'master'
Fix UB: reference binding to misaligned address in Lua tests

See merge request OpenMW/openmw!1025
4 years ago
AnyOldName3 5ec2ddb4a0 Actually increment iterators to be erased. 4 years ago
jvoisin e92fb245c6 Merge branch 'coverity_meh' into 'master'
Hardcode coverity targets for now

See merge request OpenMW/openmw!1026
4 years ago
jvoisin d4e149409f Hardcode coverity targets for now 4 years ago
elsid f92843e3d2
Fix UB: reference binding to misaligned address in Lua tests
/home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:166:34: runtime error: reference binding to misaligned address 0x562ea892076c for type 'const struct TestStruct1', which requires 8 byte alignment
0x562ea892076c: note: pointer points here
  00 74 73 31 00 00 00 00  00 00 f8 3f 00 00 00 00  00 00 04 40 21 79 4b 08  00 00 00 74 65 73 74 5f
              ^
    #0 0x562ea6462b8e in deserialize /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:166
    #1 0x562ea68b7402 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:172
    #2 0x562ea68b7bf6 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:204
    #3 0x562ea68b86ea in LuaUtil::deserialize(sol::state&, std::basic_string_view<char, std::char_traits<char> >, LuaUtil::UserdataSerializer const*) /home/elsid/dev/openmw/components/lua/serialization.cpp:251
    #4 0x562ea6464d96 in TestBody /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:197
    #5 0x562ea6d9dac6 in void testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #6 0x562ea6d9dac6 in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #7 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2682
    #8 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2672
    #9 0x562ea6d93024 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2861
    #10 0x562ea6d93728 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2834
    #11 0x562ea6d93728 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:3015
    #12 0x562ea6d94142 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2994
    #13 0x562ea6d94142 in testing::internal::UnitTestImpl::RunAllTests() /home/elsid/dev/googletest/googletest/src/gtest.cc:5855
    #14 0x562ea6d9e096 in bool testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #15 0x562ea6d9e096 in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #16 0x562ea6d93140 in testing::UnitTest::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:5438
    #17 0x562ea5d3fdc6 in RUN_ALL_TESTS() /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:2490
    #18 0x562ea5d3fc6f in main /home/elsid/dev/openmw/apps/openmw_test_suite/openmw_test_suite.cpp:11
    #19 0x7fe3938d0b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
    #20 0x562ea5d3fb7d in _start (/home/elsid/dev/openmw/build/gcc/ubsan/openmw_test_suite+0x173eb7d)

/home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:176:34: runtime error: reference binding to misaligned address 0x562ea892078f for type 'const struct TestStruct2', which requires 4 byte alignment
0x562ea892078f: note: pointer points here
 75 63 74 32 04  00 00 00 03 00 00 00 04  00 6e 64 69 74 69 6f 6e  73 00 73 68 61 70 65 00  51 00 00
             ^
    #0 0x562ea6462df9 in deserialize /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:176
    #1 0x562ea68b7402 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:172
    #2 0x562ea68b7bf6 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:204
    #3 0x562ea68b86ea in LuaUtil::deserialize(sol::state&, std::basic_string_view<char, std::char_traits<char> >, LuaUtil::UserdataSerializer const*) /home/elsid/dev/openmw/components/lua/serialization.cpp:251
    #4 0x562ea6464d96 in TestBody /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:197
    #5 0x562ea6d9dac6 in void testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #6 0x562ea6d9dac6 in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #7 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2682
    #8 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2672
    #9 0x562ea6d93024 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2861
    #10 0x562ea6d93728 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2834
    #11 0x562ea6d93728 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:3015
    #12 0x562ea6d94142 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2994
    #13 0x562ea6d94142 in testing::internal::UnitTestImpl::RunAllTests() /home/elsid/dev/googletest/googletest/src/gtest.cc:5855
    #14 0x562ea6d9e096 in bool testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #15 0x562ea6d9e096 in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #16 0x562ea6d93140 in testing::UnitTest::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:5438
    #17 0x562ea5d3fdc6 in RUN_ALL_TESTS() /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:2490
    #18 0x562ea5d3fc6f in main /home/elsid/dev/openmw/apps/openmw_test_suite/openmw_test_suite.cpp:11
    #19 0x7fe3938d0b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
    #20 0x562ea5d3fb7d in _start (/home/elsid/dev/openmw/build/gcc/ubsan/openmw_test_suite+0x173eb7d)
4 years ago
fredzio 44f822da56 Do not store a btTransform into Projectile class: reduce its size by 112 bytes 4 years ago
fredzio f02d01ef0c Do not store btTransform into Object class: reduce its size by 104 bytes 4 years ago
fredzio 62ef708910 Do not store a btTransform into Actor class: reduce its size by 128 bytes 4 years ago
psi29a d30f0f11b4 Merge branch 'macos_luajit' into 'master'
get openmw building with LuaJIT on macos

Closes #5990

See merge request OpenMW/openmw!1021
4 years ago