1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-25 21:38:59 +02:00

16914 Commits

Author SHA1 Message Date
Xilmi
11cec347f3 Merge remote-tracking branch 'upstream/develop' into develop 2024-08-20 16:17:29 +02:00
Ivan Savenko
85f6030c7c
Merge pull request #4318 from IvanSavenko/upscaled_render
Support for xBRZ upscaling filter
2024-08-20 14:23:30 +03:00
Xilmi
8cf99616d0 Update BuildingBehavior.cpp
Fixed a warning which, in this case, was actually also a logical error! :o
2024-08-19 21:21:56 +02:00
Xilmi
2df293f95d Merge remote-tracking branch 'upstream/develop' into develop 2024-08-19 21:15:34 +02:00
Xilmi
e86ca49c37 Update BuildingBehavior.cpp
Fixed warning
2024-08-19 21:15:25 +02:00
Ivan Savenko
28789bc691
Merge pull request #4462 from IvanSavenko/building_refactor
Town buildings refactoring
2024-08-19 19:45:21 +03:00
Ivan Savenko
16adf8415f Add missing property to schema 2024-08-19 11:54:59 +00:00
Ivan Savenko
cf1c2d66cc More examples in docs 2024-08-19 11:47:13 +00:00
Ivan Savenko
cc5564a7b1 Remove no longer used localization strings 2024-08-19 11:47:13 +00:00
Ivan Savenko
42902b8eb5 Update documentation, add examples 2024-08-19 11:47:13 +00:00
Ivan Savenko
6fa2bb7e91 Deprecate previously hardcoded buildings 2024-08-19 11:47:13 +00:00
Ivan Savenko
22a126cf2d Restored replacement of town building bonuses via building upgrade 2024-08-19 11:47:13 +00:00
Ivan Savenko
2f3f3c21df Rename town building types to more clear names 2024-08-19 11:47:13 +00:00
Ivan Savenko
abfb467f68 Cleanup old code, add compatibility for 1.5 mods 2024-08-19 11:47:13 +00:00
Ivan Savenko
01a9509ccb Remove unused code, reduce includes 2024-08-19 11:47:13 +00:00
Ivan Savenko
f1e63792f0 Greatly simplify town buildings logic 2024-08-19 11:47:13 +00:00
Ivan Savenko
57430c101f Extracted common properties of buildings into a shared file 2024-08-19 11:47:13 +00:00
Ivan Savenko
2a54de7569
Merge pull request #4476 from IvanSavenko/mod_repo_160
Use 1.6 repository for mods
2024-08-19 00:06:08 +03:00
Ivan Savenko
4ba2b95983 Fix build 2024-08-18 20:59:32 +00:00
Ivan Savenko
49412579b4 Use 1.6 repository 2024-08-18 20:48:16 +00:00
Xilmi
00e5770aa3 Update PriorityEvaluator.cpp
Revert change that made AI too passive.
2024-08-18 21:22:05 +02:00
Ivan Savenko
5b49c7525a
Merge pull request #4475 from MichalZr6/CSpellHandler_allow_lowercase_x
Allow lowercase 'X' in spellRangeInHexes JSON property
2024-08-18 21:51:36 +03:00
Ivan Savenko
9ddb3fd3fe
Merge pull request #4456 from ToRRent1812/patch-1
Update polish.json
2024-08-18 20:58:24 +03:00
Ivan Savenko
4e23bb4c8c
Merge pull request #4399 from kdmcser/enchanter_armageddon
make armageddon can effect to allied creatures in ENCHANTER bonus
2024-08-18 20:57:48 +03:00
Ivan Savenko
41bc21adb5
Merge pull request #4460 from Warzyw647/black-market-restock-fix
Fix config setting blackMarketRestockPeriod.
2024-08-18 20:52:59 +03:00
MichalZr6
e7b94014e1 allow lowercase 'X' in spellRangeInHexes 2024-08-18 18:46:54 +02:00
Xilmi
e6d907af55 Merge remote-tracking branch 'upstream/develop' into develop 2024-08-18 09:52:59 +02:00
Xilmi
af7d5c7f7f Update RecruitHeroBehavior.cpp
Don't hire a hero in a town where another hero is currently defending against a threat. This would mean one of them has to stay outside and be exposed.
2024-08-18 09:50:32 +02:00
Xilmi
bdbb9d02fc Update DefenceBehavior.cpp
Fixed an issue where heroes that were leaving towns were still considered as defending the town.
2024-08-18 09:49:38 +02:00
Xilmi
65b8576687 Update BuyArmyBehavior.cpp
Allow building army in threatened town even when it wants to save for a building.
2024-08-18 09:49:02 +02:00
Xilmi
ea5ee039ca Update BuildingBehavior.cpp
Prioritize defensive buildings in threatened towns.
2024-08-18 09:48:16 +02:00
Xilmi
284f276108 Update Nullkiller.cpp
Don't trade away gold when the gold-pressure is high.
2024-08-18 09:47:37 +02:00
Xilmi
3be25d9414 Update PriorityEvaluator.cpp
Defend towns 1 turn earlier.
2024-08-18 09:47:05 +02:00
Ivan Savenko
b3158c52ba Fixes for Sonar issues 2024-08-17 20:54:29 +00:00
Ivan Savenko
75c727afaa Fix typo 2024-08-17 19:46:32 +00:00
Ivan Savenko
40ece7142b Set no filtering by default for now 2024-08-17 19:11:30 +00:00
Ivan Savenko
fb3147fbda Do not initialize shadow on images that don't have shadow palette 2024-08-17 19:11:10 +00:00
Ivan Savenko
d6059b044d Implement selection of upscaling filter in launcher 2024-08-17 15:25:26 +00:00
Ivan Savenko
f29a687234 Clean up scaling code, implemented image size optimization 2024-08-17 15:25:26 +00:00
Ivan Savenko
f0448acaa3 TBB is now a dependency of lib. Implemented multithreaded xBRZ scale 2024-08-17 15:25:26 +00:00
Ivan Savenko
6a17c08b7e Implemeted wider lines for upscaled mode 2024-08-17 15:25:26 +00:00
Ivan Savenko
095f5b5e60 Fix cursor scaling 2024-08-17 15:25:26 +00:00
Ivan Savenko
5c11a10667 Fix selection highlight in combat 2024-08-17 15:25:26 +00:00
Ivan Savenko
000af42fcb Fix spellbook page flip scaling 2024-08-17 15:25:26 +00:00
Ivan Savenko
ffba847f40 xBRZ-upscaled images now support common palette-transform effects:
- Player coloring
- Flag color for map
- Glue selection for combat
2024-08-17 15:25:26 +00:00
Ivan Savenko
2d12cecded Added draw method to ISharedImage interface 2024-08-17 15:25:26 +00:00
Ivan Savenko
502f47c6b5 Rename IConstImage to more clear ISharedImage 2024-08-17 15:25:26 +00:00
Ivan Savenko
f75a25e369 Fix positioning & scale of video files 2024-08-17 15:25:26 +00:00
Ivan Savenko
3bc31a2ea0 Fix rendering of minimap radar border 2024-08-17 15:25:26 +00:00
Ivan Savenko
216ef2a943 H3 fonts now use atlas for font data. Implemented xBRZ scaling for fonts 2024-08-17 15:25:26 +00:00