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
17,687 Commits 30 Branches 75 Tags
a9e04428c8499ed68c1a571db69eb7372815e350
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko 3a45e6dae1 Merge pull request #4829 from IvanSavenko/msvc_package 
Add support for Win7 and 32-bit msvc+vcpkg builds
 2024-10-28 13:04:45 +02:00
Ivan Savenko a97deea563 Merge pull request #4824 from IvanSavenko/translate_fix 
Fixes for issues with translations
 2024-10-28 12:56:50 +02:00
Ivan Savenko db913d95e0 Merge pull request #4808 from Laserlicht/prism_breath 
Bonus: prism breath
 2024-10-28 12:29:41 +02:00
Ivan Savenko dace4075e4 Changes according to review 2024-10-27 19:37:04 +00:00
Ivan Savenko c2e49bd10a Merge pull request #4821 from IvanSavenko/flaggable 
Basic support for configurable flaggable objects
 2024-10-27 21:19:22 +02:00
Ivan Savenko 7132ee560d Merge pull request #4822 from mikeiit/fix_launcher_automatic_scaling 
Hide launcher interface scaling spin box
 2024-10-27 21:18:44 +02:00
Ivan Savenko 10b411aa68 Update launcher/settingsView/csettingsview_moc.cpp 2024-10-27 21:17:46 +02:00
Ivan Savenko 2af4c48ab6 Merge pull request #4823 from GeorgeK1ng/develop 
Fixed spacing between sentences
 2024-10-27 21:16:33 +02:00
Ivan Savenko 2fa0021c28 Merge pull request #4825 from godric3/map-editor-fix-copying-town 
Map editor: fix duplicated spells in copy-pasted town
 2024-10-27 21:16:23 +02:00
Ivan Savenko 3a4ed1e351 Merge pull request #4826 from godric3/map-editor-use-vcmi-versioning 
Don't use separate versioning for map editor
 2024-10-27 21:16:08 +02:00
Ivan Savenko 2ca6f09621 Try to speed up msvc CI 2024-10-27 11:08:03 +00:00
Ivan Savenko b7d4ffab79 Add support for Win7 and 32-bit msvc+vcpkg builds 2024-10-27 09:32:30 +00:00
Ivan Savenko 939e8b4105 Fix json formatting 2024-10-26 14:21:41 +00:00
Ivan Savenko ec3acec8cc Implemented JSON5 line ending escapings 2024-10-26 14:21:23 +00:00
Ivan Savenko 72b0062ae3 Better integration of wog commanders translation 2024-10-26 14:21:05 +00:00
Ivan Savenko d1164ab9a9 Integrated exchange window translation into vcmi 2024-10-26 13:09:09 +00:00
Ivan Savenko 87d841db83 Moved translatable strings to VCMI mod, spaces -> tabs 2024-10-26 12:55:10 +00:00
Ivan Savenko 565c02d61c Added 'translate missing' command for convenience 2024-10-26 12:54:35 +00:00
Ivan Savenko e5739e49da Fix translation of bank names 2024-10-26 11:39:06 +00:00
Ivan Savenko 638bc174c3 Fix crash on exporting maps for translation 2024-10-25 21:41:24 +00:00
Ivan Savenko c43844706e Implemented translation support for random map descriptions 2024-10-25 20:41:19 +00:00
Ivan Savenko 26fecbf2ca Simplify income calculation in kingdom overview, account for flaggables 2024-10-25 19:08:13 +00:00
Ivan Savenko 7ae5e2b406 Added support for daily income to flaggable objects 2024-10-25 19:01:00 +00:00
Ivan Savenko 93096dc63c Updated documentation 2024-10-25 18:47:19 +00:00
Ivan Savenko ee59bc4e71 Add bonus description generation for map objects 2024-10-25 18:36:02 +00:00
Ivan Savenko 8a5ac73438 Basic support for configurable flaggable objects 
Converted CGLighthouse class into FlaggableMapObject

Bonus provided by Lighthouse/Flaggable is now defined in config and is
accessible to mods.
 2024-10-25 16:48:10 +00:00
