games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
16,972 Commits 30 Branches 75 Tags
e9131538dd1a79eb7cc0dae2fe8bf30078f37219
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko 2ffce4a7c2 Merge pull request #4503 from IvanSavenko/simple_register_types 
Simplify logic of types registration for serialization
 2024-08-27 00:25:07 +03:00
Ivan Savenko f765f212bb Restore save compatibility 2024-08-26 20:52:37 +00:00
Ivan Savenko ac271c09b9 Add mechanism to provide save compatibility if class is removed or 
addded
 2024-08-26 20:06:36 +00:00
Ivan Savenko c64dcfaa0f Fix build 2024-08-26 20:06:36 +00:00
Ivan Savenko 77faa14119 Added explicit indexing of type indexes for serialization 2024-08-26 20:06:35 +00:00
Ivan Savenko 01396b62b7 Extracted handling of type ID's from serializer into a separate class 2024-08-26 19:48:46 +00:00
Ivan Savenko 232a759db7 Remove type registration from library pack applying 2024-08-26 19:48:46 +00:00
Ivan Savenko b84af1a6de Significantly simplify packs applying 
Apparently our logic for packs applying with types registration is
overcomplicated and by now completely unnecessary - it became redundant
after introduction of visitor pattern.
 2024-08-26 19:48:46 +00:00
Ivan Savenko 11e8b04ac5 Merge pull request #4463 from SoundSSGood/IMarket-refactoring 
IMarket refactoring
 2024-08-26 22:48:23 +03:00
Ivan Savenko 7b746bcaec Merge pull request #4496 from Laserlicht/statistic_improve 
Statistics improve
 2024-08-26 19:12:56 +03:00
Ivan Savenko 897bc65e64 Merge pull request #4508 from kaja47/dead-code-must-die 
remove never used code in CBonusSystemNode
 2024-08-26 19:11:03 +03:00
Ivan Savenko e65eaf0e06 Merge pull request #4506 from mikeiit/add_missisng_stack_artifact_description 
Added missing stack artifact description
 2024-08-26 19:10:48 +03:00
Ivan Savenko 3d39963a1c Merge branch 'master' into 'develop' 2024-08-26 14:01:00 +00:00
Ivan Savenko a3e33215e3 Merge pull request #4510 from vcmi/beta 
Merge beta -> master
 2024-08-26 00:27:47 +03:00
Ivan Savenko 6fbfcef99e Merge pull request #4509 from IvanSavenko/update_157 
Cherry-pick spellcasting fix and bump release date
 2024-08-25 23:10:43 +03:00
Ivan Savenko a7d4df9c33 Update release date to monday 2024-08-25 19:42:25 +00:00
Ivan Savenko a819c3fc29 Merge pull request #4482 from MichalZr6/mapeditor_fixes 
Mapeditor refactor, fixes and additional validation checks
 2024-08-24 16:18:53 +03:00
Ivan Savenko 6d8bc9b859 Merge pull request #4500 from MichalZr6/allow_dialogs_when_in_battle 
Allow dialogs when in battle interface but not on the players turn
 2024-08-24 16:18:20 +03:00
Ivan Savenko 51fafe66cb Merge pull request #4485 from kaja47/opto-isinthemap 
Optimize CMap::isInTheMap
 2024-08-24 16:06:44 +03:00
Ivan Savenko c22820f484 Merge pull request #4484 from Laserlicht/text_len 
campaign text length
 2024-08-24 16:06:31 +03:00
Ivan Savenko 3e605253db Merge pull request #4481 from Laserlicht/fix_hota 
fix for 8th creature
 2024-08-24 16:06:12 +03:00
Ivan Savenko 9a7a01186b Merge pull request #4477 from kdmcser/develop 
update Chinese translation
 2024-08-24 16:05:56 +03:00
Ivan Savenko f1be5b0e93 Merge pull request #4499 from vcmi/beta 
Merge beta -> master
 2024-08-23 18:33:01 +03:00
Ivan Savenko f2592c20db Merge pull request #4497 from IvanSavenko/beta_fix 
Add missing changes from master branch to beta
 2024-08-23 17:15:11 +03:00
