1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

16767 Commits

Author SHA1 Message Date
Ivan Savenko
afbb42ff33
Merge pull request #4356 from IvanSavenko/version_bump_156
Version bump to 1.5.6
2024-08-02 18:18:58 +03:00
Alexander Wilms
6678aafbbb Update googletest submodule
Fixes the following warning, occurring during the linux-clang-test CI builds:

[824/832] Building CXX object test/googletest/googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.o
In file included from /home/runner/work/vcmi/vcmi/test/googletest/googletest/src/gtest-all.cc:38:
In file included from /home/runner/work/vcmi/vcmi/test/googletest/googletest/include/gtest/gtest.h:65:
In file included from /home/runner/work/vcmi/vcmi/test/googletest/googletest/include/gtest/gtest-death-test.h:43:
In file included from /home/runner/work/vcmi/vcmi/test/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h:47:
In file included from /home/runner/work/vcmi/vcmi/test/googletest/googletest/include/gtest/gtest-matchers.h:48:
/home/runner/work/vcmi/vcmi/test/googletest/googletest/include/gtest/gtest-printers.h:532:9: warning: implicit conversion from 'int32_t' (aka 'int') to 'float' may lose precision [-Wimplicit-int-float-conversion]
  532 |     if (static_cast<int32_t>(val * mulfor6 + 0.5) / mulfor6 == val) return 6;
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~
/home/runner/work/vcmi/vcmi/test/googletest/googletest/include/gtest/gtest-printers.h:551:17: note: in instantiation of function template specialization 'testing::internal::AppropriateResolution<float>' requested here
  551 |   os->precision(AppropriateResolution(f));
      |                 ^
