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
12,935 Commits 30 Branches 75 Tags
f50f32fade02432d77e8def412f9b313718e3587
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Filipenkov 1da06e04cc fix "development mode" condition when building in single process mode 2023-04-05 20:22:29 +03:00
Andrey Filipenkov 41696d6692 Merge pull request #1850 from kambala-decapitator/conan-docs-arm-mac 
[Conan][docs] improve using prebuilt binaries for Apple Silicon
 2023-04-05 18:56:37 +03:00
Andrey Filipenkov fdf7fab2d4 [Conan][docs] improve using prebuilt binaries for Apple Silicon 2023-04-02 13:58:03 +03:00
Andrey Filipenkov 40c9b26331 [vcmibuilder] fix default destination directory on macOS 2023-04-01 14:25:26 +03:00
Andrey Filipenkov 6382e0a3a0 Merge pull request #1743 from rilian-la-te/russian-translation 
vcmi: russian
 2023-03-22 13:48:48 +03:00
Andrey Filipenkov 147633bd9d compute movement cost using PathNodeInfo layer info when possible 2023-03-20 11:35:20 +03:00
Andrey Filipenkov a0cd69e944 Slight refactoring of CGHeroInstance::movementPointsAfterEmbark() 2023-03-20 11:35:20 +03:00
Andrey Filipenkov aae9e70771 remove duplicate call 
already performed in CPathfinderHelper constructor
 2023-03-20 11:35:19 +03:00
Andrey Filipenkov 8f638e7ca6 [editor] fix Player Settings crash when random town is added to a map 
fixes #1714
 2023-03-20 11:35:19 +03:00
Andrey Filipenkov 3602645a30 improve iterating over EPathfindingLayer 2023-03-20 11:35:19 +03:00
Andrey Filipenkov c0c19557af fix method documentation 2023-03-20 11:35:19 +03:00
Andrey Filipenkov 8f843d0bff fix typos 2023-03-20 11:35:19 +03:00
Andrey Filipenkov 68f5c1de79 improve variable names in CPathfinderHelper::getNeighbours() 2023-03-20 11:35:19 +03:00
Andrey Filipenkov bfb0dc26d5 fix movement cost on roads 2023-03-20 11:35:19 +03:00
Andrey Filipenkov 0c7b5ac793 fix movement cost on Favorable Winds 2023-03-20 11:35:19 +03:00
Andrey Filipenkov 3fbdc3b198 improve code that checks last possible tile 2023-03-20 11:35:18 +03:00
Andrey Filipenkov 21463f1c0e fix movement cost with Fly 2023-03-19 11:26:55 +03:00
Andrey Filipenkov 43e89523a9 Merge pull request #1716 from rilian-la-te/tw-fix 
TotalValue: fix typo
 2023-03-19 11:25:48 +03:00
Andrey Filipenkov f2fc01f8bf Merge pull request #1648 from kambala-decapitator/fix-android-upload 
fix uploading Android APK to server
 2023-03-06 22:41:55 +03:00
Andrey Filipenkov 456ede5b17 fix uploading Android APK to server 2023-03-06 21:29:46 +03:00
Andrey Filipenkov c62d945b2d fix downloading mods on Android 4.4 
fixes TLS issue
 2023-03-04 14:35:56 +03:00
Andrey Filipenkov cd454143be update SDL Java classes to v2.26.1 2023-03-02 13:54:23 +03:00
Andrey Filipenkov 2b3fac0b29 build Android as single process by default 2023-03-02 12:14:01 +03:00
Andrey Filipenkov 137e5407c7 remove unused class 2023-03-02 12:09:49 +03:00
Andrey Filipenkov b7fca27f02 remove no-op button 2023-03-02 12:09:49 +03:00
Andrey Filipenkov 785e5237ff remove unused method 2023-03-02 12:09:49 +03:00
Andrey Filipenkov c295c81bf2 [Conan] add validate method to catch incorrect combination of options 2023-03-02 12:09:49 +03:00
Andrey Filipenkov 5dd301efd2 add "building for Android from source" wiki link to the readme 2023-03-02 12:09:49 +03:00
Andrey Filipenkov e15d0a49fd [Conan][docs] add Android info 2023-03-02 12:09:49 +03:00
Andrey Filipenkov 4a6c3190b1 [Conan][docs] document how to build against system libraries 2023-03-02 12:09:49 +03:00
Andrey Filipenkov 0294a8b063 enable StupidAI and EmptyAI for static AI 2023-03-02 12:09:49 +03:00
Andrey Filipenkov c31a9f7f5d ignore ENABLE_LAUNCHER and ENABLE_EDITOR options on Android 2023-03-02 12:09:49 +03:00
Andrey Filipenkov fd56f86a84 introduce VCMI_MOBILE macro 2023-03-02 12:09:49 +03:00
Andrey Filipenkov 299bf93390 [CI] configure android builds 2023-03-02 12:09:48 +03:00
Andrey Filipenkov 3c2fd7f1b8 fix build signing 2023-03-02 12:09:48 +03:00
Andrey Filipenkov dad5b93706 fix fetching git info from Gradle 2023-03-02 12:09:48 +03:00
Andrey Filipenkov c960cb0506 add variant for daily builds 2023-03-02 12:09:48 +03:00
Andrey Filipenkov a1fd874243 give debug package separate app ID and name 
allows installing debug version alongside the store one
 2023-03-02 12:09:48 +03:00