Ivan Savenko 1826b5bbdf Merge pull request #4802 from Laserlicht/crash_fix 
fix crash & shortcut & layout
 2024-10-23 22:23:33 +03:00
Ivan Savenko f13b5da687 Merge pull request #4796 from nickhuang99/develop 
Building dependence of Unicorn Glide in Rampart should include Dendro…
 2024-10-23 22:22:32 +03:00
Ivan Savenko 9ba7e227ec Merge pull request #4801 from Laserlicht/fix_mp3 
fix for defect mp3
 2024-10-23 22:21:23 +03:00
Ivan Savenko 0c8a529876 Merge pull request #4797 from GeorgeK1ng/develop 
Updated Czech translation
 2024-10-23 22:20:52 +03:00
Ivan Savenko 246ee0f933 Merge pull request #4803 from XCOM-HUB/patch-6 
Update swedish.json
 2024-10-23 22:20:22 +03:00
Ivan Savenko 6dc6cc4cbf Merge pull request #4786 from GeorgeK1ng/develop 
Updated Czech translation
 2024-10-17 17:41:30 +03:00
Ivan Savenko c25aef8f48 Merge pull request #4766 from SoundSSGood/fused-artifacts 
Fused artifacts
 2024-10-16 15:08:20 +03:00
Ivan Savenko 44963f991b Merge pull request #4782 from Olegmods/develop 
Ship obstacles fix
 2024-10-16 15:08:02 +03:00
Ivan Savenko 52e0899d6f Merge pull request #4780 from Laserlicht/text_pos_fix 
fix: campaign video scrolling for short texts
 2024-10-15 18:01:52 +03:00
Ivan Savenko e676e78e28 Merge pull request #4778 from Laserlicht/assert_fix 
fix: workaround for assert
 2024-10-15 18:01:31 +03:00
Ivan Savenko c4e708831c Merge pull request #4777 from Laserlicht/backround_voice 
fix: lower background music while campaign audio plays
 2024-10-15 18:01:17 +03:00
Ivan Savenko da0ec2c607 Merge pull request #4776 from Laserlicht/audio_playback 
fix: audio playback after using Back button
 2024-10-15 18:00:44 +03:00
Ivan Savenko 60fe8a05b9 Merge pull request #4775 from dydzio0614/map-editor-event-day-fix 
Count days from 1 instead of 0 in map editor timed event UI
 2024-10-15 18:00:23 +03:00
Ivan Savenko 94a0de716a Merge pull request #4772 from Laserlicht/mixer_audio_duration 
fix: use sdl mixer to get audio duration
 2024-10-14 21:51:49 +03:00
Ivan Savenko abf9d1017e Merge pull request #4705 from Laserlicht/adv_search 
map object search
 2024-10-14 21:51:41 +03:00
Ivan Savenko 604e3b5c67 Merge pull request #4763 from IvanSavenko/herohandler_split 
Split CHeroHandler.cpp/.h into 1 file per class
 2024-10-14 19:05:48 +03:00
Ivan Savenko 2c14b8fa98 Merge pull request #4706 from altiereslima/develop 
Update Portuguese Translation
 2024-10-14 18:33:39 +03:00
Ivan Savenko cee3521f57 Merge pull request #4770 from IvanSavenko/prison_fix 
Fix for loading hero types / identities
 2024-10-14 18:16:53 +03:00
Ivan Savenko 678e6b47f8 Merge pull request #4756 from IvanSavenko/sonar_fixes 
Fix some of the new warnings from sonarcloud
 2024-10-14 18:16:41 +03:00
Ivan Savenko 856da004d1 Merge pull request #4768 from ToRRent1812/patch-2 
Update polish.json
 2024-10-14 18:16:27 +03:00
Ivan Savenko b058104ccc Merge pull request #4757 from XCOM-HUB/patch-5 
Update swedish.json
 2024-10-14 18:16:16 +03:00
Ivan Savenko 5894d51f89 Merge pull request #4545 from vcmi/update_prebuilts 
Update conan prebuilt package
 2024-10-14 18:04:13 +03:00
