Commit Graph

7074 Commits

Author SHA1 Message Date
Xawotihs
8970fa673b Should fix broken QT build 2019-09-11 22:30:03 +02:00
xawotihs
4e4752856b Removed mac specific build files 2019-09-09 23:39:54 +02:00
Xawotihs
bc79115985 Added a build specific for mac 2019-09-09 22:16:40 +02:00
Xawotihs
29b89ba562 Removes -qt=qt5 for osx 2019-09-09 00:00:59 +02:00
Xawotihs
7d51b985a6 Sorting the qmake path 2019-09-08 23:47:19 +02:00
Xawotihs
91bfa11a4f we build res if we build psp, removed the ref to the mac script 2019-09-08 23:27:47 +02:00
Xawotihs
46834a6ee9 Let's build the res zip only if needed 2019-09-08 23:11:31 +02:00
Xawotihs
95af76a3b2 installing ant on osx as well 2019-09-08 20:18:46 +02:00
xawotihs
4df34c82c2 Fied typo for osx 2019-09-08 18:49:34 +02:00
xawotihs
50d49e47e7 Merge branch 'master' into matrix 2019-09-08 18:31:39 +02:00
xawotihs
b29c37eb25 Should fix a typo 2019-09-08 18:30:59 +02:00
xawotihs
c7d09d8389 First try on matrix without cmake 2019-09-08 18:17:51 +02:00
Xawotihs
87ce6df145 Merge pull request #1025 from Vitty85/master
Fix for PSP/Android and added new sets M20/MH1/SS2/C19 and fixed UST/V17 sets
2019-09-08 17:49:11 +02:00
valfieri
f5a20110c4 Removed duplicated Tireless Tracker 2019-09-08 17:02:45 +02:00
valfieri
264183a42a Recompilef libs wtih JDK 1.7 2019-09-08 13:10:45 +02:00
valfieri
af0de566fe Set travis toolchain android target to 23 2019-09-08 12:36:33 +02:00
valfieri
480adfe83a Target android back to 29 2019-09-08 12:26:51 +02:00
valfieri
ce5b07b5b1 Removed java.util.stream dependency because not supported in Travis CI Android compiler. 2019-09-08 10:15:15 +02:00
valfieri
09098893e6 Removed dependencies from java.nio package and decreased target android version from 29 to 13 2019-09-08 09:57:00 +02:00
valfieri
414d99525d Fix Prismatic Vista card 2019-09-08 01:56:55 +02:00
valfieri
4f42ddadb5 Restored 29 target platform for Android 2019-09-07 23:17:13 +02:00
valfieri
901a7ca984 Revert TIME_UTC_ to TIME_UTC because Travis CI compile errors. 2019-09-07 22:38:46 +02:00
valfieri
d3feccff75 restored gnustl_static flag for android compile since travis toolchain doesn't support c++_static flag 2019-09-07 22:26:50 +02:00
valfieri
ccd17d32d0 Restored Android version to 16, Removed modification to boost, fixed primitives MH1 and M20, Fixed Snow mana issue. 2019-09-07 22:05:01 +02:00
valfieri
5c67d11aa6 fix spaces 2019-09-06 08:41:27 +02:00
Vitty85
7a529bac6d Merge branch 'master' into master 2019-09-06 08:38:04 +02:00
valfieri
2c62cfd487 replaced tabs with 4 spaces. 2019-09-06 08:31:39 +02:00
Xawotihs
a27216c317 Deactivating mac/ios build as currently broken 2019-09-05 22:24:33 +02:00
xawotihs
8315acbe86 Removed death_grasp.txt and ai/goblin_artillery.txt from the testsuite (see issue#1023) 2019-09-04 22:39:41 +02:00
Xawotihs
7a2f23db45 Using trusty dist as it seems the only one supported for Android. 2019-09-04 16:01:50 +02:00
Xawotihs
711f52e5ce Updating JDK to 7 2019-09-03 23:15:48 +02:00
valfieri
91f50009e1 Fix 2 cards mana cost in MH1 set. 2019-09-03 22:52:08 +02:00
Xawotihs
0cf8c1a970 Installing ant for android build 2019-09-03 22:40:11 +02:00
Xawotihs
2750b34b4f Trying to fix python dependencies 2019-09-03 22:24:39 +02:00
xawotihs
b023dd89b6 - Should remove an error with the PSP compiler 2019-09-03 22:09:44 +02:00
valfieri
9504027fdc Fix on token image saving in Android Downloader 2019-09-03 18:18:25 +02:00
valfieri
5c7528dbcf Fix timeout on image database download. 2019-09-03 14:04:07 +02:00
valfieri
e856538259 Added retries on image and database file download for Android Downloader program. 2019-09-02 19:52:46 +02:00
valfieri
1749330e8a Fix on some token images. 2019-09-02 12:01:45 +02:00
valfieri
893e64e4f7 Fix on 439538t token image 2019-09-01 17:04:22 +02:00
valfieri
169467158a Fix for some duplicated token on Android Image Downloader. 2019-09-01 16:59:59 +02:00
valfieri
ab0a5496b0 Set socket timeout on Android Downloader and fixed some minor exceptions. 2019-09-01 13:12:56 +02:00
valfieri
0c4deea3ed Fix names of Tokens in Android Image downloader. 2019-09-01 00:50:13 +02:00
valfieri
dd785a872e Fix some token names on Android Downloader 2019-08-31 14:15:20 +02:00
valfieri
c8603204ac Removed one comment on old IFDEF PSP 2019-08-31 11:23:56 +02:00
valfieri
ae81568463 Fixed a bug on set name when using the fast download method 2019-08-31 10:52:33 +02:00
valfieri
2fe9924fe5 Improved the Android downloader, now it's a lot faster because all the image urls have been indexed. 2019-08-31 01:23:36 +02:00
valfieri
818233213e Fix on UST card download image 2019-08-29 21:11:24 +02:00
valfieri
d9019c0808 Fix on some indexes on image donwloader. 2019-08-29 19:20:11 +02:00
valfieri
fdaed6503a Fixed V17 set total card numbers from 16 to 29 in dat file. Improved Android card image downloader. 2019-08-29 17:54:26 +02:00