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

906 Commits

Author SHA1 Message Date
ee64928454 Merge pull request #4448 from smanolloff/split-client+develop
Split vcmiclient in two
2024-09-02 15:34:05 +03:00
82c37573fa Removed save compatibility with 1.4
All save compatibility checks targeting 1.4 saves have now been removed.
Saves from 1.5 can still be loaded in 1.6

Implemeted few TODO's in serialization that were postponed to avoid
breaking save compatibility in MP for 1.5.X releases.

Fixed missed case for loading black market object from 1.5 saves
2024-08-29 18:51:53 +00:00
408a632002 Deprecate artifact-related building types 2024-08-28 13:50:08 +00:00
e9131538dd Merge branch 'develop' into split-client+develop 2024-08-27 03:05:07 +03:00
01396b62b7 Extracted handling of type ID's from serializer into a separate class 2024-08-26 19:48:46 +00:00
b84af1a6de Significantly simplify packs applying
Apparently our logic for packs applying with types registration is
overcomplicated and by now completely unnecessary - it became redundant
after introduction of visitor pattern.
2024-08-26 19:48:46 +00:00
11e8b04ac5 Merge pull request #4463 from SoundSSGood/IMarket-refactoring
IMarket refactoring
2024-08-26 22:48:23 +03:00
3d39963a1c Merge branch 'master' into 'develop' 2024-08-26 14:01:00 +00:00
2a6525c5ef Check battleInt->curInt instead of battleInt 2024-08-25 19:43:21 +00:00
619b35ab33 Allow dialogs when in battle interface
But also it is not our turn
2024-08-25 19:43:14 +00:00
9daabd0710 Check battleInt->curInt instead of battleInt 2024-08-23 23:30:50 +02:00
d0e0ab767c Allow dialogs when in battle interface
But also it is not our turn
2024-08-23 18:03:58 +02:00
b6cc409772 Fix excessive removal of dialogs, e.g. new week or timed events 2024-08-22 16:39:30 +00:00
d05adfc5d5 Merge branch 'develop' into split-client+develop 2024-08-21 17:40:37 +03:00
5a7dc7b552 Merge branch 'develop' into split-client+develop 2024-08-21 17:39:44 +03:00
2e3e6b1553 market->getObjInstanceID() 2024-08-21 01:01:23 +03:00
58bb2b58e3 IMarket suggestions
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-08-20 18:49:48 +03:00
cd7ebea9e3 cleanup unused code 2024-08-20 18:49:47 +03:00
fd45b5144d IMarket serializeable 2024-08-20 18:49:47 +03:00
6a6c13471c Try more robust approach for waiting dialogs in battles in MP 2024-08-19 18:20:11 +00:00
b94a61c255 Try to fix battle startup if player has waiting dialogs 2024-08-19 15:21:45 +00:00
f29a687234 Clean up scaling code, implemented image size optimization 2024-08-17 15:25:26 +00:00
f2cddaa21b Split vcmiclient in two
Similar to vcmiserver (app) and vcmiservercommon (lib), now
there is vcmiclient (app) and vcmiclientcommon (lib).
2024-08-14 19:20:01 +03:00
49c5f650f7 Merge pull request #4437 from IvanSavenko/battle_sides
Unified handling of battle sides ID's
2024-08-14 18:37:05 +03:00
2a05fbdd50 Unified handling of battle sides ID's
- Replaced BattleSide namespace-enum with enum class
- Merged two different BattleSide enum's into one
- Merged BattlePerspective enum into BattleSide enum
- Changed all places that use integers to represent battle side to use
BattleSide enum
- Added BattleSideArray convenience wrapper for std::array that is
always 2-elements in size and allows access to its elements using
BattleSide enum
2024-08-11 20:54:44 +00:00
00605b5129 Remove largely unused defActions member from CIntObject 2024-08-09 14:26:53 +00:00
b7391f49f6 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-08-05 10:36:10 +00:00
e8c3252214 Do not auto-remove dialogs such as new week 2024-08-04 13:14:28 +00:00
5f0e6f7ce1 Close all dialogs on start of new turn in MP 2024-07-29 17:13:31 +00:00
4aa73b40c9 Split CTownHandler into smaller chunks 2024-07-21 18:21:48 +00:00
1aa391fdf8 Split CGeneralTextHandler file into 1 file per class form
All text processing code is now located in lib/texts.
No changes other than code being moved around and adjustment of includes

Moved without changes:
Languages.h           -> texts/Languages.h
MetaString.*          -> texts/MetaString.*
TextOperations.*      -> texts/TextOperations.*

Split into parts:
CGeneralTextHandler.* -> texts/CGeneralTextHandler.*
                      -> texts/CLegacyConfigParser.*
                      -> texts/TextLocalizationContainer.*
                      -> texts/TextIdentifier.h
2024-07-20 12:55:17 +00:00
0d6ec0d224 Reviewed usage of EBlitMode, now specified clearly in all cases 2024-07-19 10:08:50 +00:00
fcafe53da9 Restored previously disabled University code, add interface to notify
market-like objects
2024-07-19 10:08:50 +00:00
47de9a62dc Created separate classes for shared, unchangeable image and image
manipulators owned by UI elements
2024-07-19 10:08:50 +00:00
63bcf7d83c Replaced most of usages of CRandomGenerator with vstd::RNG in library 2024-07-16 13:13:07 +00:00
ad9750ed3e Merge pull request #4186 from SoundSSGood/end-of-battle-artifacts-transfer
End of battle artifacts transfer
2024-07-16 12:45:13 +03:00
ff5ddd76b7 suggestions 2024-07-16 00:03:06 +03:00
c00a1e1b0c Fixed new issues detected by SonarCloud 2024-07-15 07:46:40 +00:00
6b8f94e6e7 Merge remote-tracking branch 'vcmi/master' into develop 2024-07-11 17:43:44 +00:00
b42c6dbf44 fixed regressions 2024-07-09 14:27:05 +03:00
ef1fbffad4 ArtifactsUIController class 2024-07-09 14:27:05 +03:00
5ccf6750ab Fix assertion failure 2024-07-04 08:46:39 +00:00
3bea383b59 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-21 12:58:36 +00:00
6a0768aae6 Fix allied towns missing from town portal dialog 2024-06-17 20:46:47 +00:00
b4c6906471 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-11 19:22:23 +00:00
6a624cbaf7 Add more symbols to illegal for filenames 2024-06-11 14:30:13 +00:00
16c7063eb4 Add '*' to list of characters banned for save game names 2024-06-04 14:11:22 +00:00
b8beb4fb13 Fixes for various minor issues detected by Sonar Cloud 2024-06-01 11:48:30 +00:00
df83fa33a1 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-05-31 09:34:21 +00:00
adc3441bda Merge pull request #3998 from IvanSavenko/refactor_sdl_media
[1.6] Reorganize SDL sound/music/video handling
2024-05-31 12:02:55 +03:00