external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,835 Commits 34 Branches 187 Tags
bada43b901b55a573d245800f1ec53e474917ef1
Commit Graph

2461 Commits

Author SHA1 Message Date
Valerio Maggio
27a65c551b Removed unused imports to avoid checkstyle failures 2019-08-25 14:46:39 +02:00
Valerio Maggio
fe95de30cf Merge remote-tracking branch 'upstream/master' 2019-08-25 12:37:35 +02:00
Valerio Maggio
f8c98dca5d Add new shared options to show Unique Cards Only in ItemList and Image views 2019-08-25 12:24:01 +02: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
drdev
6486ebd1ad Remove Exit button from mobile home screen 
Revert text of other buttons on mobile home screen
Fix text with spaces removed, like "Planar Conquest"
 2019-08-19 22:01:50 -05:00
Hans Mackowiak
59e7ca4a9f PickerTest: fix combat 2019-08-15 06:57:30 +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
Michael Kamensky
40b21710b1 Merge branch 'fix_nre_loading_limited_deck' into 'master' 
Fix null reference exception when loading deck

See merge request core-developers/forge!2015
 2019-08-12 16:46:29 +00:00
klaxnek
d04fae8e96 More SonarQube detected bugs fixed: 
- Use try-with-resources in AutoCloseable objects.
- End this switch case with an unconditional break, return or throw statement.
- A "NullPointerException" could be thrown.
- Use the "equals" method if value comparison was intended.
- Correct this "&" to "&&".
 2019-08-10 13:57:06 +02:00
swordshine
c9744bea27 Merge branch 'panelDragFix' into 'master' 
don't rearrange frames if the cursor is in the frame's head region

See merge request core-developers/forge!2012
 2019-08-10 10:49:46 +00: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
NikolayHD
3c6d45ff0c Fix null reference exception when loading deck 
in sealed or draft deck editor
 2019-08-10 03:35:51 +03:00
kms70847
ce32bdb0b5 don't rearrange frames if the cursor is in the frame's head region 2019-08-07 11:10:22 -04: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
98cb151929 Merge branch 'master' into ui-card-translation 2019-07-30 12:19:51 +02:00
Peter
24f7de8ee1 Show translated card name in card overlay 2019-07-28 09:40:57 +02:00
Peter
1d8e7a0cb3 Add Download HQ Card Pictures from Scryfall 2019-07-26 18:39:38 +02:00
Hanmac
4182ad7395 DigEffect: remove AndOrValid 2019-07-14 05:59:04 +02:00
Hanmac
371379def8 DigMultipleEffect: new effect for Kaalia 2019-07-11 07:18:42 +02:00
Hans Mackowiak
3ca71ccd7b - Basic AI for the revised Replicate and Conspire (will currently mimic the old behavior of paying as much as possible, to be improved) 2019-07-08 09:52:20 +00: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
Agetian
330a811dd0 - Fix ChangeZone UI for Sideboard->Library (and possibly other cases going through this code path) 2019-07-03 13:53:35 +03:00
churrufli
181aa0f2ab Moving hard-coded text to res files 2019-06-24 06:54:33 +02:00
kms70847
c82950555d Use FMouseAdapter's onLeftDoubleClick event for double click detection in ListChooser. 2019-06-19 01:34:19 -04:00
churrufli
e029ee713d Moving hard-coded text to res files 2019-06-19 00:05:20 +02:00
Agetian
e75929c16d - Fix tests to comply with the newest Oracle. 2019-06-16 13:13:19 +03:00
Agetian
946a96a9b0 - Added a test for Epochrasite 2019-06-15 18:35:04 +03:00
Michael Kamensky
bf38dac8c8 Added a test for Necrotic Ooze copying Basking Rootwalla's ability from a graveyard. 2019-06-14 15:28:53 +00: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
08e2ba54ea UI for choosing the Mulligan type 2019-06-11 04:02:16 +00:00
churrufli
55721fb5d3 Moving hard-coded text to en-US.properties file 2019-06-07 20:26:02 +02:00
churrufli
cefffc5d90 Moving hard-coded text to en-US.properties file 2019-06-07 20:24:51 +02:00
Chris H
cd20443255 Add a feature to be able to Sideboard for the AI 2019-05-30 22:55:31 -04:00
Sol
6371e708b0 Merge branch 'master' into 'mulligans' 
# Conflicts:
#   forge-game/src/main/java/forge/game/GameAction.java
 2019-05-28 00:39:05 +00:00
Chris H
220e75a81b Extract mulligans from GameAction 
- Add a few different types of Mulliganing that should be expandable
- To finish the work, we need the AI to better handle London mulligans
- And have the UI make this option selectable
 2019-05-27 15:58:20 -04:00
swordshine
d4ac3153ce Merge branch 'master' into 'master' 
Moving hard-coded text to res files

See merge request core-developers/forge!1632
 2019-05-24 00:35:11 +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
churrufli
70655c0f26 Moving hard-coded text to en-US.properties file 2019-05-09 00:03:38 +02:00
churrufli
e9b266e1d2 updating res files 2019-05-08 23:21:03 +02:00
churrufli
662d725aa4 updating res files 2019-05-08 23:21:03 +02:00
Blacksmith
52ad5d559a [maven-release-plugin] prepare for next development iteration 2019-05-02 01:16:44 +00:00
Blacksmith
711bc38276 [maven-release-plugin] prepare release forge-1.6.24 2019-05-02 01:16:39 +00:00
Agetian
fd3deec51f - Test for the Goblin type. 
- Change assert to assertTrue for style similarity.
 2019-05-01 12:41:15 +03:00