1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-14 10:12:59 +02:00
Commit Graph

16508 Commits

Author SHA1 Message Date
Xilmi
2bf7b3200b Merge remote-tracking branch 'upstream/develop' into develop 2024-07-19 22:05:58 +02:00
Andrii Danylchenko
3502e30fe5
Merge pull request #4296 from vcmi/build-take-into-account-7lvl-creatures
NKAI: take into account 7lvl creature cost when we consider what reso…
2024-07-19 21:34:25 +03:00
Ivan Savenko
5ad1c35354
Merge pull request #4303 from IvanSavenko/savecompat_fix
Fix crash on loading saves made in 1.4/1.5
2024-07-19 17:17:54 +03:00
Xilmi
f0f40660c4 reverse getTotalArmyLoss()-change
Due to a recent fix in army-loss calculations this method should now work correctly the way it was.
2024-07-19 15:59:57 +02:00
Ivan Savenko
e0c6b6e3d0 Fix crash on loading saves made in 1.4/1.5 2024-07-19 13:57:06 +00:00
Xilmi
fa2f883361 Merge remote-tracking branch 'upstream/develop' into develop 2024-07-19 15:26:31 +02:00
Xilmi
eb26b16823 Trace level
Increased AI-trace-level because I need it for debugging.
2024-07-19 15:26:14 +02:00
Xilmi
e374f24016 complete Building-costs as evaluation-context
Added building-cost including all resoruces as evaluation-context for more sophisticated building-selection and also as a countermeasure to softlocking a build-order by having no ways to obtain certain resources.
For example, if the AI would drop below 5 wood, while having no market-place and no wood-income it will avoid building any buildings that neither allow trading nor produce wood.
2024-07-19 15:25:24 +02:00
Xilmi
2d715f4d7e Trading logic
Added trading-logic to Nullkiller-AI.
The AI can now identify which resources it is lacking the most and buy them to fix softlocks in their build-order. It can also sell excess resources that it doesn't have a need for.
2024-07-19 15:21:56 +02:00
Xilmi
f094bf9602 Added marketplace to buildable buildings
Before marketplaces could only be built as part of a requirement for other buildings but not on their own when that other building already existed like it is the case in certain campaign-missions.
2024-07-19 15:19:27 +02:00
Xilmi
9c6d8762c5 Lowered restrictions from hero-hiring.
Removed two restrictions from hero-hiring, that prevented AI from hiring heros in certain scenarios.
2024-07-19 15:18:02 +02:00
Xilmi
37c0972a50 New and restored functionality
Added a new div-function to resource-sets. It allows to calculate the amount of times one resource set, for example income, has to be accumulated in order to reach another resource-set, for example required resource. It will return INT_MAX if it's impossible.

