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

7110 Commits

Author SHA1 Message Date
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
155f776ae8 Merge pull request #1172 from IvanSavenko/battleint_refactor
[1.2] Refactoring of BattleInterface class
2022-12-13 21:31:18 +02:00
de33eb44f9 Port to OpenDingux handhelds 2022-12-13 03:55:54 +02:00
b3d60ec418 Add new map sizes 2022-12-12 04:46:42 +04:00
1558c28c0a Fix obstacle rendering 2022-12-12 00:05:00 +02:00
ac839ad26a Changes to rest of the code according to review:
- renamed status bar method clearMatching -> clearIfMatching
- renamed class ColorShifterAddMul -> ColorShifterMultiplyAndAdd
- fixed missing return from function
- fixed potential access to deleted object
2022-12-11 23:43:43 +02:00
0016b77192 Merge pull request #1218 from IvanSavenko/pathfinder_fix
[1.1] Do not allow attacking from inaccessible tiles
2022-12-10 15:19:55 +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
db2a40600d Fixed some of the warnings detected by CI run 2022-12-08 23:20:42 +02:00
48ec21f648 Do not allow attacking from inaccessible tiles 2022-12-08 16:14:33 +02:00
krs
ed70c69a2b extractToFolder fix with entry.offset is set to 0 2022-12-08 02:52:30 +04:00
krs
35db24a443 Reverted extractToFolder() for texts, to old stand alone version. 2022-12-08 02:52:30 +04: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
65802d958b Integrated valid fixes from PR #1143 2022-12-07 18:13:54 +02:00
fb6b3c31e8 Renamed UNUSED -> MAYBE_UNUSED macro to match c++17 attribute name 2022-12-07 18:06:47 +02:00
3219e322ae Fixed all non-silenced gcc/clang warnings 2022-12-07 18:05:47 +02:00
89f0cc66e8 Merge pull request #1213 from IvanSavenko/clone_fix
Fix crash on casting clone on modded creature
2022-12-07 17:34:52 +02:00
2cbe6bcb47 Added common method to get names of hardcoded mod scopes 2022-12-07 15:18:19 +02:00
4b19d37988 Merge pull request #1214 from IvanSavenko/enlightenment_fix
Library of Enlightenment fix
2022-12-07 09:14:06 +02:00
4e1c8324fe Removed another unused friend declaration 2022-12-06 21:11:41 +02:00
e0c8bd5d70 Removed unused friend class reference 2022-12-06 19:38:55 +02:00
17f9c3af23 Library of Enlightenment fix
Do not offer choice between multiple identical option if hero is qualified
to receive multiple of them due to diplomacy skill
2022-12-06 18:08:10 +02:00
65f9a1ffd2 Fixes identifiers resolving for json serialization 2022-12-06 16:26:32 +02:00
5d1b5b6c9c Throw an exception if empty zone is generated 2022-12-06 15:07:16 +04:00
085abb9e32 Fix compilation on Windows 2022-12-06 12:46:10 +02:00
09ac2421b9 Fix Windows single-app build 2022-12-06 01:53:19 +02:00
fa23965d0b Renamed for consistency BUILD_SINGLE_APP -> ENABLE_SINGLE_APP_BUILD 2022-12-06 00:00:56 +02:00
5e37ad6836 Changes to single-app build
- client version of library is now always called vcmi, like in regular
builds (e.g. libvcmi.so)
- server version of library keeps its separate name
2022-12-05 22:57:43 +02:00
538c6e39f9 Split VCMIDirs::developmentMode to handle data & binaries separately 2022-12-05 22:56:10 +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
34cd856f53 Merge pull request #1197 from IvanSavenko/hero_positioning_fix
Adjust positions of heroes in towns earlier
2022-12-05 14:47:44 +02:00
46b8709712 Adjust positions of heroes in towns earlier
fixes crash due to accessing tile that is outside of map bonds
2022-12-05 13:02:55 +02:00
40e55e2788 Merge pull request #1196 from IvanSavenko/hero_positioning_fix
Fixes incorrect positioning of heroes on spawn/release from prison
2022-12-05 10:35:24 +02:00
2cc4f59699 Update map properly on hero position change 2022-12-04 22:03:25 +02:00
b6b6063505 Fix positioning of heroes after release from prisons 2022-12-04 22:00:33 +02:00
fa3a05a074 Removed hardcoded constants in hero placement code for more robust
solution
2022-12-04 21:23:47 +02:00
bbe51bfaf4 Fix hero experience deserialization 2022-12-04 16:58:46 +04:00
8d1024fcfc Clear error message 2022-12-03 20:56:05 +04:00
2f2c980a0c Fix crash on map destroying 2022-12-03 20:56:05 +04:00
1248292503 Fixed access violation - do NOT return address to temporary created on
stack
2022-12-02 21:37:58 +02:00
d9c4b28ccc Merge pull request #1177 from IvanSavenko/fix_mod_identifiers
Fix mod identifiers registration & incorrect mod validation
2022-12-02 09:20:49 +02:00
d8742dac3f Show correct error message on attempting to cast Remove Obstacle on
fields with no removable obstacles
2022-12-02 00:27:48 +02:00
495e0b3657 Merge remote-tracking branch 'vcmi/develop' into battleint_refactor 2022-12-01 23:58:01 +02:00
5094fab4d9 Refactoring of spell animations, multiple fixes for spell visuals 2022-12-01 22:06:42 +02:00
82179a9cdb Merge pull request #1176 from IvanSavenko/tower_shooter_icons
Tower shooter icons fix
2022-12-01 12:30:24 +02:00