1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Commit Graph

371 Commits

Author SHA1 Message Date
Mircea TheHonestCTO
00c93c7b6a Merge branch 'develop' into feature/nullkiller2 2025-10-28 22:30:39 +01:00
Laserlicht
6c1748e0d6 fix allied towns & color text input 2025-10-05 14:24:29 +02:00
Laserlicht
3e2a526140 correct update 2025-10-05 03:18:47 +02:00
Laserlicht
120213509d netpacks for renaming 2025-10-05 02:46:19 +02:00
Laserlicht
f5d1657041 make town title editable 2025-10-05 01:49:00 +02:00
Mircea TheHonestCTO
d43accfd95 Merge branch 'develop' into feature/nullkiller2 2025-10-01 17:56:58 +02:00
Laserlicht
5da8a7a4dc use resolveidentifier 2025-09-28 19:17:39 +02:00
Laserlicht
4e8556ef64 simplified translation 2025-09-16 23:11:35 +02:00
Laserlicht
230144dd04 fix 2025-09-16 02:28:37 +02:00
Laserlicht
8f392fcc82 remove RESOURCE_QUANTITY usages 2025-09-16 02:08:17 +02:00
Laserlicht
d808bd6412 introduce toResourceType 2025-09-15 00:08:18 +02:00
Laserlicht
f034584dfa replace RESOURCE_QUANTITY where possible 2025-09-14 21:12:51 +02:00
Laserlicht
40062d7755 resource translation 2025-09-14 16:17:55 +02:00
Laserlicht
75f965c93a remove allresources 2025-09-14 15:29:14 +02:00
Mircea TheHonestCTO
e67e6bcc68 Merge branch 'develop' into feature/nullkiller2 2025-09-07 17:35:33 +02:00
Jamo
fcd42124fc Fix building state message 2025-09-06 17:45:30 +02:00
Mircea TheHonestCTO
a4a9927e9e more cc renaming; BuildingID get level index and upgrades; Creatures renaming 2025-08-17 12:24:35 +02:00
Ivan Savenko
bd88ae18aa Merge pull request #5844 from IvanSavenko/bonus_fixes
Fixes to bonus system functionality
2025-06-30 11:58:42 +03:00
Ivan Savenko
e31f4367a4 Merge pull request #5814 from Laserlicht/mage_guild
Mage guild configurable
2025-06-30 11:56:46 +03:00
Ivan Savenko
099053437a Update unit growth in town screen UI when unequipping Legion pieces 2025-06-25 11:50:33 +03:00
Laserlicht
14f0b82f17 configurable window position 2025-06-19 19:48:02 +02:00
Laserlicht
fac8fb5952 allow to position spells in mage guild 2025-06-19 15:59:09 +02:00
Laserlicht
21db022547 seperate image for each mage guild level possible 2025-06-19 15:03:34 +02:00
Laserlicht
24575775f1 fix crash when pressing f without fort 2025-06-19 14:11:39 +02:00
Ivan Savenko
35644da2b7 Reogranize callback-related classes on 1 file = 1 class basis 2025-05-12 22:07:09 +03:00
Ivan Savenko
283adc37d7 Unit stack rebalancing rework
- CStackInstance::count is now private with accessor methods
- CStackInstance::experience renamed to totalExperience and now stores
total stack experience (multiplied by stack size) to reduce rounding
errors
- CStackInstance::totalExperience is now private with accessors methods
- stack experience is now automatically reallocated on stack management
- Removed buggy BulkSmartRebalanceStacks pack, that mostly duplicates
BulkRebalanceStacks
- Renamed BulkSmartSplitStack to BulkSplitAndRebalanceStack to drop
unclear "smart" in name
- Reworked split-and-rebalance logic to correctly reallocate stack
experience
2025-05-01 18:18:30 +03:00
Ivan Savenko
f70ad2c15b Reorganized artifact-related classes
- files now generally contain only 1 class (except for tightly coupled
classes)
- files are now located in lib/entities/artifact directory
- removed excessive includes

