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

14174 Commits

Author SHA1 Message Date
Tomasz Zieliński
b0f0e9caa8 Merge remote-tracking branch 'origin/beta' into random_prison_distributor 2023-12-24 06:46:18 +01:00
Ivan Savenko
08a4b67cd7
Merge pull request #3372 from IvanSavenko/bugfixing
[1.4.2] Bugfixing
2023-12-23 22:05:39 +02:00
Ivan Savenko
056639ba67
Merge pull request #3371 from dydzio0614/creatures-transfer-fix
Fix crash due to incorrect logic on transferring last creature
2023-12-23 21:55:52 +02:00
Ivan Savenko
027dd635ef
Merge pull request #3370 from vcmi/ban_armageddons_blade
Ban Armageddon's Blade and Vial of Dragon Blood
2023-12-23 21:54:59 +02:00
Ivan Savenko
4220bb32a7
Merge pull request #3364 from IvanSavenko/scholar_fix
Fix refusable Scholar
2023-12-23 21:54:13 +02:00
Ivan Savenko
a08546e964 Correctly update hero list on reordering via radial menu 2023-12-23 18:13:55 +02:00
Ivan Savenko
50536e28da Fixed invalid text ID in description of "start with hero" campaign bonus 2023-12-23 18:13:31 +02:00
Ivan Savenko
ec1aee68d5 Fix invisible chat in pregame. Fixed positioning of chat box 2023-12-23 18:12:55 +02:00
Ivan Savenko
72980a3909 Fix crash on accessing jsonnode with different type in release builds 2023-12-23 18:12:18 +02:00
Ivan Savenko
12c69f8e04 Fix crash on accessing non-existing player ID 2023-12-23 18:11:48 +02:00
Ivan Savenko
cd526a5e15 Send notifications when simultaneous turns end 2023-12-23 18:11:25 +02:00
Dydzio
bcda68abef Fix crash on giving WoG experience - quantity 0 unit on army transfer 2023-12-23 15:32:21 +01:00
Tomasz Zieliński
47915e02fa Ban Armageddon's Blade and Vial of Dragon Blood by default 2023-12-23 13:12:09 +01:00
Ivan Savenko
ec5fcb3e7c Do not ignore 'canRefuse' flag for select mode 'first' and 'random' 2023-12-23 00:35:51 +02:00
Ivan Savenko
20ede710c2
Merge pull request #3362 from IvanSavenko/terrain_decorations
Terrain decorations level
2023-12-22 23:39:32 +02:00
Ivan Savenko
bbbf676d38 spaces -> tabs 2023-12-22 23:22:33 +02:00
Ivan Savenko
9bf1e72a19
Merge pull request #3346 from IvanSavenko/better_timers
[1.4.2] Better timers
2023-12-22 23:19:20 +02:00
Ivan Savenko
5d7901cd8c Fixed timer countdown sound playback 2023-12-22 22:46:29 +02:00
Ivan Savenko
0a8b81b2c4 Fix deactivation of current stack if player does not acts in time 2023-12-22 22:46:09 +02:00
Ivan Savenko
ebbba0029f Fix positioning and size of turn timers widget with English fonts 2023-12-22 18:40:29 +02:00
Ivan Savenko
d8c69d39d8 Restored sound notifications 2023-12-22 18:40:29 +02:00
Ivan Savenko
37a8c8db8d Workaround for vcmi-extras bug 2023-12-22 18:40:29 +02:00
Ivan Savenko
fe5918ebf5 Clients will now switch to turn options when host does so 2023-12-22 18:40:28 +02:00
Ivan Savenko
4986b9031d Use timers for turns only if turn timer is set and for pvp battles -
only if unit timer is set to avoid "bad" edge case where player can
completely run out of time
2023-12-22 18:40:28 +02:00
Ivan Savenko
c4b8cc877b Remove no longer used file 2023-12-22 18:40:28 +02:00
Ivan Savenko
241add394c Fixed timer widget in pvp battle 2023-12-22 18:40:28 +02:00
Ivan Savenko
fc595c5d84 propagate turn timer state every second to ensure correct UI 2023-12-22 18:40:28 +02:00
Ivan Savenko
f834cb3d99 Display different timers separately when applicable 2023-12-22 18:40:28 +02:00
Ivan Savenko
da9c0feebc Reworked timer widget to show timers for all players 2023-12-22 18:40:28 +02:00
Ivan Savenko
8916ae7bcd Fix water generation, try to improve decoration level a bit 2023-12-22 18:35:38 +02:00
Ivan Savenko
9b40271ab1 Update editor and tests 2023-12-22 17:56:43 +02:00
Ivan Savenko
19e851ddff Implemented configurable level of decorations for terrains 2023-12-22 17:41:30 +02:00
Ivan Savenko
c8d024ae11
Merge pull request #3354 from dydzio0614/antimagic-garrison
Add missing antimagic functionality to antimagic garrisons
2023-12-22 16:33:39 +02:00
Ivan Savenko
70ee87e1d1
Merge pull request #3356 from Laserlicht/hero_info_levelup
[1.4.2?] Possibility to show hero info in levelup window
2023-12-22 16:33:31 +02:00
Ivan Savenko
48a8826aa1
Merge pull request #3308 from vcmi/improve_treasure_placement
Improve treasure placement
2023-12-22 16:32:59 +02:00
Ivan Savenko
4ed283a357
Merge pull request #3359 from IvanSavenko/crashfixes
Crashfixes
2023-12-22 15:17:59 +02:00
Ivan Savenko
ec89e7fa62 Move UNLIMITED_MOVEMENT bonus to very end of the list 2023-12-22 14:20:32 +02:00
Ivan Savenko
171044359d Fixed crash on connection to 1.4.1 game 2023-12-22 14:03:05 +02:00
Ivan Savenko
31cef2e7d7 Attempt to fix crash on rewardable configuration 2023-12-22 14:03:05 +02:00
Ivan Savenko
d8b601e759 Fix crash on disconnecting 2023-12-22 14:03:05 +02:00
Ivan Savenko
ee976d676d Fix crash on closing vcmi while opening is playing 2023-12-22 14:03:05 +02:00
Laserlicht
c20f0bdc3e
using CHeroArea 2023-12-22 01:30:41 +01:00
Laserlicht
f75ccc308b right click opens hero info 2023-12-22 00:07:41 +01:00
Dydzio
39c3db04f3 Add missing antimagic functionality to antimagic garrisons 2023-12-21 18:09:33 +01:00
Tomasz Zieliński
f9e5d73014 Missed optimization case 2023-12-21 17:56:21 +01:00
Tomasz Zieliński
d6336d7c45 Reverted change that seems to cause regression 2023-12-21 17:55:08 +01:00
Ivan Savenko
27d2fc0a13
Merge pull request #3186 from SoundSSGood/quick-backpack-part1
Quick backpack window
2023-12-21 17:10:15 +02:00
Ivan Savenko
ed98780eba
Merge pull request #3352 from Laserlicht/big_spellbook_optimize
[1.4.2] big spellbook optimize
2023-12-21 17:08:41 +02:00
Tomasz Zieliński
d4216a9191 Fixed routing roads behind Sub Gates, Monoliths and Mines 2023-12-21 13:22:23 +01:00
Tomasz Zieliński
d5f9de5beb Definitive solution for Corpse 2023-12-21 12:29:45 +01:00