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
Laserlicht
2c5a1bcbb4
remove comment out line
2024-08-25 11:48:17 +02:00
Laserlicht
d9d82fc836
add horicaontal grid + fixes
2024-08-25 02:21:24 +02:00
Mike
3671079754
Added artifact description
2024-08-24 16:37:11 -07:00
Laserlicht
95d2fbc9b7
fix grid
2024-08-25 00:43:55 +02:00
Laserlicht
62790e9aad
scaling anim have problems -> use other icon
2024-08-25 00:33:36 +02:00
Laserlicht
6e33b86dcb
fix days surived
2024-08-24 23:36:01 +02:00
Tomasz Zieliński
bfe75a6a02
It is now possible to copy object settings between zones
2024-08-24 20:18:36 +02: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
Tomasz Zieliński
64fc2e5ed0
Move ObjectConfig to ObjectInfo.cpp. Preliminary version of banning object categories.
2024-08-24 15:12:22 +02: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
godric3
71ec25a4a5
make sonar happier
2024-08-24 13:34:22 +02:00
SoundSSGood
4035ab1550
added CMarketWindow::getMarketTitle()
2024-08-24 13:52:54 +03:00
SoundSSGood
0c5022cae8
Loading market modes from json
2024-08-24 11:51:57 +03:00
Laserlicht
842bb03f70
description for Disintegrate
2024-08-24 01:47:09 +02:00
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
