1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

16872 Commits

Author SHA1 Message Date
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
Ivan Savenko
ff33fbd3a0
Merge pull request #4480 from IvanSavenko/update_prebuilts
Update ffmpeg
2024-08-21 15:57:50 +03:00
Ivan Savenko
2a84627fd2
Merge pull request #4444 from Laserlicht/extended_statistic
Statistics
2024-08-21 15:18:17 +03:00
Ivan Savenko
4ac1b1169a Update developers documentation to point to new prebuilts location 2024-08-21 12:14:08 +00:00
Ivan Savenko
e70ab86995 Use .txz archive for dependencies 2024-08-20 20:42:11 +00:00
Ivan Savenko
f4547a9434 Add documentation regarding supported by vcmi formats 2024-08-20 19:23:55 +00:00
Ivan Savenko
efcf1e1ba9 Add .ogv (HD Edition) as recognized extension for video 2024-08-20 19:23:55 +00:00
Ivan Savenko
1ac63056dc Unify code for conan dependencies installation 2024-08-20 19:23:55 +00:00
Ivan Savenko
50a4e3213d Fix ffmpeg deprecation 2024-08-20 19:23:55 +00:00
Ivan Savenko
720d6076a0 Use new dependencies packages 2024-08-20 19:23:55 +00:00
Ivan Savenko
373f8526f2 Changed options of ffmpeg in conan:
- updated options to include new options added in upstream
- enabled swresample to allow audio resampling via ffmpeg instead of
custom methods
- disabled all components other than those that are needed for vcmi
- changed required version to allow newer ffmpeg versions
- added lzma as explicit dependency (used by innoextract)
2024-08-20 19:23:50 +00:00
Laserlicht
0901286f9d
fix 2024-08-20 20:38:38 +02:00
Laserlicht
01c14ae9ce
Merge branch 'develop' into extended_statistic 2024-08-20 20:25:16 +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
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
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
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