1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Commit Graph

3875 Commits

Author SHA1 Message Date
Konstantin
5716925b47 NetPacks: change GiveBonus enum to enum class. 2023-03-30 12:41:17 +03:00
Ivan Savenko
b2f5042942
Merge pull request #1783 from vcmi/beta
Merge beta -> develop
2023-03-27 21:21:25 +03:00
Ivan Savenko
b875da108b
Merge pull request #1717 from SoundSSGood/backpack-limit-size
Introducing backpack size limit functionality
2023-03-27 17:17:49 +03:00
Konstantin
1b893fa525 client: do not show obstacles placed by another player 2023-03-26 21:23:54 +03:00
Ivan Savenko
da3a05bc8b Fix special colors in battle 2023-03-26 00:46:21 +02:00
Ivan Savenko
4c311da21b Clamp potential kills tooltip to target unit size 2023-03-26 00:07:21 +02:00
Ivan Savenko
5857ad0169 Fix corrupted UI redraw in artifact merchant 2023-03-25 23:54:51 +02:00
Ivan Savenko
c246cadaa7 Fix potential crash on exit 2023-03-25 23:54:51 +02:00
Ivan Savenko
46461e5c33 Improve performance of window redraws 2023-03-25 23:54:51 +02:00
Ivan Savenko
4eed0b2c9e Added workaround for Dungeon towers 2023-03-25 23:54:51 +02:00
Ivan Savenko
49fa628e9b Turret creature cutoff position should match H3 2023-03-25 23:54:51 +02:00
Ivan Savenko
dcff463d36 Fixed handling of special palette colors in palette transformations
Fixes black color turning semi-transparent in some creatures from mods
2023-03-25 23:54:51 +02:00
Ivan Savenko
2167cb2a68 Fix battle startup with "no intro sound" mod 2023-03-25 23:54:51 +02:00
Ivan Savenko
339bbce7b7 Added more checks to avoid potential nullptr dereference crash 2023-03-25 23:54:51 +02:00
Ivan Savenko
5288e3761e
Merge pull request #1764 from IvanSavenko/selectable_spellcaster
Implemented support for multi-spell casters
2023-03-25 20:08:47 +02:00
Ivan Savenko
786035085a
Merge pull request #1770 from Adriankhl/fix_label_update_on_hit
Process attack/attacked animation before dealing damage to units
2023-03-25 20:06:23 +02:00
Ivan Savenko
6f631a0aa7
Merge pull request #1759 from IvanSavenko/kills_in_tooltip
Show potential kill amount in attack tooltip
2023-03-25 20:03:27 +02:00
Ivan Savenko
382fbf423d
Merge pull request #1762 from IvanSavenko/reactivation_fix
Do not activate new items when parent widget is inactive
2023-03-25 20:02:46 +02:00
Adriankhl
792ea2f06f Process attack/attacked animation before dealing damage to units 2023-03-25 15:00:25 +01:00
Ivan Savenko
9a19feaf4a Fix spellcasters with massive spells 2023-03-25 01:23:49 +02:00
Ivan Savenko
dc099b2a35 Implemented support for multi-spell casters 2023-03-25 00:48:14 +02:00
Adriankhl
76a71226a2 Deactivate activeStack during spellCast 2023-03-24 22:43:41 +01:00
Ivan Savenko
b0a3f95d20 Do not activate new items when parent widget is inactive 2023-03-24 18:56:38 +02:00
Ivan Savenko
970981cfc9 Show information on potential kills in attack tooltip 2023-03-24 17:18:47 +02:00
Adriankhl
49662f6f36 Deactivate activeStack when auto combat starts 2023-03-23 22:37:39 +01:00
Ivan Savenko
31147ac83b refactoring: TDmgRange pair -> DamageRange struct 2023-03-23 17:49:33 +02:00
Ivan Savenko
a8fe8c0f3b Converted timer event into tick event that is called every frame 2023-03-22 23:10:50 +02:00
Ivan Savenko
8af76947cb Do not cache hovered tile and always update state 2023-03-22 19:49:57 +02:00
Ivan Savenko
fa9abf6adc Lock UI while adventure map has animations 2023-03-22 19:49:24 +02:00
Ivan Savenko
54e8abb3eb Fix map animation playback speed 2023-03-22 15:51:25 +02:00
Ivan Savenko
ef07935fbc Update town visual when new structure is built 2023-03-22 14:41:36 +02:00
Ivan Savenko
c81d57ab8c Remove excessive totalRedraw's 2023-03-22 00:57:08 +02:00
Ivan Savenko
a78f7de9cd Fix crash on defeating hero in boat 2023-03-22 00:38:55 +02:00
SoundSSGood
19096f39f0 Backpack limit. Amount of fixes. 2023-03-21 22:11:42 +02:00
Ivan Savenko
bb03abdce6 Fix crash on switching players in hotseat 2023-03-21 19:06:38 +02:00
Ivan Savenko
bfe7bb11ab Fix crash on winning scenario 2023-03-21 18:40:48 +02:00
Ivan Savenko
9dceed4f56
Merge pull request #1729 from IvanSavenko/battle_animation_fixes
Fixes for battle UI regressions
2023-03-21 14:32:45 +02:00
Ivan Savenko
4968ac58b4 Do not abort battle opening sound, only allow actions 2023-03-21 13:49:19 +02:00
SoundSSGood
f0f9eecf97 Backpack limit part5. End of battle. Other stuff 2023-03-21 12:14:33 +02:00
SoundSSGood
9f8aa25297 Backpack limit part4 (Using cheats, buying) 2023-03-21 12:14:33 +02:00
SoundSSGood
e23766280f Backpack limit part2 (Pick up, Dig up, Object rewards) 2023-03-21 12:14:33 +02:00
SoundSSGood
96e8a1f21c Backpack limit part1 (move, disassemble) 2023-03-21 12:14:33 +02:00
SoundSSGood
72122fb433 CArtifact, CArtifactInstance, CCombinedArtifactInstance reorganization 2023-03-21 12:14:33 +02:00
Ivan Savenko
4919550a19 Show a message that battle intro can be skipped 2023-03-20 21:58:32 +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
Konstantin
5462a92930 Fix #1688 again 2023-03-18 01:19:41 +03: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
Adriankhl
4718396f5f Prevent crashing when pressing auto-combat button on enemy turn 2023-03-17 15:40:14 +01:00