external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,558 Commits 31 Branches 187 Tags
901b7159479e616d792b25dd00556a9ccb2fb38a
Commit Graph

1261 Commits

Author SHA1 Message Date
tehdiplomat
e4e33ebac0 Fix conflicts that got missed previously 2018-09-03 11:45:23 -04:00
tehdiplomat
67edb87ccd Allow Edition files to accept token names 2018-09-03 11:37:12 -04:00
NikolayHD
66e52cbd6a Support Import, Open, New deck, Save As 
in all deck editors with finite catalog
 2018-08-29 01:15:27 +03:00
tehdiplomat
341a241a82 Fixing Mana types being inappropriately referenced in relation to Matrices 2018-08-28 12:24:04 -04:00
Jamin W. Collins
97e6657bfc move everything to guava android for compatibility 
There appear to be incompatibilities between guava 24.1-jre and
24.1-android with regard to serialization.  As long as networking
is dependent upon serialization desktop and android need to use
the exact same guava package.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-26 11:26:38 -06:00
Blacksmith
87c0ab7b7d [maven-release-plugin] prepare for next development iteration 2018-08-03 22:08:24 +00:00
Blacksmith
aea32aee62 [maven-release-plugin] prepare release forge-1.6.14 2018-08-03 22:08:21 +00:00
Blacksmith
9ca15ae635 Clear out release files in preparation for next release 2018-08-03 21:20:17 +00:00
Blacksmith
bb5102e311 [maven-release-plugin] prepare for next development iteration 2018-08-03 21:13:58 +00:00
Blacksmith
4d9b98bc94 [maven-release-plugin] prepare release forge-1.6.13 2018-08-03 21:13:55 +00:00
Blacksmith
1e1640b292 Update README.txt for release 2018-08-03 21:11:47 +00:00
Blacksmith
0d15166137 [maven-release-plugin] prepare for next development iteration 2018-07-31 01:38:47 +00:00
Blacksmith
1d273d1c70 [maven-release-plugin] prepare release forge-1.6.12 2018-07-31 01:38:44 +00:00
Hanmac
d890ee248c CardFacePredicate: use new valid Predicate 2018-06-28 22:40:16 +02:00
Rob Schnautz
573b4c9377 Add logging to indicate which card is causing Forge to hang. 2018-06-23 22:26:11 +00:00
Hanmac
ba362ede36 CardFace: allow to parse PT with * 2018-06-16 11:13:00 +02:00
Blacksmith
e2c57c0973 [maven-release-plugin] prepare for next development iteration 2018-06-10 00:42:03 +00:00
Blacksmith
6ec968cd85 [maven-release-plugin] prepare release forge-1.6.11 2018-06-10 00:42:00 +00:00
austinio7116
e6af43b060 Implemented hand filtering properly using deck land ratio 
Made hand filtering optional and disabled by default
 2018-05-30 07:19:54 +01:00
Hanmac
e031ac8176 PartnerWith: extended DeckFormat Predicate 2018-05-27 15:52:18 +02:00
Hanmac
6481842482 Partner with: added Logic into CardRules and added Trigger 2018-05-27 13:42:16 +02:00
Hanmac
51a0a9e70a CardType: fixed seting specific SubTypes 2018-05-26 15:07:52 +02:00
austinio7116
1458184500 New Brawl rules updates 2018-05-18 23:29:15 +01:00
Sol
bbd8c0c752 Merge branch 'historicformats' into 'master' 
Formatting and preparation of historicformats

See merge request core-developers/forge!342
 2018-05-16 01:40:34 +00:00
Hanmac
790a461622 CardType: add removeArtifactTypes for Bludgeon Brawl 
Equip: rework it to make Equip legendary creature better, also use AttachAi
 2018-05-12 21:03:15 +02:00
Hans Mackowiak
fb1c545a98 Merge branch 'hasKeywordEnum' into 'master' 
Card: add Keyword methods that work with Keyword Enum

See merge request core-developers/forge!535
 2018-05-11 11:34:15 +00:00
