1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

10561 Commits

Author SHA1 Message Date
Ivan Savenko
4919550a19 Show a message that battle intro can be skipped 2023-03-20 21:58:32 +02:00
Ivan Savenko
9289646dab
Merge pull request #1722 from rilian-la-te/fix-first-aid
vcmi: fix first aid regression
2023-03-20 21:49:53 +02:00
Ivan Savenko
fd068f89c5
Merge pull request #1712 from rilian-la-te/fix-oob-infobar
Fix #1688 again
2023-03-20 21:41:19 +02:00
Ivan Savenko
2864a04bda Minor refactoring 2023-03-20 20:19:05 +02:00
Ivan Savenko
31b718898a Fix playback of shooter animations at max speed 2023-03-20 20:19:05 +02:00
Ivan Savenko
688b8db3eb Removed delays due to thread waits from battle animations 2023-03-20 20:19:05 +02:00
Adriankhl
8d549bf030 Fix town portal query when it calls level up query 2023-03-20 16:08:18 +01:00
Andrey Filipenkov
147633bd9d compute movement cost using PathNodeInfo layer info when possible 2023-03-20 11:35:20 +03:00
Andrey Filipenkov
a0cd69e944 Slight refactoring of CGHeroInstance::movementPointsAfterEmbark() 2023-03-20 11:35:20 +03:00
Andrey Filipenkov
aae9e70771 remove duplicate call
already performed in CPathfinderHelper constructor
2023-03-20 11:35:19 +03:00
Andrey Filipenkov
8f638e7ca6 [editor] fix Player Settings crash when random town is added to a map
fixes #1714
2023-03-20 11:35:19 +03:00
Andrey Filipenkov
3602645a30 improve iterating over EPathfindingLayer 2023-03-20 11:35:19 +03:00
Andrey Filipenkov
c0c19557af fix method documentation 2023-03-20 11:35:19 +03:00
Andrey Filipenkov
8f843d0bff fix typos 2023-03-20 11:35:19 +03:00
Andrey Filipenkov
68f5c1de79 improve variable names in CPathfinderHelper::getNeighbours() 2023-03-20 11:35:19 +03:00
Andrey Filipenkov
bfb0dc26d5 fix movement cost on roads 2023-03-20 11:35:19 +03:00
Andrey Filipenkov
0c7b5ac793 fix movement cost on Favorable Winds 2023-03-20 11:35:19 +03:00
Andrey Filipenkov
3fbdc3b198 improve code that checks last possible tile 2023-03-20 11:35:18 +03:00
Andrii Danylchenko
23fa7c4a9b
Merge pull request #1720 from vcmi/fix_small_lakes_clean
Don't place shipyard or boats at very small lakes
2023-03-19 19:52:22 +02:00
Andrii Danylchenko
aede3da74e
Merge pull request #1721 from vcmi/fix_rmg_infinite_loop
Fix rmg infinite loop
2023-03-19 19:46:28 +02:00
Konstantin
895572df02 vcmi: fix first aid regression 2023-03-19 19:20:08 +03:00
DjWarmonger
15047a4469
Merge pull request #1718 from vcmi/fix_shipyard_border
Fix shipyard border calculation for RMG
2023-03-19 16:05:24 +01:00
Tomasz Zieliński
9e206dbbc7 Forgot this one 2023-03-19 09:51:37 +01:00
Tomasz Zieliński
f52c465322 Allow zones to inherit properties recursively, in any order. 2023-03-19 09:27:05 +01:00
Andrey Filipenkov
21463f1c0e fix movement cost with Fly 2023-03-19 11:26:55 +03:00
Andrey Filipenkov
43e89523a9
Merge pull request #1716 from rilian-la-te/tw-fix
TotalValue: fix typo
2023-03-19 11:25:48 +03:00
Tomasz Zieliński
dd3803b111 Don't place shipyard or boats at very small lakes
(cherry picked from commit 1d2913bea0)
2023-03-18 22:05:25 +01:00
Tomasz Zieliński
e1ced317a1 Few tweaks for boat placement to keep distance between it and other objects, especially guards. 2023-03-18 21:59:23 +01:00
Tomasz Zieliński
1dc96d6844 Fix shipyard border calculation for RMG 2023-03-18 20:12:36 +01:00
Konstantin
54b1b49f5a totalValue: fix overflow
Fixes #1715
2023-03-18 22:08:21 +03:00
Tomasz Zieliński
23a5a32756 Add fallback for empty terrain types. Still it's a workaround and does not solve the root cause. 2023-03-18 17:00:50 +01:00
Andrii Danylchenko
d9fac6d6fb
Merge pull request #1713 from vcmi/fix_weekly_growth
Fix all stacks being capped at 10 units
2023-03-18 15:09:58 +02:00
Konstantin
b07f4fb383 TotalValue: fix typo 2023-03-18 15:45:32 +03:00
Konstantin
5462a92930 Fix #1688 again 2023-03-18 01:19:41 +03:00
Tomasz Zieliński
eabcbfc25a Fix all stacks being capped at 10 units 2023-03-17 22:32:05 +01:00
Tomasz Zieliński
f57c275603 Merge remote-tracking branch 'origin/develop' into object_placement_tweaks 2023-03-17 21:47:16 +01:00
Ivan Savenko
f24ca6fbcf
Merge pull request #1699 from rilian-la-te/fix-ignissa
Rewardable: always initialize numbers
2023-03-17 22:15:28 +02:00
Ivan Savenko
dfd6998a9e
Merge pull request #1702 from IvanSavenko/disable_client_state_load
Disable loading of client save game
2023-03-17 22:15:18 +02:00
Ivan Savenko
e7f8ef7627
Merge pull request #1703 from Adriankhl/fix_auto_fighting
Prevent crashing when pressing auto-combat button on enemy turn
2023-03-17 22:15:11 +02:00
Ivan Savenko
95d56d3f2a
Merge pull request #1705 from rilian-la-te/convert-scouting
HeroBonus: add scouting to converter
2023-03-17 22:14:54 +02:00
Ivan Savenko
bb331409cc
Merge pull request #1707 from rilian-la-te/fix-commander-jousting
Fix commander jousting
2023-03-17 22:14:46 +02:00
Konstantin
a1f3dd31e8 fix commander jousting 2023-03-17 21:03:47 +03:00
Konstantin
6de042657c fix Ignissa bug the old way 2023-03-17 20:09:18 +03:00
Konstantin
b4fe7908a4 HeroBonus: add scouting to converter 2023-03-17 18:50:57 +03:00
Adriankhl
4718396f5f Prevent crashing when pressing auto-combat button on enemy turn 2023-03-17 15:40:14 +01:00
Ivan Savenko
a3059033f2 Fixes broken client state, e.g. movement. Effectively reverts #1663 2023-03-17 16:00:47 +02:00
Konstantin
bbbbfe00f0 Modernize resourceSet 2023-03-17 02:26:54 +03:00
Ivan Savenko
02b5edd32d
Merge pull request #1653 from IvanSavenko/changelog_update
Changelog update: Added changes from PR's made in February
2023-03-16 21:48:59 +02:00
Ivan Savenko
8a6c51a9e6 Fix uninitialized pointer dereference 2023-03-16 20:48:37 +02:00
Ivan Savenko
e64aed371b Updated changelog to include new changes 2023-03-16 20:48:18 +02:00