No changes to functionality
2025-04-29 13:29:08 +03:00
Ivan Savenko
829739da24 Reduce usage of implicit conversions to int 2025-04-27 14:57:31 +03:00
Ivan Savenko
63d00b080e Removed pointer to army from StackInstance 2025-04-27 14:57:30 +03:00
Ivan Savenko
c02a8a84fd Stacks of armed instance are now unique_ptr 2025-04-27 14:57:30 +03:00
Ivan Savenko
417ea6451a Remove ConstTransitivePtr from hero and town instances 2025-04-27 14:57:30 +03:00
Ivan Savenko
ee5cddb52c Merge pull request #5518 from Laserlicht/fix_upgrade_all
[develop] fix crash, when no cost for upgrade
2025-03-08 19:21:13 +02:00
Laserlicht
d983d54cc0 Update client/windows/CCastleInterface.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-03-08 15:08:33 +01:00
Ivan Savenko
a061ed04de Remove usage of ConstTransitivePtr from CTown 2025-03-08 14:04:51 +00:00
Laserlicht
3f4267df15 fix crash, when no cost for upgrade 2025-03-08 12:46:00 +01:00
Ivan Savenko
9f713a0914 Rename int3::valid to isValid for consistency 2025-03-03 10:46:00 +00:00
Ivan Savenko
a8a6be7ac1 Fix potential compatibility with C++20 / C++23 mode
This fixes several issues with compatibility with C++20. C++23 was also
tested, but apparently it does not have any additional breaking changes
compared to C++20 (or we don't have those).

VCMI still uses C++17 as before - goal is only to make potential
transition easier.

There were 2 cases that are deprecated in C++20 that we use:
- Floating point operations on enums are deprecated
- `this` can no longer be captured when using default capture by value
`[=]`

Both of those should now be replaced with code that works fine in both C+
+17 and in C++20 mode
2025-03-02 14:11:48 +00:00
Ivan Savenko
8f074490a7 Merge branch 'master' into 'develop' 2025-02-27 21:15:42 +00:00
Ivan Savenko
e2e83b392b Merge pull request #5467 from IvanSavenko/brotherhood_fix
[1.6.7] Fix Brotherhood displaying Thieves Guild UI on click instead of Tavern
2025-02-25 16:50:18 +02:00
Ivan Savenko
b6dd4460de Fix Brotherhood displaying Thieves Guild UI on click instead of Tavern 2025-02-23 14:46:04 +00:00
Laserlicht
db23cc2ffa add setting for disabling overlay 2025-02-21 21:35:17 +01:00
Ivan Savenko
645b95ba02 Renamed LibClasses * VLC to GameLibrary * LIBRARY 2025-02-21 16:54:56 +00:00
Ivan Savenko
156de5b17e Added GameInstance class
- available as global GAME
- integrates LOCPLINT (CPlayerInterface)
- integrates CGI->mh (CMapHandler)
- integrates CSH (CServerHandler)
2025-02-21 16:54:06 +00:00
Ivan Savenko
ffd37a8fa8 Removed CGI in favor of VLC. Map handle is for now global variable 2025-02-21 16:53:14 +00:00
Ivan Savenko
f657e85305 Integrated CClientState into GameEngine class 2025-02-21 16:53:14 +00:00
Ivan Savenko
cacceda950 Renamed CGuiHandler to GameEngine
- class CGuiHandler is now called GameEngine to better describe its
functionality
- renamed global GH to more clear ENGINE
- GH/ENGINE is now unique_ptr to make construction / deconstruction
order more clear and to allow interface / implementation split
- CGuiHandler.cpp/h is now called GameEngine.cpp/h and located in root
directory of client dir
2025-02-21 16:53:13 +00:00
Ivan Savenko
2362c6da21 Fixes for multiple new issues from Sonar 2025-02-21 15:57:39 +00:00
Ivan Savenko
9effde04bb Merge pull request #5404 from Laserlicht/upgrade_all
[1.6.6] extend radial wheel in town to upgrade all creatures
2025-02-15 11:12:37 +02:00
Laserlicht
3e161da834 code review 2025-02-14 21:03:23 +01:00
Laserlicht
c6987f4183 upgrade all radial wheel button 2025-02-09 21:54:30 +01:00