Ivan Savenko
897bc65e64
Merge pull request #4508 from kaja47/dead-code-must-die
...
remove never used code in CBonusSystemNode
2024-08-26 19:11:03 +03:00
Ivan Savenko
e65eaf0e06
Merge pull request #4506 from mikeiit/add_missisng_stack_artifact_description
...
Added missing stack artifact description
2024-08-26 19:10:48 +03:00
Ivan Savenko
3d39963a1c
Merge branch 'master' into 'develop'
2024-08-26 14:01:00 +00:00
Ivan Savenko
a3e33215e3
Merge pull request #4510 from vcmi/beta
...
Merge beta -> master
2024-08-26 00:27:47 +03:00
Ivan Savenko
6fbfcef99e
Merge pull request #4509 from IvanSavenko/update_157
...
Cherry-pick spellcasting fix and bump release date
2024-08-25 23:10:43 +03:00
MichalZr6
2a6525c5ef
Check battleInt->curInt instead of battleInt
2024-08-25 19:43:21 +00:00
MichalZr6
619b35ab33
Allow dialogs when in battle interface
...
But also it is not our turn
2024-08-25 19:43:14 +00:00
Ivan Savenko
a7d4df9c33
Update release date to monday
2024-08-25 19:42:25 +00:00
K
462c79e190
remove never used code in CBonusSystemNode
...
Method CBonusSystemNode::getAllBonuses have 'root' parameter which is never
set to anythig else than nullptr. This patch removes the parameter and all
code that depends on it as preparatory work for further bonus system
optimization.
2024-08-25 14:15:21 +02:00
Mike
3671079754
Added artifact description
2024-08-24 16:37:11 -07:00
Ivan Savenko
a819c3fc29
Merge pull request #4482 from MichalZr6/mapeditor_fixes
...
Mapeditor refactor, fixes and additional validation checks
2024-08-24 16:18:53 +03:00
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
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
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
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
