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

7110 Commits

Author SHA1 Message Date
0d5a9b8e3b Refactor for previous fix in CSpellHandler 2024-08-23 09:43:41 +02:00
a82ce2f96a Fix negative QColor values 2024-08-23 09:43:40 +02:00
568a792f88 Refactor containers names in CObjectClassesHandler 2024-08-23 09:43:40 +02:00
d1aa55de91 Fix rewards not rerolling correctly on reset due to cached variables 2024-08-22 16:38:53 +00:00
K
18a69dfeb5 move CMap::isInTheMap to the header file and make it inline 2024-08-22 14:27:01 +02:00
K
3a27725fcb Optimize CMap::isInTheMap
replace x >= 0 && x < size by (unsigned)x < size

By converting signed coordinate to unsigned number, negative values became
very large positive ones, larger than every positive signed number and
therefore also bigger than the map size. As a result check against size
also implicitly checks if coordinate is negative.

Compiler cannot do this transformation automatically because it doesn't
know that map dimensions are always positive.

The change shrinks isInTheMap from 19 instructions to 11 on x86.
2024-08-22 11:39:24 +02:00
c2290f5f6e fix 2024-08-21 23:01:32 +02:00
ff8a745a50 BattleAI: optional simulation depth 2024-08-21 23:27:42 +03:00
02002ce69d Merge branch 'develop' into resource_generation 2024-08-21 21:52:08 +02:00
43fc741a15 cleaner 2024-08-21 21:24:06 +02:00
8cdfa26fb5 BattleAI: fix bait for archers when need to go long way 2024-08-21 22:18:40 +03:00
4386339354 Fix crash on rmg generation (regression from previous commit) 2024-08-21 18:19:58 +00:00
ff33fbd3a0 Merge pull request #4480 from IvanSavenko/update_prebuilts
Update ffmpeg
2024-08-21 15:57:50 +03:00
2e3e6b1553 market->getObjInstanceID() 2024-08-21 01:01:23 +03:00
d8869a33da remove resource 2024-08-20 22:45:11 +02:00
efcf1e1ba9 Add .ogv (HD Edition) as recognized extension for video 2024-08-20 19:23:55 +00:00
01e55beef1 Merge branch 'develop' into resource_generation 2024-08-20 20:26:52 +02:00
01c14ae9ce Merge branch 'develop' into extended_statistic 2024-08-20 20:25:16 +02: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
39bb6d5f39 IMarket now able to store artifacts 2024-08-20 18:49:47 +03:00
fd45b5144d IMarket serializeable 2024-08-20 18:49:47 +03:00
85f6030c7c Merge pull request #4318 from IvanSavenko/upscaled_render
Support for xBRZ upscaling filter
2024-08-20 14:23:30 +03:00
c2b181dc0c Merge branch 'develop' into resource_generation 2024-08-19 23:43:24 +02:00
17cb45f692 fix 2024-08-19 23:33:23 +02:00
fff0159ef6 resource generation 2024-08-19 23:18:14 +02:00
6fa2bb7e91 Deprecate previously hardcoded buildings 2024-08-19 11:47:13 +00:00
22a126cf2d Restored replacement of town building bonuses via building upgrade 2024-08-19 11:47:13 +00:00
2f3f3c21df Rename town building types to more clear names 2024-08-19 11:47:13 +00:00
abfb467f68 Cleanup old code, add compatibility for 1.5 mods 2024-08-19 11:47:13 +00:00
01a9509ccb Remove unused code, reduce includes 2024-08-19 11:47:13 +00:00
f1e63792f0 Greatly simplify town buildings logic 2024-08-19 11:47:13 +00:00
57430c101f Extracted common properties of buildings into a shared file 2024-08-19 11:47:13 +00:00
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
e7b94014e1 allow lowercase 'X' in spellRangeInHexes 2024-08-18 18:46:54 +02:00
f0448acaa3 TBB is now a dependency of lib. Implemented multithreaded xBRZ scale 2024-08-17 15:25:26 +00:00
4171026035 First iteration of upscaled rendering 2024-08-17 15:25:25 +00:00
0f7c9e7657 Fix config setting blackMarketRestockPeriod.
When set to x it was restocking on all days except every x days.
2024-08-17 11:59:15 +02:00
be42a8c58b Try to fix saving of corrupted random maps 2024-08-15 16:03:00 +00:00
d09fb07362 Use throwing ::at to prevent undefined behavior 2024-08-15 13:14:51 +00:00
5743f151a1 icon drawing 2024-08-15 00:21:02 +02:00
b693ce120a code review 2024-08-14 22:36:54 +02:00
a42afa2910 code review 2024-08-14 21:51:08 +02:00
39aaa6fe32 data to clipboard; simplify types 2024-08-14 21:01:37 +02:00
81b1704e39 Merge branch 'vcmi:develop' into extended_statistic 2024-08-14 20:32:47 +02:00
7964f77f27 fix dragon utopia 2024-08-14 19:55:14 +02:00
ec2163b974 add val; stat at end turn; events 2024-08-14 19:24:40 +02:00
72896d4ed5 Added (mostly) complete schema for validation of rewardable 2024-08-14 17:04:44 +00:00
2151a7fc88 Moved configuration of rewardable town building to 'configuration' entry 2024-08-14 17:04:43 +00:00
fc7554797c Fix reset of configurable building state on new week 2024-08-14 17:04:43 +00:00