1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

10212 Commits

Author SHA1 Message Date
Ivan Savenko
476e60c753
Merge pull request #1615 from SoundSSGood/CArtifactsOfHero-refactoring
Optimization and cleanup CArtifactHolder
2023-03-05 17:28:36 +02:00
Ivan Savenko
07898f5cca
Merge pull request #1609 from krs0/feature/Battle_order_slight_refactorings
Battle order slight refactoring
2023-03-05 17:27:38 +02:00
Andrii Danylchenko
59d612fc2d
Merge pull request #1616 from kambala-decapitator/conan-android
move Android code to the main repo
2023-03-05 08:13:41 +02:00
Ivan Savenko
a2c3574e57
Merge pull request #1629 from rilian-la-te/fixup-bonuses
vcmi: allow loads bonuses info from mods
2023-03-05 00:26:49 +02:00
nordsoft
cbb3167166 Regression fix 2023-03-05 00:20:47 +04:00
Konstantin
f6695737d6 vcmi: allow loads bonuses info from mods
It is useful for making custom bonus graphics into mods, now
mods just replace game config, which is not good.
2023-03-04 22:50:00 +03:00
Andrey Filipenkov
c62d945b2d fix downloading mods on Android 4.4
fixes TLS issue
2023-03-04 14:35:56 +03:00
SoundSSGood
a1dbbe2d86 redraw optimization 2023-03-03 10:17:31 +02: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
krs
26bca26bd8 Enum is now in its own namespace, comments for enum values removed
Using Namespace Fix for linux compilation.


NO_OF_PHASES renamed to NUMBER_OF_PHASES, removed duplicate phase documentation
2023-03-01 21:21:20 +02:00
krs
7421fabf2c BattlePhases enum moved to Unit.h 2023-03-01 21:21:20 +02:00
krs
0373febe6f Refactoring 1st phase - Renaming's mainly
S'more small battle order refactoring.
2023-03-01 21:21:20 +02:00
Ivan Savenko
d55ac50e3c
Merge pull request #1622 from krs0/feature/CArchiveLoaderparam_extractArchives_ismaskedbytypo#1619
CArchiveLoader param "extractArchives" is masked by typo #1619
2023-03-01 21:15:35 +02:00
Ivan Savenko
ce6a4ee2ae
Merge pull request #1624 from rilian-la-te/fix-1621
fix #1621
2023-03-01 19:54:56 +02:00
Konstantin
cb26bedd17 fix #1621 2023-03-01 19:22:06 +03:00
krs
a950fb379e All CArchiveLoader constructor parameters now have different names from members 2023-02-28 23:21:44 +02:00
Andrii Danylchenko
5cab8ede90 Fix battle ai trying to act with killed stack 2023-02-28 23:10:22 +02:00
Ivan Savenko
8d3bfbe0bc
Merge pull request #1582 from rilian-la-te/modernize-lib-battle
vcmi: modernize lib/battle
2023-02-28 12:12:39 +02:00