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

17405 Commits

Author SHA1 Message Date
Laserlicht
746bba0ade docs 2024-08-24 00:34:33 +02:00
Laserlicht
9c4d4e89d6 disintegrate 2024-08-24 00:29:36 +02: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
Ivan Savenko
f1be5b0e93
Merge pull request #4499 from vcmi/beta
Merge beta -> master
2024-08-23 18:33:01 +03:00
Ivan Savenko
f2592c20db
Merge pull request #4497 from IvanSavenko/beta_fix
Add missing changes from master branch to beta
2024-08-23 17:15:11 +03:00
Ivan Savenko
45558552d6 Merge 'vcmi/beta' into beta_fix 2024-08-23 13:18:09 +00:00
MichalZr6
0be5a1a2ad Code review followup with additional refactor
Changes following review
2024-08-23 10:43:48 +02:00
MichalZr6
0d5a9b8e3b Refactor for previous fix in CSpellHandler 2024-08-23 09:43:41 +02:00
MichalZr6
5684db1953 Addressed review feedback
Additional changes after incorporating PlayerColor in `Validator::Validate()`
2024-08-23 09:43:40 +02:00
MichalZr6
a82ce2f96a Fix negative QColor values 2024-08-23 09:43:40 +02:00
MichalZr6
568a792f88 Refactor containers names in CObjectClassesHandler 2024-08-23 09:43:40 +02:00
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
godric3
cda66c4196 attempt to fix hero placeholder while reading h3m 2024-08-22 17:09:23 +02:00
godric3
786be6f253 map-editor: add hero placeholder with heroType defined to reservedCampaignHeroes on map save 2024-08-22 16:53:43 +02:00
godric3
355bf4ec3e read reservedCampaignHeroes from vmaps 2024-08-22 16:52:35 +02: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
Tomasz Zieliński
85ee859b6e First version that works - banning objects is possible 2024-08-21 20:16:41 +02:00
Simeon Manolov
d05adfc5d5
Merge branch 'develop' into split-client+develop 2024-08-21 17:40:37 +03:00