1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Commit Graph

10430 Commits

Author SHA1 Message Date
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
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
Andrii Danylchenko
37baec1d24 Fix crash on replaced hero placeholder mouseover 2023-02-27 09:10:26 +02:00
Ivan Savenko
8c52cbcd00
Merge pull request #1429 from dydzio0614/creature-numeric-quantities
Implement numeric creature descriptions with config toggle on/off
2023-02-26 22:57:01 +02:00
Ivan Savenko
195eac3375
Merge pull request #1545 from dydzio0614/town-panel-number-formatting
Improve creature numbers handling in castle interface bottom left part
2023-02-26 22:56:54 +02:00
Ivan Savenko
cc84bed0c0
Merge pull request #1540 from dydzio0614/settings-rework
Settings rework
2023-02-26 22:56:35 +02: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
Ivan Savenko
6fb3aaebc3
Merge pull request #1606 from burunduk/patch-1
Update ukrainian.json
2023-02-24 12:38:55 +02:00
Olexandr Nesterenko
a368a067ee
Update ukrainian.json 2023-02-24 11:29:03 +02: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
Dydzio
9eccc29e16 Adjust tab positioning 2023-02-19 12:18:54 +01:00
Dydzio
2d80ce8203 Add discord link to readme 2023-02-18 22:22:44 +02:00
Dydzio
7f03223634 Remove SDL_Events reference 2023-02-18 18:00:34 +01:00
Dydzio
6bd4eac27a Rename settings files 2023-02-18 17:58:22 +01:00
Dydzio
7137329e80 Clang-tidy related fixed 2023-02-18 17:49:43 +01:00
Dydzio
7e409df3cb Apply manual changes from code review 2023-02-18 16:35:07 +01:00
Andrii Danylchenko
e13a230848 merge conflict regression fix 2023-02-18 17:19:33 +02:00
Andrii Danylchenko
3033b9751e
Merge pull request #1590 from vcmi/fix-1579
#1579 - check z coord as well
2023-02-18 14:31:31 +02:00
Andrii Danylchenko
47b253e837 #1579 - check z coord as well 2023-02-17 18:34:57 +02:00
Dydzio
c2ef3331ef Change main settings tabs to toggle group + fix json commas 2023-02-16 21:37:37 +01:00
Konstantin
93c2bbf9ab vcmi: modernize lib/battle 2023-02-16 23:37:19 +03:00