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

4220 Commits

Author SHA1 Message Date
cf97bf2cfd Remove unused code 2022-12-18 13:11:02 +02:00
1555c51313 fix assertion 2022-12-18 12:29:03 +02:00
45aa841fb6 Stack reversing logic now matches H3 2022-12-18 11:42:02 +02: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
b1f2c7aed4 Team alignments implemented 2022-12-17 08:19:16 +04:00
d93e844609 Use roads names instead of their filenames 2022-12-17 04:54:01 +04:00
f27a40dd34 Support roads and teams customization in engine 2022-12-17 03:52:40 +04:00
bcf95c32e9 Merge branch 'fix-cmake' into interface-builder 2022-12-17 03:09:41 +04:00
733f21f8dc Petrify will freeze stack animations 2022-12-16 18:34:35 +02:00
291bb9b204 Expanded cursors enum to include all possible values 2022-12-16 11:22:58 +02:00
8c07ddbae0 Merge pull request #1204 from IvanSavenko/single_process_app_upgrade
[1.2] Single process app support for platforms other than ios
2022-12-15 12:22:24 +02:00
2fe951f819 Merge remote-tracking branch 'upstream/develop' into interface-builder
# Conflicts:
#	client/lobby/RandomMapTab.cpp
2022-12-15 04:47:11 +04:00
fc7f1dbc5a Fix template selection 2022-12-14 05:23:21 +04:00
53b2f68560 Serialize template 2022-12-14 04:37:11 +04:00
e791323502 Implemented placement sound for obstacles 2022-12-13 21:31:49 +02:00
60a00b450e Multiple fixes & improvements to animation ordering 2022-12-13 21:31:49 +02:00
0020d76d1d Introduced animation phases for beter ordering of visuals in battles 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
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