Ivan Savenko
6d8bc9b859
Merge pull request #4500 from MichalZr6/allow_dialogs_when_in_battle
...
Allow dialogs when in battle interface but not on the players turn
2024-08-24 16:18:20 +03:00
Ivan Savenko
51fafe66cb
Merge pull request #4485 from kaja47/opto-isinthemap
...
Optimize CMap::isInTheMap
2024-08-24 16:06:44 +03:00
Ivan Savenko
c22820f484
Merge pull request #4484 from Laserlicht/text_len
...
campaign text length
2024-08-24 16:06:31 +03:00
Ivan Savenko
3e605253db
Merge pull request #4481 from Laserlicht/fix_hota
...
fix for 8th creature
2024-08-24 16:06:12 +03:00
Ivan Savenko
9a7a01186b
Merge pull request #4477 from kdmcser/develop
...
update Chinese translation
2024-08-24 16:05:56 +03:00
MichalZr6
9daabd0710
Check battleInt->curInt instead of battleInt
2024-08-23 23:30:50 +02:00
MichalZr6
d0e0ab767c
Allow dialogs when in battle interface
...
But also it is not our turn
2024-08-23 18:03:58 +02: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
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
kdmcser
4940891384
Merge branch 'vcmi:develop' into develop
2024-08-22 21:54:41 +08: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
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
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
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
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
0901286f9d
fix
2024-08-20 20:38:38 +02:00
Laserlicht
01c14ae9ce
Merge branch 'develop' into extended_statistic
2024-08-20 20:25:16 +02:00
Ivan Savenko
85f6030c7c
Merge pull request #4318 from IvanSavenko/upscaled_render
...
Support for xBRZ upscaling filter
2024-08-20 14:23:30 +03:00
Ivan Savenko
28789bc691
Merge pull request #4462 from IvanSavenko/building_refactor
...
Town buildings refactoring
2024-08-19 19:45:21 +03:00
Ivan Savenko
16adf8415f
Add missing property to schema
2024-08-19 11:54:59 +00:00
Ivan Savenko
cf1c2d66cc
More examples in docs
2024-08-19 11:47:13 +00:00
Ivan Savenko
cc5564a7b1
Remove no longer used localization strings
2024-08-19 11:47:13 +00:00
Ivan Savenko
42902b8eb5
Update documentation, add examples
2024-08-19 11:47:13 +00:00
Ivan Savenko
6fa2bb7e91
Deprecate previously hardcoded buildings
2024-08-19 11:47:13 +00:00
Ivan Savenko
22a126cf2d
Restored replacement of town building bonuses via building upgrade
2024-08-19 11:47:13 +00:00
Ivan Savenko
2f3f3c21df
Rename town building types to more clear names
2024-08-19 11:47:13 +00:00
Ivan Savenko
abfb467f68
Cleanup old code, add compatibility for 1.5 mods
2024-08-19 11:47:13 +00:00
Ivan Savenko
01a9509ccb
Remove unused code, reduce includes
2024-08-19 11:47:13 +00:00
Ivan Savenko
f1e63792f0
Greatly simplify town buildings logic
2024-08-19 11:47:13 +00:00
Ivan Savenko
57430c101f
Extracted common properties of buildings into a shared file
2024-08-19 11:47:13 +00:00
