external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,086 Commits 32 Branches 187 Tags
e18007e902014ec84c46fd9a9e2bbce46eca154d
Commit Graph

1037 Commits

Author SHA1 Message Date
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
Blacksmith
711bc38276 [maven-release-plugin] prepare release forge-1.6.24 2019-05-02 01:16:39 +00:00
Chris H
1f752ff210 Add Different colors to combo mana 2019-04-29 20:41:36 -04:00
Hanmac
61a771fdd6 CopyEffect: Volraths Shapeshifter 2019-04-23 20:00:35 +02:00
Hanmac
ba8a38c2f4 CloneRewrite 2019-04-23 20:00:35 +02:00
Sol
13583d0aba Fix audit tool 2019-04-13 04:32:31 +00:00
Blacksmith
405cbd5ab3 [maven-release-plugin] prepare for next development iteration 2019-04-07 19:48:55 +00:00
Blacksmith
5b39be5fe9 [maven-release-plugin] prepare release forge-1.6.23 2019-04-07 19:48:50 +00:00
Chris H
f5a4360339 TokenViewer doesn't crash now.. Just need it to display 2019-03-31 22:48:57 -04:00
Chris H
a050f7c26c TokenViewer Deck "editor" 2019-03-30 22:09:16 -04:00
Michael Kamensky
1c0d95b930 Merge branch 'draft-bugs' into 'master' 
Resolve #921, #922

Closes #921 and #922

See merge request core-developers/forge!1478
 2019-03-25 03:53:44 +00:00
Adam Pantel
5cd5020595 Fix draft bots running conspiracies 2019-03-24 21:32:14 -04:00
Chris H
5aee626661 Always create an empty map for tokenNormalized 2019-03-24 21:00:31 -04:00
Sol
de719b9aa5 There's no such thing as "file1_set" its either "file_set" or "file2_set" 2019-03-24 01:43:16 +00:00
Sol
190a56181e Quest pet tokens don't have editions. 2019-03-24 00:55:24 +00:00
Sol
b594cf2324 Set default art index to 1 for tokens 2019-03-22 15:00:21 +00:00
Chris H
dc917643b5 Allow multiple art for tokens based on edition files 2019-03-21 20:58:46 -04:00
Blacksmith
c3346c737e [maven-release-plugin] prepare for next development iteration 2019-03-10 13:57:44 +00:00
Blacksmith
db3c4d2d2f [maven-release-plugin] prepare release forge-1.6.22 2019-03-10 13:57:39 +00:00
Sol
8a9c27f9ae Revert "Merge branch 'fix-bad-art-deck-art-corruption' into 'master'" 
This reverts merge request !1440
 2019-03-04 15:58:06 +00:00
Chris H
888f5953b1 If a DeckList references a bogus card set/art combo ignore parts of it until it works 2019-03-03 21:47:28 -05:00
Rob Schnautz
ed2afd9460 Unused import 2019-02-28 01:04:40 +00:00
schnautzr
59214fe332 Code cleanup - deprecations 2019-02-23 20:59:19 -06:00
Krazy
893cc3b08f Merge branch 'eclipse-cleanup' into 'master' 
Eclipse cleanup

Closes #844

See merge request core-developers/forge!1399
 2019-02-22 02:09:05 +00:00
Blacksmith
4ed17e1e16 [maven-release-plugin] prepare for next development iteration 2019-02-17 19:51:17 +00:00
Blacksmith
a70136c98c [maven-release-plugin] prepare release forge-1.6.21 2019-02-17 19:51:13 +00:00
Sol
557be177d8 Fix token images 2019-02-16 14:04:45 +00:00
Tim Scott
7f16a3dce2 Remove Eclipse-specific files and directories. Maven-based build configurations can be easily imported by (at least) Eclipse 2018-12. Hint: File > Import > Maven > Existing Maven Projects > Navigate to root forge folder. 
Tweak base pom.xml to allow for error-free Eclipse compilation.
 2019-02-14 21:26:23 -06:00
Michael Kamensky
d491972995 Merge branch 'master' into 'master' 
Translating hard-coded text to res en-US.properties

See merge request core-developers/forge!1283
 2019-02-07 05:54:47 +00:00
Blacksmith
17dedb4bf4 [maven-release-plugin] prepare for next development iteration 2019-02-02 02:00:32 +00:00
Blacksmith
eb3fb9e1ce [maven-release-plugin] prepare release forge-1.6.20 2019-02-02 02:00:28 +00:00
Evan Murawski
4661a19982 DeckRecognizer: Recognize split card names with single slash 2019-01-25 04:53:36 +00:00
churrufli
07c2065917 Translating hard-coded text to res en-US.properties 2019-01-18 08:20:02 +01:00
Chris H
3b38547fc9 Replace asterisks with x's for token filenames 2019-01-12 22:55:23 -05:00
Hans Mackowiak
0606a00942 DeckFormat: A deck can have any number of cards named CARDNAME. 2019-01-12 16:13:00 +00:00
Peter F. Patel-Schneider
09fc3ae60c add new GUI interface allowing cards to be moved around in a list and use for arrangeForScry if preference UI_SELECT_FROM_CARD_DISPLAYS is set 2019-01-09 21:13:09 -05:00
Hanmac
e85f9e08be Keyword: add Afterlife 2018-12-23 18:47:37 +01:00
Blacksmith
e8c581b402 [maven-release-plugin] prepare for next development iteration 2018-12-09 06:52:11 +00:00
Blacksmith
a990b9ff69 [maven-release-plugin] prepare release forge-1.6.19 2018-12-09 06:52:07 +00:00