1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-29 00:41:38 +02:00
Commit Graph

1573 Commits

Author SHA1 Message Date
a1eaf4d9c8 Do not apply Fire Shield effect that deals 0 damage 2023-01-04 17:55:19 +02:00
5d80457eda Merge with vcmi/develop branch 2022-12-30 00:52:23 +02:00
7a35bcc812 Merge pull request #1221 from IvanSavenko/warnings_fix
Fix remaining compiler warnings
2022-12-29 21:51:55 +02:00
bb65246aa3 Merge remote-tracking branch 'vcmi/develop' into battle_improvements 2022-12-26 01:15:44 +02:00
405b2976d5 Renamed getUpgradeInfo -> fillUpgradeInfo 2022-12-25 14:03:43 +02:00
64fb4a744e Merge pull request #1269 from vcmi/beta
Merge android fix into develop
2022-12-24 22:07:04 +04:00
2953b8fe9d Fix android build 2022-12-23 19:12:48 +04:00
325c29da0d Merge remote-tracking branch 'vcmi/develop' into battle_improvements 2022-12-23 14:51:34 +02:00
1250f67771 Fix android build 2022-12-23 16:42:32 +04:00
eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
f073c676f9 Merge 1.1 release into develop 2022-12-23 14:17:18 +02:00
9248e06ae0 Demon summon is now a spell. DEMON_SUMMONING bonus has been removed 2022-12-22 23:11:55 +02:00
b2279484fc Merge pull request #1227 from Shatur/opendingux
Port to OpenDingux handhelds
2022-12-22 16:56:55 +02:00
b423b3fa6b Fix dragon breath & fire shield 2022-12-21 18:04:54 +02:00
12d4204334 Fix closing server on ios 2022-12-19 01:37:38 +04:00
52fc5b3c39 Exploded mines now send ACTIVATE flag to client to play effect 2022-12-17 19:37:00 +02:00
deffba01b9 All battle effects are now fully client sided 2022-12-17 17:35:15 +02:00
ced2ece954 Fixes #809 - do not print error message after stepping onto mine 2022-12-17 14:40:54 +02:00
a1ab90fb05 Creatures with double strike will not hit 2nd time after blinding 2022-12-16 21:52:46 +02:00
56bf8ec2c4 #1228 - prevent second AI activation on AI defeat due to wrong EndTurn packet 2022-12-14 22:13:26 +02:00
60a00b450e Multiple fixes & improvements to animation ordering 2022-12-13 21:31:49 +02:00
c79634b6a7 Moved all animation ordering logic to callers
Previously, CBattleAnimation & inheritors were controlling animation
ordering - e.g. which animations should play after which.
Now, this is controlled by caller, e.g. BattleInterface & its
controllers.
H3 animations are fairly linear and can be split in stages which are
already somewhat implemented via waitForAnims
2022-12-13 21:31:49 +02:00
b3deea24e0 Earthquake spell: do not target already destroyed sections 2022-12-13 21:31:49 +02:00
de33eb44f9 Port to OpenDingux handhelds 2022-12-13 03:55:54 +02:00
25bceda4ea Added convertToVisitablePos/convertFromVisitablePos to CGHeroInstance
This method replaces old convertPosition, but with more clear names and
without hardcoded magic constants.
2022-12-09 14:42:47 +02:00
facf77b3ae vstd::unique -> std::unique 2022-12-07 23:36:20 +02:00
d85ee019ec Removed CGHeroInstance::convertPosition method 2022-12-07 22:51:32 +02:00
49cbd5adc9 CGHeroInstance::convertPosition is no longer static method 2022-12-07 22:34:08 +02:00
908e6892f3 Removed CGHeroInstance::getPosition pseudo-override
Now access to hero visible position is always done via visitablePos
2022-12-07 22:10:08 +02:00
2855606a88 Enabled & fixed -Woverloaded-virtual warning from gcc/cland
- fixed almost all instances of overloaded-virtual warning
- cleared up inheritance & method overrides in code affected by warning
2022-12-07 21:50:45 +02:00
fd97b51183 Yet another attempt to fix Windows compile:
when building vcmi_lib statically (or linking against static vcmi_lib)
do not place dllexport/dllimport tags
2022-12-06 18:35:24 +02:00
fa23965d0b Renamed for consistency BUILD_SINGLE_APP -> ENABLE_SINGLE_APP_BUILD 2022-12-06 00:00:56 +02:00
6463e906d5 vcmi can be compiled as single app on Linux
TODO: check compilation on Win/Mac using Github Actions
2022-12-05 21:36:02 +02:00
848454d48a Check for end-of-battle after opening spells are cast, fixes potentially
infinite battle
2022-12-02 21:38:59 +02:00
89b8b87a6b Merge pull request #1156 from vcmi/features/online
Online mode
2022-11-29 20:43:39 +04:00
52375468e4 Remove unused variable 2022-11-23 01:02:17 +04:00
e6e669d024 ArtifactUtils::isSlotBackpack() func + refactoring 2022-11-18 23:13:44 +02:00
e9ab894638 backpack assemble 2022-11-18 01:55:29 +02:00
2d078132bf assemble in backpack initial 2022-11-17 19:43:54 +02:00
915d215076 Fix connections amount problem 2022-11-15 22:09:47 +04:00
694fedc662 Fix crash due to passing args 2022-11-15 22:09:46 +04:00
e7a8466e2b Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-15 22:09:46 +04:00
6974d4ea53 Merge pull request #1130 from IvanSavenko/banned_skills_fix
Fixes #1096 - do not propose banned skills on levelup
2022-11-15 09:32:12 +02:00
729357824b Added common method for secondary skill availability checks 2022-11-14 19:08:49 +02:00
f9738f0d0b nullptr checks 2022-11-13 16:28:26 +02:00
aef87dd482 Apply suggested cosmetic changes 2022-11-13 15:28:09 +02:00
eeeca5ba8d Add additional logging 2022-11-11 18:00:09 +04:00
3142f32cbb Fix for callback return. More code optimization 2022-11-11 01:28:04 +02:00
30db38c0fe Unified CGameHandler::bulkMoveArtifacts and CGameHandler::bulkSwapArtifacts to one 2022-11-10 20:11:26 +02:00
ad47a7573c Code style. Typo. Code clean up. 2022-11-10 18:29:39 +02:00