/home/runner/work/vcmi/vcmi/test/googletest/googletest/include/gtest/gtest-printers.h:544:9: warning: implicit conversion from 'int32_t' (aka 'int') to 'float' may lose precision [-Wimplicit-int-float-conversion]
  544 |     if (static_cast<int32_t>(val / divfor6 + 0.5) * divfor6 == val) return 6;
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~
2 warnings generated.
2024-08-02 15:09:48 +00:00
Ivan Savenko
4acfa38d63
Merge pull request #4355 from IvanSavenko/mp_fixes
Fix infinitely updating simultaneous turns slider
2024-08-02 18:05:04 +03:00
Ivan Savenko
8ce6bcdf3b Right-clicking dwellings will now show recruitable creatures (but not
their number) for all players
2024-08-02 15:03:25 +00:00
Ivan Savenko
46669e78e8 Fix possible crash on deletion of adventureInt after GH on shutdown 2024-08-02 15:02:37 +00:00
Ivan Savenko
16b28c28e4 Version bump to 1.5.6 2024-08-02 15:00:16 +00:00
Ivan Savenko
2c42737b28 Fix infinitely updating simultaneous turns slider 2024-08-02 12:20:14 +00:00
Laserlicht
86477c7b04 refactoring + values added 2024-08-02 01:18:39 +02:00
Laserlicht
33b2633775 refectoring: remove statsHLP 2024-08-02 00:04:41 +02:00
Laserlicht
f695f7038e cleanup 2024-08-01 23:56:06 +02:00
Laserlicht
06209d2556
Merge branch 'develop' into statistic 2024-08-01 23:37:45 +02:00
Laserlicht
52ae6a56f1 fix 2024-08-01 23:35:07 +02:00
godric3
e782d3984f fix some sonarcloud issues 2024-08-01 23:31:06 +02:00
Laserlicht
2979bf1976 visitedRatio 2024-08-01 23:21:41 +02:00
Laserlicht
380d5bb05b refactoring & expanding 2024-08-01 22:36:32 +02:00
Laserlicht
6f604444c6
fix 2024-08-01 22:36:11 +02:00
godric3
27f83449f2 PR review fixes:
- change return of `getBuildingVariantsFromModel` to `QVariantList`
- change while to do-while where it makes sense
- moved constants outside of methods
- made building and resources name non editable
2024-08-01 22:36:01 +02:00
Ivan Savenko
257fb8c70c
Merge pull request #4327 from Laserlicht/handicap
Handicap / resource transfer
2024-08-01 23:11:22 +03:00
Laserlicht
405bc09780
Update client/battle/BattleInterfaceClasses.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-08-01 21:42:32 +02:00
Laserlicht
4f0c3a3608
Merge branch 'develop' into handicap 2024-08-01 21:39:40 +02:00
Laserlicht
490f1bfee6 rework 2024-08-01 21:36:00 +02:00
Laserlicht
fb171ab3a2 statisic basic 2024-08-01 21:36:00 +02:00
Ivan Savenko
b7b25bffd2
Merge pull request #4347 from kaja47/opto
little optimization in MapRenderer
2024-08-01 21:18:44 +03:00
Ivan Savenko
9f7abfe6e9
Merge pull request #4346 from Laserlicht/mod_comp
[1.5.6?] online lobby - mod compatibility improvements
2024-08-01 21:18:30 +03:00
Ivan Savenko
92902d3327
Merge pull request #4345 from Laserlicht/text_sizes
[1.5.6?] limit text sizes in online lobby
2024-08-01 21:18:16 +03:00
Ivan Savenko
8d9f690ae4
Merge pull request #4340 from IvanSavenko/mp_fixes
[1.5.6?] Fixes for issues with multiplayer
2024-08-01 21:17:27 +03:00
Ivan Savenko
88eff2609b
Merge pull request #4332 from Laserlicht/campaign_highscores
fix campaign highscores
2024-08-01 21:16:50 +03:00
K
07e2ec8474 little optimization in MapRenderer
When we replace static const std::vector by std::array the compiler
generates much shorter and nicer binary which doesn't waste time
initializing data structure during runtime.
2024-07-31 22:54:44 +02:00
Laserlicht
12af016eac more colors for status 2024-07-31 22:27:15 +02:00
Laserlicht
0cc743f7ca
mod compatibility improvements 2024-07-31 22:10:37 +02:00
Laserlicht
0d1f744ba4
limit text sizes 2024-07-31 21:40:49 +02:00
Ivan Savenko
7fe9c473b4
Merge pull request #4339 from IvanSavenko/artifact_crash_fix
Fixed crash on deserialization of new artifacts (and possibly some other objects)
2024-07-30 13:16:31 +03:00
Tomasz Zieliński
4413f03276 Cleanup 2024-07-30 08:50:33 +02:00
Tomasz Zieliński
a7fa3c7d8b Ignore new connections for zone placement. 2024-07-30 05:07:05 +02:00
Laserlicht
a8fe8cbcf0 adjust text; increase gold input size 2024-07-29 23:48:00 +02:00
Laserlicht
f7376b8fd3
Merge branch 'vcmi:develop' into handicap 2024-07-29 23:10:20 +02:00
Laserlicht
48173ebfbf fix uninitialized var 2024-07-29 23:05:55 +02:00
Laserlicht
3e5df61946 code review 2024-07-29 22:54:42 +02:00
Tomasz Zieliński
d10711928f Allow connecting zone to itself (always through the portal) 2024-07-29 21:56:07 +02:00
Laserlicht
939dd62491
change variable name 2024-07-29 20:43:41 +02:00
Tomasz Zieliński
f4f416eb16 Add RMG option "forcePortal" 2024-07-29 20:36:23 +02:00
Ivan Savenko
48c92711f2 Fixed deserialization of new artifacts (and possibly some other objects)
Was broken in my previous PR, since pointer graph serialization was
enabled by default, leading to deserializationFix triggering on netpack
apply.

Cleaned up / clarified code
2024-07-29 18:19:15 +00:00
Ivan Savenko
789e370950 Add compatibility for old vcmi maps 2024-07-29 17:13:31 +00:00
Ivan Savenko
15f37f8c4b Fix possible crash on invalid SPELL_LIKE_ATTACK ability 2024-07-29 17:13:31 +00:00
Ivan Savenko
5f0e6f7ce1 Close all dialogs on start of new turn in MP 2024-07-29 17:13:31 +00:00
Ivan Savenko
434a2fb0fb Explicitly specify to use ranged or melee attack for damage estimation 2024-07-29 17:13:31 +00:00
Ivan Savenko
87b5f955d1 Fix some shortcuts not active during enemy turn in multiplayer 2024-07-29 17:13:31 +00:00
Ivan Savenko
74fea5109b Show non-learnable spells from rewardable object as greyed-out 2024-07-29 17:13:31 +00:00
Ivan Savenko
f9348fc84a Do not hide spells from reward if hero can't learn them 2024-07-29 17:13:31 +00:00
Ivan Savenko
b6c22b2053 Fix typo 2024-07-29 17:13:31 +00:00