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

83 Commits

Author SHA1 Message Date
Laserlicht
56562ad8dc date time format 2023-12-16 18:57:38 +01:00
Ivan Savenko
adb720c8ea Bump version to 1.4.1 2023-12-09 19:03:05 +02:00
Ivan Savenko
18b8971d6f
Merge pull request #3101 from IvanSavenko/fix_android_data_import
Fix data import on Android
2023-10-29 13:46:48 +02:00
Ivan Savenko
2315ea84ec
Invert condition 2023-10-23 22:18:21 +03:00
Ivan Savenko
7dfdee2db8 Check whether H3 data has been imported using most common spellings of
data directory
2023-10-23 20:33:01 +03:00
Ivan Savenko
91e202e0e3 Ignore case when checking whether path is white-listed.
Fixes data import with H3 data that has different case in directory names
2023-10-23 20:32:45 +03:00
Alexander Wilms
941181b8b9 Convert XML files in android/ from CRLF to LF, exclude .bat files from CI check 2023-10-23 13:33:09 +00:00
Ivan Savenko
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Ivan Savenko
4d43562bca
Merge pull request #2924 from Laserlicht/datetime_android
Datetime android
2023-09-27 15:43:46 +03:00
utzuro
240151374d fix word in the translation 2023-09-24 22:44:35 +09:00
utzuro
96907590ba fix translation word 2023-09-24 22:41:43 +09:00
utzuro
9e71a0c495 add small translation fixes 2023-09-24 22:39:40 +09:00
utzuro
7764dac386 fix some ukrainian strings in the android launcher 2023-09-24 22:22:14 +09:00
Laserlicht
e93a04409e Revert "another approach"
This reverts commit 2f64457a9a.
2023-09-24 15:02:59 +02:00
Laserlicht
2f64457a9a
another approach 2023-09-24 12:54:35 +02:00
Laserlicht
09cf8376db
date is already with time 2023-09-23 18:58:32 +02:00
Laserlicht
006431c898
fix 2023-09-23 17:50:42 +02:00
Laserlicht
63b91f7b87
imports 2023-09-23 17:41:36 +02:00
Laserlicht
455ead7b4a
fix datetime format (android) 2023-09-23 17:27:00 +02:00
Laserlicht
e50476603f Update DialogAuthors.java 2023-09-15 15:26:14 +02:00
Laserlicht
91e1246f75 Update DialogAuthors.java 2023-09-15 15:26:14 +02:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Ivan Savenko
cfe87e46a9
Fix Android build version ID 2023-09-14 19:32:13 +03:00
Ivan Savenko
e64dc6d0cd
Fix release version number on Android 2023-09-14 17:38:33 +03:00
Ivan Savenko
115c30f42c Preparation for 1.3.2 release 2023-09-14 14:57:43 +03:00
Ivan Savenko
fc6fc31a02
Merge pull request #2565 from IvanSavenko/documentation
(1.3.2) Documentation import
2023-09-12 13:13:52 +03:00
Ivan Savenko
33bf367dc0 Updated docs and all internal links 2023-09-07 12:57:03 +03:00
Alexander Wilms
c0f0211098 Update VCMI icon (#2672)
* Update VCMI icon

Fixes #1993

Sources will be added to https://github.com/vcmi/vcmi-assets

* Use entire canvas height for shield, add remaining icons

* Use a slighty more saturated brown

* Align VCMI letters to pixel grid for 32px icons

* Align VCMI letters to pixel grid for 48px icon

* Align VCMI letters to pixel grid for 64px icon

* Add 96px icon to .ico

* Update Android and iOS icons

* Install 22px icon on Linux

* Update macOS .icns file

* Add more icons

* Update iOS icons

* Add more sizes to .ico files

* Don't use .png inside .ico

* Only include resolutions up to 256px in .ico files

* Center map editor icon
2023-09-05 23:57:19 +03:00
Alexander Wilms
d2f0a80573
Update VCMI icon (#2672)
* Update VCMI icon

Fixes #1993

Sources will be added to https://github.com/vcmi/vcmi-assets

* Use entire canvas height for shield, add remaining icons

* Use a slighty more saturated brown

* Align VCMI letters to pixel grid for 32px icons

* Align VCMI letters to pixel grid for 48px icon

* Align VCMI letters to pixel grid for 64px icon

* Add 96px icon to .ico

* Update Android and iOS icons

* Install 22px icon on Linux

* Update macOS .icns file

* Add more icons

* Update iOS icons

* Add more sizes to .ico files

* Don't use .png inside .ico

* Only include resolutions up to 256px in .ico files

* Center map editor icon
2023-09-01 22:36:32 +03:00
Ivan Savenko
695a51d8c8 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-28 21:19:53 +03:00
nordsoft
899cf5ee99 Update mods repo link for android 2023-08-28 17:21:38 +04:00
Ivan Savenko
5da1a6c412 Merge branch 'android_api_version_bump' into beta 2023-08-18 15:24:59 +03:00
Ivan Savenko
db81d75f75 Compile against SDK version 33 2023-08-15 18:47:42 +03:00
Ivan Savenko
3aead5f32f Android build ID bump 2023-08-15 15:06:33 +03:00
Ivan Savenko
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
Ivan Savenko
4ebb490740 Android build version bump for hotfix 2023-08-11 18:54:24 +03:00
Ivan Savenko
45215f12f3 Merged master into beta 2023-08-08 20:43:47 +03:00
Ivan Savenko
b167aeafd8 Build ID bump for Android 2023-08-07 17:03:19 +03:00
Ivan Savenko
b5fc0f19f2 Proper fix for Android launcher nullptr dereference 2023-08-07 16:53:51 +03:00
Ivan Savenko
9e4a42b25d Android build ID bump 2023-08-06 14:33:20 +03:00
Ivan Savenko
48f130cd76 Fix crash on haptic feedback on Android 2023-08-06 14:11:14 +03:00
Ivan Savenko
702f57d5cc Avoid another crash in Android launcher 2023-08-06 13:43:08 +03:00
Ivan Savenko
a81f18765c Another workaround for another crash on Android launcher 2023-08-06 12:45:20 +03:00
Ivan Savenko
4fdc022cdf Version bump to 1.3.1 2023-08-05 23:45:28 +03:00
Ivan Savenko
2cf323a6c1 Version bump for Android build 2023-08-05 13:35:24 +03:00
Ivan Savenko
8d5aff4c12 Attempt of a blind fix for mod load crash on Android launcher 2023-08-05 12:58:25 +03:00
Ivan Savenko
b9729241f1 Version bump for Android to reupload build 2023-08-04 11:19:09 +03:00
Ivan Savenko
8ef7956204 Version bump for Android 2023-08-02 21:35:07 +03:00
Ivan Savenko
fbe6c313d9
Merge pull request #2426 from IvanSavenko/version_bump_14
Bump version to 1.4 on develop branch
2023-07-28 19:10:01 +03:00
heroesiiifan
da7f1f4620
Update LanguageSettingDialog.java 2023-07-28 00:31:59 +00:00