Ivan Savenko ccd0edf13d Changes according to review 2024-10-14 13:23:48 +00:00
Ivan Savenko 55e79b1b96 Remove Android CI workaround 2024-10-14 13:23:19 +00:00
Ivan Savenko 34447fd844 Fix missing standard libraries from package on mingw 2024-10-14 13:05:10 +00:00
Ivan Savenko 55916fad0a Fix libpng linkage - shared on all platforms other than iOS 2024-10-14 13:05:10 +00:00
Ivan Savenko ab2c5ba64f Add workaround for Android NDK installed via conan - required for 
correct stripping of resulting binaries
 2024-10-14 13:05:10 +00:00
Ivan Savenko 6b1fd428bd Use shared setup file for 32 and 64 bit bingw 2024-10-14 13:05:10 +00:00
Ivan Savenko eb06eb15cd Clean up workflow 2024-10-14 13:05:10 +00:00
Ivan Savenko a63d3a11c4 Simplify cpack logic 2024-10-14 13:05:10 +00:00
Ivan Savenko 2506490db4 Use python provided in CI runner image instead of installing via action 2024-10-14 13:05:10 +00:00
Ivan Savenko 9a1f26883d Update documentation 2024-10-14 13:05:10 +00:00
Ivan Savenko 06cd74dde6 Use new path to the script 2024-10-14 13:05:10 +00:00
Ivan Savenko 501622229d Use new prebuilts package 2024-10-14 13:05:10 +00:00
Ivan Savenko 2d2bc8293f Delete old coverity files 2024-10-14 13:05:10 +00:00
Ivan Savenko ecf063cd1c Reorganized layout of CI directory, move all before_install files into 
common directory, remove copy-pasted files
 2024-10-14 13:05:10 +00:00
Ivan Savenko 289ed742d0 Disable unused boost_url 2024-10-14 13:05:10 +00:00
Ivan Savenko a64f1f1232 Use newer SDL libraries 2024-10-14 13:05:10 +00:00
Ivan Savenko 0e1d5274ba Generate aab's only for builds on master branch 2024-10-14 13:05:09 +00:00
Ivan Savenko 4dc521743c Install dependencies as separate CI step 2024-10-14 13:05:09 +00:00
Ivan Savenko 1623afd35d Use Ubuntu 24.04 for mingw builds 2024-10-14 13:05:09 +00:00
Ivan Savenko b3c5e0680d Install ninja for ios CI builds 2024-10-14 13:05:09 +00:00
Ivan Savenko 10ad0fc760 Split CHeroHandler.cpp/.h into 1 file per class 
All parts of CHeroHandler.cpp are now in lib/entities/hero
Adjusted includes to use new paths
No functionality changes
 2024-10-13 14:01:09 +00:00
Ivan Savenko ad7f0416a7 Added overloaded version of getObjectHandler to CGHeroInstance 2024-10-13 13:06:31 +00:00
Ivan Savenko 184d8de82e Fix typo in assertion 2024-10-13 13:06:07 +00:00
Ivan Savenko 31095248ab Removed typeName and subtypeName properties from CGObjectInstance 2024-10-13 13:05:50 +00:00
Ivan Savenko 4bdc503186 Workaround for prison hero reset on loading map in editor 2024-10-13 08:28:37 +00:00
Ivan Savenko 5d2f3c0f86 Merge pull request #4764 from kdmcser/develop 
do lupdate and update Chinese translation
 2024-10-12 11:15:43 +03:00
Ivan Savenko 7866179a01 Merge pull request #4762 from IvanSavenko/bugfixing 
Fixes for recently reported bugs and regressions
 2024-10-11 19:31:00 +03:00
Ivan Savenko c55a75cc4e Remove copy-pasted code in rewardable town building leading to hero not 
registered as visitor
 2024-10-11 15:02:48 +00:00
Ivan Savenko d1e7cb72c2 Fix game gang on random map generation 2024-10-11 15:02:14 +00:00
Ivan Savenko e221cdccab Fix initialization of hero type in map editor 2024-10-11 15:01:55 +00:00
Ivan Savenko 115439f16a Fix town events not actually giving offered creatures 2024-10-11 15:01:18 +00:00
Ivan Savenko e14ea4d7fc Merge pull request #4754 from heroesiiifan/patch-7 
Fix video missing error due typo
 2024-10-11 13:52:04 +03:00
