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

16977 Commits

Author SHA1 Message Date
Laserlicht
974a585a4e shorten german text 2024-08-23 00:55:08 +02:00
Laserlicht
463d18b92d add grid for weeks/months 2024-08-23 00:46:46 +02:00
Laserlicht
d7ee268c76 touch hovering improvements 2024-08-22 23:27:21 +02:00
Ivan Savenko
457a1bc746
Merge pull request #4494 from IvanSavenko/android_buildid_hack
Android buildid increment hack
2024-08-22 23:48:33 +03:00
Ivan Savenko
9e3c149d6d Add hack to auto-increment build ID for x64 android build 2024-08-22 20:12:42 +00:00
Andrii Danylchenko
5de5ac5eb5
Merge pull request #4492 from vcmi/fix-battle-ai
BattleAI: fix init env
2024-08-22 21:59:15 +03:00
Andrii Danylchenko
01b6828df6 BattleAI: fix init env 2024-08-22 21:20:22 +03:00
Ivan Savenko
fd73116a08
Merge pull request #4491 from IvanSavenko/fixes_157
[1.5.7] Minor fixes
2024-08-22 21:04:03 +03:00
Andrii Danylchenko
9d18a2269c
Merge pull request #4306 from vcmi/battle-ai-bait-archers
BattleAI: fix bait for archers when need to go long way
2024-08-22 19:57:57 +03:00
Ivan Savenko
2dd752bbb8 Update changelog 2024-08-22 16:42:59 +00:00
Ivan Savenko
b6cc409772 Fix excessive removal of dialogs, e.g. new week or timed events 2024-08-22 16:39:30 +00:00
Ivan Savenko
d1aa55de91 Fix rewards not rerolling correctly on reset due to cached variables 2024-08-22 16:38:53 +00:00
Ivan Savenko
33a5e9e05f
Merge pull request #4488 from IvanSavenko/release_157
Preparation for release 1.5.7
2024-08-22 17:39:52 +03:00
kdmcser
4940891384
Merge branch 'vcmi:develop' into develop 2024-08-22 21:54:41 +08:00
Ivan Savenko
427a583f1e Preparation for release 1.5.7 2024-08-22 13:27:25 +00:00
Ivan Savenko
fb37b9e08b
Merge pull request #4454 from IvanSavenko/hotfix
[1.5.X] Changes for a potential hotfix
2024-08-22 16:11:28 +03:00
K
18a69dfeb5 move CMap::isInTheMap to the header file and make it inline 2024-08-22 14:27:01 +02:00
K
3a27725fcb Optimize CMap::isInTheMap
replace x >= 0 && x < size by (unsigned)x < size

By converting signed coordinate to unsigned number, negative values became
very large positive ones, larger than every positive signed number and
therefore also bigger than the map size. As a result check against size
also implicitly checks if coordinate is negative.

Compiler cannot do this transformation automatically because it doesn't
know that map dimensions are always positive.

The change shrinks isInTheMap from 19 instructions to 11 on x86.
2024-08-22 11:39:24 +02:00
Laserlicht
c2290f5f6e fix 2024-08-21 23:01:32 +02:00
Andrii Danylchenko
ff8a745a50 BattleAI: optional simulation depth 2024-08-21 23:27:42 +03:00
Laserlicht
45fd13bdcd
mapname len 2024-08-21 22:11:16 +02:00
Laserlicht
02002ce69d
Merge branch 'develop' into resource_generation 2024-08-21 21:52:08 +02:00
Laserlicht
61af23d258
text length 2024-08-21 21:43:54 +02:00
Laserlicht
43fc741a15 cleaner 2024-08-21 21:24:06 +02:00
Andrii Danylchenko
22de88ad68 BattleAI: count wait correctly for fast creatures 2024-08-21 22:18:41 +03:00
Andrii Danylchenko
337f99942b BattleAI: remove boost for archers while moving as actual stack may be small 2024-08-21 22:18:41 +03:00
Andrii Danylchenko
bc80532f29 BattleAI: improve movement towards unreachable 2024-08-21 22:18:40 +03:00
Andrii Danylchenko
26609d7a4f BattleAI refactoring 2024-08-21 22:18:40 +03:00
Andrii Danylchenko
8cdfa26fb5 BattleAI: fix bait for archers when need to go long way 2024-08-21 22:18:40 +03:00
Andrii Danylchenko
b3fc6743d9 BattleAI: better retaliation calculation 2024-08-21 22:18:40 +03:00
Laserlicht
c36a6427c2 fix 2024-08-21 20:27:39 +02:00
Ivan Savenko
4386339354 Fix crash on rmg generation (regression from previous commit) 2024-08-21 18:19:58 +00:00
Ivan Savenko
475a20124f Fix crash on right-clicking spell component in some dialogs 2024-08-21 18:19:31 +00:00
Ivan Savenko
ff33fbd3a0
Merge pull request #4480 from IvanSavenko/update_prebuilts
Update ffmpeg
2024-08-21 15:57:50 +03:00
Ivan Savenko
2a84627fd2
Merge pull request #4444 from Laserlicht/extended_statistic
Statistics
2024-08-21 15:18:17 +03:00
Ivan Savenko
4ac1b1169a Update developers documentation to point to new prebuilts location 2024-08-21 12:14:08 +00:00
Laserlicht
e19194c3b8 fix for 8th creature 2024-08-21 00:17:25 +02:00
SoundSSGood
2e3e6b1553 market->getObjInstanceID() 2024-08-21 01:01:23 +03:00
Laserlicht
d8869a33da remove resource 2024-08-20 22:45:11 +02:00
Ivan Savenko
e70ab86995 Use .txz archive for dependencies 2024-08-20 20:42:11 +00:00
Ivan Savenko
f4547a9434 Add documentation regarding supported by vcmi formats 2024-08-20 19:23:55 +00:00
Ivan Savenko
efcf1e1ba9 Add .ogv (HD Edition) as recognized extension for video 2024-08-20 19:23:55 +00:00
Ivan Savenko
1ac63056dc Unify code for conan dependencies installation 2024-08-20 19:23:55 +00:00
Ivan Savenko
50a4e3213d Fix ffmpeg deprecation 2024-08-20 19:23:55 +00:00
Ivan Savenko
720d6076a0 Use new dependencies packages 2024-08-20 19:23:55 +00:00
Ivan Savenko
373f8526f2 Changed options of ffmpeg in conan:
- updated options to include new options added in upstream
- enabled swresample to allow audio resampling via ffmpeg instead of
custom methods
- disabled all components other than those that are needed for vcmi
- changed required version to allow newer ffmpeg versions
- added lzma as explicit dependency (used by innoextract)
2024-08-20 19:23:50 +00:00
Laserlicht
c56d667981 fix 2024-08-20 21:22:40 +02:00
Laserlicht
0901286f9d
fix 2024-08-20 20:38:38 +02:00
Laserlicht
01e55beef1
Merge branch 'develop' into resource_generation 2024-08-20 20:26:52 +02:00
Laserlicht
01c14ae9ce
Merge branch 'develop' into extended_statistic 2024-08-20 20:25:16 +02:00