Commit Graph

1125 Commits

Author SHA1 Message Date
Anthony Calosa
d0a23fbf14 Add support for ".fullborder" cards
(to differentiate full image cards and full image cards with full borders,
so it will only crop full image cards with full borders)
2019-11-16 17:36:30 +08:00
tehdiplomat
02299a0400 Add 7 Dwarves 2019-11-11 14:12:49 -05:00
Blacksmith
c2db78baf7 [maven-release-plugin] prepare for next development iteration 2019-11-11 02:45:55 +00:00
Blacksmith
9a30d78f54 [maven-release-plugin] prepare release forge-1.6.30 2019-11-11 02:45:50 +00:00
Michael Kamensky
3a7e35c51d Merge branch 'cardtranslationforgecore' into 'master'
Moved CardTranslation to forge-core.

See merge request core-developers/forge!2253
2019-11-07 04:02:57 +00:00
Hans Mackowiak
a6ff0b5b10 Resolve "Format: pioneer" 2019-11-06 01:04:02 +00:00
Anthony Calosa
31182289b7 Update dependency and use custom de/encoder for netty 2019-11-01 12:41:30 +08:00
klaxnek
fa6fce9589 Moved CardTranslation to forge-core. We need it to translate card info in forge-game. 2019-10-23 11:47:21 +02:00
Anthony Calosa
402885391f Card Sleeves 2019-10-22 16:12:03 +08:00
Anthony Calosa
7f0b7780da Modify verifyTransitivity 2019-10-13 11:45:42 +08:00
Hans Mackowiak
fb159a6261 verifyTransitivity on saComparator 2019-10-11 19:03:15 +00:00
Blacksmith
d028cd2918 [maven-release-plugin] prepare for next development iteration 2019-09-29 00:23:27 +00:00
Blacksmith
4803d74c33 [maven-release-plugin] prepare release forge-1.6.29 2019-09-29 00:23:21 +00:00
Hanmac
0c354e8a70 Adventure: add Logic to cast as Spell 2019-09-20 15:54:47 +02:00
Peter
4b6f642c12 Guess String Encoding. Fixes Issue #1155 2019-09-12 21:20:10 +02:00
swordshine
434027c14f Merge branch 'ui-card-translation' into 'master'
UI Card Translation (desktop and mobile)

See merge request core-developers/forge!1987
2019-09-11 13:27:55 +00:00
CCTV-1
04f6302e18 adjust indentation 2019-09-11 09:15:07 +08:00
Anthony Calosa
5f78608321 Some codes needed to revert 2019-09-09 13:30:53 +08:00
Peter
3d53c41208 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-09-07 08:46:19 +02:00
Anthony Calosa
e977420ffa Finalization for Refactoring 2019-09-06 12:55:40 +08:00
swordshine
19585aa007 Merge branch 'master' into 'master'
Refactor/Code Cleanup

See merge request core-developers/forge!2080
2019-09-06 00:41:16 +00:00
Anthony Calosa
59bf5830fe Big Cleanup 2019-09-06 00:03:04 +08:00
Anthony Calosa
ca28b4d696 Merge remote-tracking branch 'remotes/core/master' 2019-09-05 18:01:47 +08:00
Anthony Calosa
2b0e47dd14 Initial migration 2019-09-05 08:24:58 +08:00
Blacksmith
10877ca143 [maven-release-plugin] prepare for next development iteration 2019-09-04 01:51:10 +00:00
Blacksmith
367dab571d [maven-release-plugin] prepare release forge-1.6.28 2019-09-04 01:51:04 +00:00
Anthony Calosa
a4d34bb858 Retained some schemas 2019-09-03 11:20:10 +08:00
Anthony Calosa
c38bae910a Refactor/Code Cleanup 2019-09-02 18:08:56 +08:00
Peter
4913633a25 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation
 Conflicts:
	forge-gui-mobile/src/forge/assets/FSkinFont.java
	forge-gui-mobile/src/forge/card/CardImageRenderer.java
	forge-gui-mobile/src/forge/card/CardRenderer.java
2019-08-25 10:36:12 +02:00
Hans Mackowiak
5cf1f47047 ImageFetcher: Better handling if Image can't be saved as jpg 2019-08-24 17:51:39 +00:00
Dan Demp
f1e0158102 Add menu item for setting Oathbreaker
Allow double-tapping to set Commander or Oathbreaker if one hasn't yet been set
2019-08-20 04:34:14 +00:00
Peter
d8e073f561 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-14 14:22:16 +02:00
klaxnek
2534c2c27a Fixes some SonarQube detected bugs:
1. Use try-with-resources in AutoCloseable objects
2. Use the "equals" method if value comparison was intended.
3. Fixed getting the cheapest mana card in getCheapestPermanentAI.
2019-08-10 12:15:17 +02:00
Peter
720a3966c1 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-06 08:46:45 +02:00
Hanmac
773f2b280f Loyalty: use String Property for X 2019-08-01 21:16:07 +02:00
Peter
4ffb226100 Preload translations in FModel.
Add cardname translations in CardDetailUtil.
Removed translated flavors in CardTranslations.
Only remove diacritics in mobile port.
2019-07-28 09:31:50 +02:00
Blacksmith
9a12564054 [maven-release-plugin] prepare for next development iteration 2019-07-08 00:55:54 +00:00
Blacksmith
118e86ec92 [maven-release-plugin] prepare release forge-1.6.27 2019-07-08 00:55:48 +00:00
churrufli
e029ee713d Moving hard-coded text to res files 2019-06-19 00:05:20 +02:00
Rob Schnautz
249649dbaa Merge branch 'master' into 'deprecation-cleanup'
# Conflicts:
#   forge-ai/src/main/java/forge/ai/ability/DiscardAi.java
#   forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java
2019-06-13 22:10:10 +00:00
Blacksmith
560fdf1a46 [maven-release-plugin] prepare for next development iteration 2019-06-12 20:13:01 +00:00
Blacksmith
2974f6a7c3 [maven-release-plugin] prepare release forge-1.6.26 2019-06-12 20:12:56 +00:00
Michael Kamensky
391c81101f - Improved London Mulligan UI (visually highlight selected cards, don't allow to select more cards than necessary) 2019-06-11 05:33:25 +00:00
Michael Kamensky
08e2ba54ea UI for choosing the Mulligan type 2019-06-11 04:02:16 +00:00
Blacksmith
6c945608b3 [maven-release-plugin] prepare for next development iteration 2019-05-20 00:42:07 +00:00
Blacksmith
57786e7c81 [maven-release-plugin] prepare release forge-1.6.25 2019-05-20 00:42:02 +00:00
swordshine
49bb679a12 Fix a few cards 2019-05-05 08:50:06 +08:00
swordshine
6b1343f6c9 Fix color pair 2019-05-04 20:55:29 +08:00
swordshine
e4fad75edd Add Niv-Mizzet Reborn 2019-05-04 19:43:01 +08:00
Blacksmith
52ad5d559a [maven-release-plugin] prepare for next development iteration 2019-05-02 01:16:44 +00:00