Andrey Filipenkov d05fffbad7 remove CMake calls from Gradle config 2023-03-02 12:09:48 +03:00
Andrey Filipenkov 313d479d42 fix using JNI from server in single process build 2023-03-02 12:09:48 +03:00
Andrey Filipenkov c4e7e91850 fix single process build for Android 2023-03-02 12:09:48 +03:00
Andrey Filipenkov 71d51beab2 change static AI approach to use static libvcmi 
- now links to static AI lib targets
- solves uncaught boost exception on closing server
 2023-03-02 12:09:48 +03:00
Andrey Filipenkov 4c19d8794d add option to compile AI code into libvcmi directly 
- used on Android by default
- AI sources and libs are propagated to upper level with set(... PARENT_SCOPE)
 2023-03-02 12:09:48 +03:00
Andrey Filipenkov 8d2064cbfe remove manual loading of dependent libs from Java 
no longer needed in >= Android 4.4 (API level 19)
 2023-03-02 12:09:48 +03:00
Andrey Filipenkov 2ced633ad8 refactor VCMIDirs for Android 
removes inheritance from VCMIDirsXDG to get rid of defining M_*_DIR variables
 2023-03-02 12:09:47 +03:00
Andrey Filipenkov 5b1f3bf0db use JNIEnv object from SDL instead of forwarding from Java for Client 2023-03-02 12:09:47 +03:00
Andrey Filipenkov 2a28109f2d fix indentation 2023-03-02 12:09:47 +03:00
Andrey Filipenkov 970bd6ed34 adjust project for Android (except AI) 2023-03-02 12:09:47 +03:00
Andrey Filipenkov 5ba3a9a5fa [Conan] split dependencies based on project parts 2023-03-02 12:09:47 +03:00
Andrey Filipenkov 0621dce157 [Conan] add Android support 2023-03-02 12:09:47 +03:00
Andrey Filipenkov 960fd91b15 fix double space in string 2023-03-02 12:09:47 +03:00
Andrey Filipenkov 1c9052ed1b remove unused string 2023-03-02 12:09:47 +03:00
Andrey Filipenkov bf53c4c334 fix some Russian strings 2023-03-02 12:09:47 +03:00
Andrey Filipenkov 7d4f8ab70d add existing android files 2023-03-02 12:09:47 +03:00
Andrey Filipenkov cc966902cd Merge pull request #1618 from kambala-decapitator/ci-ignore-upload-failure 
prevent CI cancelling other jobs when upload step fails
 2023-02-27 11:10:46 +03:00
Andrey Filipenkov 883aeccfe7 prevent CI cancelling other jobs when upload step fails 2023-02-27 10:15:27 +03:00
Andrey Filipenkov 3e6c33e465 Merge pull request #1617 from kambala-decapitator/fix-uploads 
fix uploads of artifacts to VCMI server
 2023-02-26 23:13:59 +03:00
Andrey Filipenkov 05864821e4 fix uploads of artifacts to VCMI server 2023-02-26 21:38:12 +03:00
Andrey Filipenkov ddd9dcc918 Merge pull request #1607 from kambala-decapitator/FileStream-minizip 
remove copy-pasted ioapi.c functions from FileStream.cpp
 2023-02-24 16:11:35 +03:00
Andrey Filipenkov 176dfca578 fix indentation 2023-02-24 13:42:26 +03:00
Andrey Filipenkov e6d87d5f35 wrap FileStream's helper functions into anonymous namespace 2023-02-24 13:42:26 +03:00
Andrey Filipenkov 85d1909ac5 remove copy-pasted functions from ioapi.c 2023-02-24 13:42:26 +03:00
Andrey Filipenkov bb81bde2be Merge pull request #1602 from kambala-decapitator/conan-foce-v1 
force Conan to use v1
 2023-02-22 14:41:55 +03:00
Andrey Filipenkov a3eedbafbe [Conan] lock to v1 2023-02-22 14:00:53 +03:00
Andrey Filipenkov f128404770 simplify creating client target 2023-02-22 14:00:53 +03:00
Andrey Filipenkov cc31c4aa3f remove unused macro 2023-02-22 14:00:53 +03:00
Andrey Filipenkov b0c109d5f7 use target from variable 2023-02-22 14:00:52 +03:00
Andrey Filipenkov 499f870679 [CI] save artifact file directly 
no longer zips whole directory hierarchy out/build/...
 2023-02-22 14:00:52 +03:00