Hanmac
058aabb666 KeywordEnum: replace more String Keywords checks with Enums 2018-05-10 11:53:41 +02:00
Blacksmith
f0ce6277ac [maven-release-plugin] prepare for next development iteration 2018-05-08 00:48:11 +00:00
Blacksmith
95bd867cee [maven-release-plugin] prepare release forge-1.6.10 2018-05-08 00:48:08 +00:00
Hanmac
91d80f49f4 Card: add Keyword methods that work with Keyword Enum 2018-05-06 16:54:53 +02:00
Hanmac
018a3d8c91 FCollection: extra get Function that checks for element in Collection 2018-05-04 23:39:31 +02:00
Sol
1a3308017a Revert "Merge branch 'temp_dev6' into 'master'" 
This reverts merge request !499
 2018-05-01 01:11:29 +00:00
Sol
64e8dd35c2 Merge branch 'temp_dev6' into 'master' 
Allow for Seeded RNG in simulation games!

See merge request core-developers/forge!499
 2018-05-01 01:01:30 +00:00
Sol
ab2d284dee Merge branch 'temp_dev5' into 'master' 
Remove unusual "reproducable" attack declaration from AI

See merge request core-developers/forge!498
 2018-04-30 00:16:30 +00:00
Michael Kamensky
f72c5aa59c Merge branch 'temp_dev4' into 'master' 
Android updates

See merge request core-developers/forge!491
 2018-04-29 20:16:28 +00:00
Meerkov
bd097888a3 Allows running tests using a seeded RNG. 
Running the same game twice now works! There may be issues I haven't found with certain AI behaviors around mechanics I didn't use in my tests.


(cherry picked from commit 194b47c1ad61c8f1efb6bce8af2bb10d1fa8f6c3)
 2018-04-28 17:00:54 +00:00
Meerkov
0a717bb9be Fix more RNG. 
(cherry picked from commit 61dd5661a728e08ae14911a3518cd1e10d574037)
 2018-04-28 16:54:53 +00:00
Agetian
445625ba1e - Removing references to mana pool in other parts of the code. 2018-04-28 13:34:16 +03:00
Meerkov
8f68266585 Update Guava to 24.1 
This updates Guava 16 to 24.1. Currently 16 is a 4 year old version, so there are a lot of bug fixes. The Android .pom has 24.1-android instead of 24.1-jre, for compatability reasons.

I did not test the android build, however the desktop build works.

Also resovles two warnings and drops a "TODO" on a comment that was highlighting a possible bug but wasn't easily marked to discover later.


(cherry picked from commit be578af80467c1850d9dcec0af6fe18840fff7e9)
 2018-04-28 08:42:22 +00:00
Agetian
285370fe35 - NPE prevention related to guaranteed cards in boosters (for Quest Mode). 2018-04-25 07:26:54 +03:00
Agetian
2b34c68057 - Do not add guaranteed legendary cards to Dominaria boosters from the ones that are reserved for Planeswalker decks. 2018-04-23 22:27:21 +03:00
Agetian
75d6ea6537 - Unifying the list for card exceptions in DeckFormat, as suggested and coded by Austinio. 2018-04-23 09:21:55 +03:00
Agetian
0b128cc4ab - Attempting to fix inverse logic in CardType#setCreatureTypes. 2018-04-22 20:09:03 +03:00
Agetian
b7e48ac2cc - Some refactoring in BoosterGenerator related to guaranteed cards. 2018-04-21 15:23:46 +03:00
Agetian
2b41c97355 - Dominaria: booster packs must have a guaranteed Legendary Creature 2018-04-21 08:34:25 +03:00
Blacksmith
0d375ecd93 [maven-release-plugin] prepare for next development iteration 2018-04-21 01:18:35 +00:00
Blacksmith
970f684345 [maven-release-plugin] prepare release forge-1.6.9 2018-04-21 01:18:32 +00:00
Hanmac
a11d5a0fa5 CardDb: fixed other Cardface 2018-04-20 13:00:44 +02:00
maustin
53a03b94d4 Merge branch 'master' into historicformats 
# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java
 2018-04-18 23:00:56 +01:00
Meerkov
db3e4d9e83 Fixes ~50 compiler warnings for unused libraries. 2018-04-17 16:06:00 -07:00