1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Commit Graph

16619 Commits

Author SHA1 Message Date
godric3
0ef42a1d3d introduce modScope into ObstacleInfo 2024-08-12 13:57:27 +02:00
godric3
07a1e9b768 fix tests 2024-08-10 22:39:35 +02:00
godric3
c34956e912 introduce getModScope method toEntity class and subclasses 2024-08-10 16:08:04 +02:00
godric3
18e96171de map editor: check hero and town spells during mod assessment 2024-08-07 21:29:21 +02:00
Ivan Savenko
a4dd510735
Merge pull request #4358 from IvanSavenko/integer_divide
Add helper functions for integer division rounding
2024-08-06 18:10:03 +03:00
Ivan Savenko
3b6ff46d2b
Merge pull request #4360 from IvanSavenko/terminate_handler
Enabled terminate handler and call stack writing on all platforms
2024-08-06 18:09:51 +03:00
Ivan Savenko
97357071b0
Merge pull request #4380 from SoundSSGood/moveChildForeground
Fixed graphical artifacts
2024-08-06 18:09:38 +03:00
Ivan Savenko
75cc5dbed9
Merge pull request #4387 from altiereslima/develop
Update Portuguese Translation
2024-08-06 18:09:19 +03:00
Andrii Danylchenko
d751c3e1a3
Merge pull request #4362 from Alexander-Wilms/googletest-update
Update googletest submodule
2024-08-06 18:05:54 +03:00
Andrii Danylchenko
f34ffcc727
Merge pull request #4388 from kaja47/fix-crash-defense
fix crash when my city without hero is attacked
2024-08-06 17:50:04 +03:00
Ivan Savenko
c1c04b3eb4
Merge pull request #4401 from vcmi/dydzio0614-patch-1
Fix github download counters
2024-08-05 20:12:17 +03:00
Dydzio
78542ebe31
Fix github download counters 2024-08-05 18:40:56 +02:00
Ivan Savenko
b7391f49f6 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-08-05 10:36:10 +00:00
Ivan Savenko
5313b5c82c
Merge pull request #4392 from IvanSavenko/fix_regression
Fix regressions in 1.5.6
2024-08-04 22:07:25 +03:00
altiereslima
2813f5cccc Update portuguese.json 2024-08-04 12:13:11 -03:00
K
70f3397a35 fix crash when my city without hero is attacked 2024-08-04 16:49:53 +02:00
altiereslima
ae652f8e59 Update portuguese.json 2024-08-04 11:16:17 -03:00
Ivan Savenko
edad888915 Fixed non-scrollable invite to private room widget 2024-08-04 13:58:20 +00:00
Ivan Savenko
dde5cea601 Fix activation of world view on end turn in multiplayer 2024-08-04 13:19:12 +00:00
Ivan Savenko
e8c3252214 Do not auto-remove dialogs such as new week 2024-08-04 13:14:28 +00:00
Ivan Savenko
d36f90e6b6 Fixed heading in 1.5.6 changelog 2024-08-04 13:12:41 +00:00
Ivan Savenko
500e9a8645 Added downloads counter for 1.5.6 2024-08-04 13:12:30 +00:00
SoundSSGood
34b824f9ea moveChildForeground 2024-08-03 17:04:27 +03:00
Ivan Savenko
81e6207df0 Add helper functions for integer division rounding
Added set of functions that perform integer division with different
rounding modes:
- divideAndCeil - rounds up to next integer
- divideAndRound - rounds to nearest integer
- divideAndFloor - rounds to previous integer (equivalent to default
division)

Intended for use in library, where usage of floating point might lead to
desync in multiplayer games.

Replaced some cases that I knew of, including recent handicap PR
2024-08-03 13:52:14 +00:00
Ivan Savenko
6af0edcf90
Merge pull request #4366 from vcmi/beta
Merge beta -> master
2024-08-03 16:35:04 +03:00
Ivan Savenko
c8b48318b7
Merge pull request #4365 from Laserlicht/docs_dev
changelog - hint for newest version
2024-08-03 16:16:05 +03:00
Laserlicht
68f8566082
headings fix 2024-08-03 12:27:24 +02:00
Laserlicht
55fd873a44
hint for newest version 2024-08-03 12:24:01 +02:00
Ivan Savenko
1ccfa6072f
Merge pull request #4357 from IvanSavenko/changelog_156
Changelog for 1.5.6
2024-08-03 12:49:06 +03:00
Ivan Savenko
a4e4ec565b Changelog for 1.5.6 2024-08-02 20:16:04 +00:00
Ivan Savenko
7bcd6b1b0d
Merge pull request #4363 from IvanSavenko/fixes_156
Fixes for 1.5.6 release
2024-08-02 21:23:27 +03:00
Ivan Savenko
13b2008f79 Enabled terminate handler and call stack writing on all platforms
Attempt to get a bit more debug info from crashes. VCMI will now:
- use c++ terminate handler on any platform in release builds
- attempt to write call stack to log file using boost::callstack

Since I use std::set_terminate this will only affect c++ exceptions, e.g.
std::runtime_error and will not affect OS signals, e.g. SIGSEGV. Handling
signals is OS-specific and has a lot of limitations that I don't want to
investigate. Besides - most of our crashes are now caused by c++
exceptions.

Haven't tested on other platforms, but should at the very least write
exception information (`e.what()`) for all exceptions and function names
for methods exported from dll's (libvcmi.so & AI's). Possibly more, if
debug information is present.
2024-08-02 17:59:56 +00:00
Ivan Savenko
5023e08ae8 Fix crash on testing for hero faction before deserializing hero type 2024-08-02 16:00:17 +00:00
Ivan Savenko
13108849ca Try to fix crash on transferring component of a composite artifact 2024-08-02 16:00:17 +00:00
Ivan Savenko
c9b6b17422 Add more logging for weird crash on game start 2024-08-02 16:00:17 +00:00
Ivan Savenko
0ac1ef077d Workaround for hota witch hut preview 2024-08-02 16:00:07 +00:00
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
Ivan Savenko
257fb8c70c
Merge pull request #4327 from Laserlicht/handicap
Handicap / resource transfer
2024-08-01 23:11:22 +03:00
Laserlicht
4f0c3a3608
Merge branch 'develop' into handicap 2024-08-01 21:39:40 +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