Ivan Savenko 45558552d6 Merge 'vcmi/beta' into beta_fix 2024-08-23 13:18:09 +00:00
Ivan Savenko 457a1bc746 Merge pull request #4494 from IvanSavenko/android_buildid_hack 
Android buildid increment hack
 2024-08-22 23:48:33 +03:00
Ivan Savenko 9e3c149d6d Add hack to auto-increment build ID for x64 android build 2024-08-22 20:12:42 +00:00
Ivan Savenko fd73116a08 Merge pull request #4491 from IvanSavenko/fixes_157 
[1.5.7] Minor fixes
 2024-08-22 21:04:03 +03:00
Ivan Savenko 2dd752bbb8 Update changelog 2024-08-22 16:42:59 +00:00
Ivan Savenko b6cc409772 Fix excessive removal of dialogs, e.g. new week or timed events 2024-08-22 16:39:30 +00:00
Ivan Savenko d1aa55de91 Fix rewards not rerolling correctly on reset due to cached variables 2024-08-22 16:38:53 +00:00
Ivan Savenko 33a5e9e05f Merge pull request #4488 from IvanSavenko/release_157 
Preparation for release 1.5.7
 2024-08-22 17:39:52 +03:00
Ivan Savenko 427a583f1e Preparation for release 1.5.7 2024-08-22 13:27:25 +00:00
Ivan Savenko fb37b9e08b Merge pull request #4454 from IvanSavenko/hotfix 
[1.5.X] Changes for a potential hotfix
 2024-08-22 16:11:28 +03:00
Ivan Savenko 4386339354 Fix crash on rmg generation (regression from previous commit) 2024-08-21 18:19:58 +00:00
Ivan Savenko 475a20124f Fix crash on right-clicking spell component in some dialogs 2024-08-21 18:19:31 +00: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
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 6a6c13471c Try more robust approach for waiting dialogs in battles in MP 2024-08-19 18:20:11 +00: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 b94a61c255 Try to fix battle startup if player has waiting dialogs 2024-08-19 15:21:45 +00: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
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
Ivan Savenko 85bb133561 Fix transparency on dialog box corners when xBRZ is in use 2024-08-17 15:25:26 +00:00
Ivan Savenko 0f4bd7253d Fix adventure map rendering 2024-08-17 15:25:26 +00:00
Ivan Savenko 954b6b0947 Implemented scaling of mouse input events 2024-08-17 15:25:26 +00:00
Ivan Savenko 748a3a1b64 Fixed minimap generation when upscaled mode is used 2024-08-17 15:25:26 +00:00
Ivan Savenko b527c0d09e Fix warnings in xBRZ 2024-08-17 15:25:26 +00:00
Ivan Savenko 4838b51b9d Convert xbrz.cpp to utf-8 2024-08-17 15:25:26 +00:00
Ivan Savenko 0529b80bc9 Use unix file endings for xBRZ 2024-08-17 15:25:26 +00:00
Ivan Savenko 020a825ecd TTF fonts will now be rendered correctly in upscaling mode 
Note that TTF rendering bypasses xBRZ - TTF fonts are rendered at larger
point size
 2024-08-17 15:25:26 +00:00
Ivan Savenko fa65b0019c First working version of xBRZ upscaler 2024-08-17 15:25:26 +00:00
Ivan Savenko 4171026035 First iteration of upscaled rendering 2024-08-17 15:25:25 +00:00
Ivan Savenko 7f5cd8a7aa newSurface method now accepts Point instead of two integers 2024-08-17 15:25:25 +00:00
Ivan Savenko 20ba63bba3 Added xBRZ 1.8 library to source code 2024-08-17 15:25:25 +00:00
Ivan Savenko 11ac768599 Merge pull request #4457 from mikeiit/bug_double_dialog_7_days 
Removed Redundant Info Window
 2024-08-17 12:59:47 +03:00
Ivan Savenko 513e233c16 Merge pull request #4449 from IvanSavenko/changelog_update 
Updated changelog with new changes
 2024-08-17 12:48:18 +03:00
Ivan Savenko 55a61956c9 Updated changelog with new changes 2024-08-15 19:45:44 +00:00