Ivan Savenko a8e84c55f6 Fix some of the new warnings from sonarcloud 2024-10-11 10:45:29 +00:00
Ivan Savenko e0e01d678a Merge pull request #4753 from IvanSavenko/misc_fixes 
Fixes for regressions from recent PR's
 2024-10-11 00:32:45 +03:00
Ivan Savenko bc5b8d071f Merge pull request #4751 from Laserlicht/patch-3 
fix campaign name
 2024-10-11 00:22:23 +03:00
Ivan Savenko d5663c8948 Fix broken layout in "Mod Validation" option 2024-10-10 21:19:56 +00:00
Ivan Savenko 6bed497f2c Fix mod validation reporting failure for well-formed mods 2024-10-10 21:18:43 +00:00
Ivan Savenko dfff1eae26 Fix crash on losing a hero 2024-10-10 21:16:41 +00:00
Ivan Savenko 51838f020b Merge pull request #4750 from IvanSavenko/savename_fix 
Fixes missing names of saves and custom campaigns
 2024-10-10 22:41:16 +03:00
Ivan Savenko 341ef633a5 Fixes missing names of saves and custom campaigns 2024-10-10 16:05:50 +00:00
Ivan Savenko 1fc0267ad1 Merge pull request #4748 from IvanSavenko/ci_fix 
Quick workaround for failing Android CI
 2024-10-10 16:52:55 +03:00
Ivan Savenko 15ad0440f7 Fix iOS build 2024-10-10 12:38:32 +00:00
Ivan Savenko 77cd08d66a Quick workaround for failing Android CI 2024-10-10 12:31:06 +00:00
Ivan Savenko 22ac88ecc4 Merge pull request #4731 from IvanSavenko/reduce_pointers 
Reduce usage of pointers to VLC entities
 2024-10-10 15:29:40 +03:00
Ivan Savenko 3dd4fa2528 Reduce usage of pointers to VLC entities 
Final goal (of multiple PR's) is to remove all remaining pointers from
serializeable game state, and replace them with either identifiers or
with shared/unique pointers.

CGTownInstance::town and CGHeroInstance::type members have been removed.
Now this data is computed dynamically using subID member.

VLC entity of a town can now be accessed via following methods:
- getFactionID() returns ID of a faction
- getFaction() returns pointer to a faction
- getTown() returns pointer to a town

VLC entity of a hero can now be accessed via following methods:
- getHeroTypeID() returns ID of a hero
- getHeroClassID() returns ID of a hero class
- getHeroType() returns pointer to a hero
- getHeroClass() returns pointer to a hero class
 2024-10-10 12:28:08 +00:00
Ivan Savenko 81f0222c68 Merge pull request #4741 from IvanSavenko/serialize_local_state 
Serialize local state of player interface
 2024-10-10 15:03:14 +03:00
Ivan Savenko 5aebf287b9 Merge pull request #4735 from IvanSavenko/private_pos 
Reduce usages of ambiguos CGObjectInstance::pos
 2024-10-10 15:00:50 +03:00
Ivan Savenko 3113b7f60a Merge pull request #4704 from IvanSavenko/video_autodetect 
Enable autodetection of video scaling parameters
 2024-10-10 15:00:40 +03:00
Ivan Savenko 7f6a80ed47 Merge pull request #4738 from IvanSavenko/external_audio 
Loading separate audio file in place of audio stream embedded in video
 2024-10-10 14:58:04 +03:00
Ivan Savenko 92db0259c3 Merge pull request #4747 from IvanSavenko/mod_compat_fix 
Fixes for loading 1.5 mods in vcmi 1.6
 2024-10-10 14:57:47 +03:00
Ivan Savenko 0fcd300008 Merge pull request #4746 from Laserlicht/multiple_small_fixes 
small fixes
 2024-10-10 14:57:37 +03:00
Ivan Savenko 28bc38c94f Merge branch 'develop' into multiple_small_fixes 2024-10-10 14:57:30 +03:00