Restored the "<" operator-function and made it actually work like it's supposed to.
2024-07-19 15:16:05 +02:00
Ivan Savenko
dc27e8eccb
Merge pull request #4097 from IvanSavenko/render_refactor_2
[1.6] Render refactor
2024-07-19 16:07:54 +03:00
Ivan Savenko
e2af6c0f92
Merge pull request #4295 from Alexander-Wilms/translation-error-messages
Less noise when switching languages in launcher
2024-07-19 15:44:54 +03:00
Ivan Savenko
1cbfa43b6d
Merge pull request #4297 from Alexander-Wilms/mod-assertion
CModListView::loadScreenshots(): Ensure a mod is selected in allModsView
2024-07-19 15:44:30 +03:00
Ivan Savenko
4b67994dab
Merge pull request #4302 from runlevel5/patch-1
Add notes for Fedora
2024-07-19 15:43:09 +03:00
Ivan Savenko
0d44bf1506 Fix build 2024-07-19 12:30:10 +00:00
Ivan Savenko
2d3734656d Fix test 2024-07-19 12:17:06 +00:00
Ivan Savenko
b256919dab Implemented per-surface alpha for images that have palettes with alpha 2024-07-19 12:03:29 +00:00
Ivan Savenko
c40eea6e10 Fix fade-in animation - per-surface alpha was not set correctly 2024-07-19 10:46:20 +00:00
Alexander Wilms
70e309c4f9
CModListView::loadScreenshots(): Check isValid() instead of row() and column()
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-07-19 12:38:42 +02:00
Trung Lê
15c5cd6f6c
Add notes for Fedora 2024-07-19 20:13:46 +10:00
Ivan Savenko
9f3663b7d4 Remove unused method 2024-07-19 10:08:50 +00:00
Ivan Savenko
4f8f217b49 Moved range highlight transforms to config file 2024-07-19 10:08:50 +00:00
Ivan Savenko
81c7c0ce24 Fixed loading of flipped and duplicate images in animations 2024-07-19 10:08:50 +00:00
Ivan Savenko
73e052b1d0 Fix merge 2024-07-19 10:08:50 +00:00
Ivan Savenko
e4bed98674 Replaced raw json nodes with ImageLocator class 2024-07-19 10:08:50 +00:00
Ivan Savenko
2f68beead1 Remove old code 2024-07-19 10:08:50 +00:00
Ivan Savenko
fd726523a2 Remove creations of custom animations in runtime 2024-07-19 10:08:50 +00:00
Ivan Savenko
5409936509 Fix build with older SDL 2024-07-19 10:08:50 +00:00
Ivan Savenko
0d6ec0d224 Reviewed usage of EBlitMode, now specified clearly in all cases 2024-07-19 10:08:50 +00:00
Ivan Savenko
f11c5f62e1 Remove no longer needed code 2024-07-19 10:08:50 +00:00
Ivan Savenko
b850b6339f Flipped images are now tracked by RenderHandler 2024-07-19 10:08:50 +00:00
Ivan Savenko
230add02e4 Remove no longer used code 2024-07-19 10:08:50 +00:00
Ivan Savenko
0e407540ec Fixed player-coloring on adventure map 2024-07-19 10:08:50 +00:00
Ivan Savenko
920a39844b Unified naming of method to recolor UI element to current player scheme 2024-07-19 10:08:50 +00:00
Ivan Savenko
9f31ec5326 Restore previously disabled icons registry 2024-07-19 10:08:50 +00:00
Ivan Savenko
fcafe53da9 Restored previously disabled University code, add interface to notify
market-like objects
2024-07-19 10:08:50 +00:00
Ivan Savenko
c1ebb6b0e3 Try to use lazy loading for animations 2024-07-19 10:08:50 +00:00
Ivan Savenko
a8a330f39f Remove unused code and no longer needed caching 2024-07-19 10:08:50 +00:00
Ivan Savenko
47de9a62dc Created separate classes for shared, unchangeable image and image
manipulators owned by UI elements
2024-07-19 10:08:50 +00:00
Ivan Savenko
2b3e4e01ca Remove unused code 2024-07-19 10:08:50 +00:00
Ivan Savenko
600b06b74d Moved all handling of image loading to render handler 2024-07-19 10:08:50 +00:00
Ivan Savenko
a1fb3b8b01 Reduce direct access to CAnimation, removed various caching schemes 2024-07-19 10:08:50 +00:00
Ivan Savenko
56f1725234 All images are now loaded via RenderHandler class 2024-07-19 10:08:50 +00:00
Ivan Savenko
2020d96070
Merge pull request #4071 from IvanSavenko/fix_rng_syncronization
[1.6] Fix potential desync if client uses different stdlib with different random number generators
2024-07-19 13:08:09 +03:00
Alexander Wilms
4f06aed631 CModListView::loadScreenshots(): Ensure a mod is selected in allModsView
Fixes #989
Fixes #3811
2024-07-18 22:33:48 +02:00
Ivan Savenko
31caf73383
Merge pull request #4020 from Laserlicht/quickspell
[1.6] Quickspell support
2024-07-18 23:04:05 +03:00
Laserlicht
9ac7db24ca
Merge branch 'develop' into quickspell 2024-07-18 21:24:42 +02:00
Alexander Wilms
187b7b0517 Show debug message instead of warning if no .qm file for selected language exists 2024-07-18 20:44:24 +02:00