Andrey Filipenkov 59948a41a6 use std::call_once instead of bool flag 2023-02-22 14:00:50 +03:00
Andrey Filipenkov 07dc2e1c48 Merge pull request #1496 from kambala-decapitator/resurrect-message 
show resurrect message in the battle log
 2023-01-29 22:18:32 +03:00
Andrey Filipenkov 783174c2af Merge pull request #1523 from rilian-la-te/fix-ios-ci 
suppress warning on iOS
 2023-01-29 22:17:43 +03:00
Andrey Filipenkov 612b5e2746 attempt to show shipyard dialog only when a hero is selected 
fixes regression from a4e8255cbc
 2023-01-25 20:49:37 +03:00
Andrey Filipenkov 7e78e0abdc Merge pull request #1493 from kambala-decapitator/ios-spacebar 
[iOS] use pinch gesture as Spacebar hotkey instead of Tab
 2023-01-25 18:32:40 +03:00
Andrey Filipenkov a2ac189e03 fix typo 2023-01-25 18:13:11 +03:00
Andrey Filipenkov 0bbf70f30a show resurrect message in the battle log 2023-01-25 18:13:06 +03:00
Andrey Filipenkov 54537fc02c Merge pull request #1478 from kambala-decapitator/units-huge-numbers 
limit displayed units number to 4 digits
 2023-01-25 17:47:08 +03:00
Andrey Filipenkov 785d565f31 Merge pull request #1483 from kambala-decapitator/statue-of-legion-bonus 
fix displaying growth bonus from Statue of Legion
 2023-01-25 17:45:30 +03:00
Andrey Filipenkov b2d2c7a2dc Merge pull request #1501 from kambala-decapitator/townportal-doubleclick 
handle double-click in Town Portal dialog
 2023-01-25 17:42:15 +03:00
Andrey Filipenkov 18c52f05ca Merge pull request #1506 from kambala-decapitator/cmake-zip-ipa 
generate ipa file with CPack directly
 2023-01-25 17:41:10 +03:00
Andrey Filipenkov 035851bb38 add max version condition to Xcode workaround 2023-01-24 20:18:09 +03:00
Andrey Filipenkov 9addc83a6b generate ipa file with CPack directly 2023-01-24 20:10:57 +03:00
Andrey Filipenkov 90cb0cdc9b fix displaying growth bonus from Statue of Legion 2023-01-24 18:35:30 +03:00
Andrey Filipenkov 5b10903116 reorder growth bonuses display to match oh3 2023-01-24 18:35:07 +03:00
Andrey Filipenkov 08b04a3527 handle double-click in Town Portal dialog 2023-01-23 15:43:55 +03:00
Andrey Filipenkov 11ec500dff [iOS] use pinch gesture as Spacebar hotkey instead of Tab 2023-01-22 15:37:48 +03:00
Andrey Filipenkov 7b2540517b fix Main Thread Checker warnings on Apple platforms 2023-01-21 16:07:35 +03:00
Andrey Filipenkov 919c592e67 fix closing Buy Boat dialog with Escape button 2023-01-21 16:00:29 +03:00
Andrey Filipenkov a4e8255cbc allow opening Buy Boat dialog on clicking shipyard on advmap when a town is selected 2023-01-21 15:58:12 +03:00
Andrey Filipenkov 2a43b7cfbc display owner of ownable objects in tooltip 
also displays owner of towns (deviation from oh3)
 2023-01-21 14:25:43 +03:00
Andrey Filipenkov 6727a3673f limit displayed units number to 4 digits on adventure map 
- garrison view (hero, town)
- small hero window
 2023-01-20 20:40:28 +03:00
Andrey Filipenkov 6f0cd37e8f limit displayed units number to 4 digits in battle 
- unit box
- turn queue
 2023-01-20 20:38:54 +03:00
Andrey Filipenkov 1b3c07eda4 buy units starting from the highest level in the "buy all units" dialog 2023-01-20 15:14:15 +02:00
Andrey Filipenkov 2de48624bc [iOS] fix linking QtCore 2023-01-15 17:28:09 +02:00
Andrey Filipenkov 2f14914120 fix Boost deprecation warnings 
warnings introduced in v1.81

# Conflicts:
#	mapeditor/resourceExtractor/ResourceConverter.cpp
 2023-01-15 17:28:09 +02:00
Andrey Filipenkov efbed6000b fix typo 2023-01-15 17:28:09 +02:00
Andrey Filipenkov b22c651b0f [CI] switch Apple platforms to Xcode 14 2023-01-15 17:28:09 +02:00
Andrey Filipenkov 9d3ad51de4 [Conan][docs] fix examples of using our prebuilt binaries for macOS/iOS 2023-01-15 17:28:09 +02:00
Andrey Filipenkov 0eef2412db [Conan] switch to apple-clang 14 2023-01-15 17:28:09 +02:00
Andrey Filipenkov 453217b4bb [Conan] ignore SDL versions with broken sound 2023-01-15 17:28:09 +02:00
Andrey Filipenkov 427cae2704 [Conan] fix building Boost.Locale with Apple-clang in versions >= 1.81 2023-01-15 17:28:09 +02:00