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

1035 Commits

Author SHA1 Message Date
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
Meerkov
338ba5afdc Fixes some compile errors in Eclipse due to empty folders. 2018-04-17 15:50:53 -07:00
maustin
f2ae137947 Merge branch 'master' into historicformats 
# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java
 2018-04-17 21:29:03 +01:00
Meerkov
5c9a27c930 Update lots of code to use MyRandom directly. 
Some parts of the code were using the normal random, instead of going through the MyRandom class. This makes it much harder to change the RNG method later. For example, you may want to change the RNG to always be seeded with the same number, for running AI experiments. This change makes that easier.
 2018-04-16 21:26:12 -07:00
Meerkov
1cfb937490 Updates the project for Java 8. 
Maps.newHashMap() was replaced with null in numerous locations. A null check is performed in the locations that read this value. This prevents unnecessary allocation of memory and fixes compiler errors.

"final" keyword added to RepeatEachEffect, which used local variables in non-local scope.
 2018-04-16 18:26:15 -07:00
austinio7116
17fc231db6 Fix to ensure invalid format files do not crash game on startup 2018-04-15 00:24:39 +01:00
maustin
ae2c56abce Updated GameFormat reader to support nested folders plus user defined custom formats from their local user directory. Moved Digital formats to a subfolder to demonstrate 2018-04-10 09:49:02 +01:00
Hanmac
0bc12e744e CopyPerm: rewoke and update with Populate 2018-04-09 07:50:44 +02:00
Michael Kamensky
b481b629b5 Update CardEdition.java 2018-04-02 20:20:41 +00:00
Luke Way
0b5a92ebc9 Fixed whitespace 2018-04-02 09:36:58 -04:00
Luke Way
942f5dcfbd Added null check on CardEdition. Encountered NPE when adding basic lands in deck builder with cards from new set. 2018-04-02 09:32:38 -04:00
swordshine
eeec3feb1f - Fixed a crash (varolz, the scar-striped + dryad arbor) 2018-04-02 11:55:44 +08:00
Michael Kamensky
70eec78416 Merge branch 'BrawlFormat' into 'master' 
Brawl format

See merge request core-developers/forge!324
 2018-03-30 06:35:07 +00:00
Chris H
4b77ccb5f6 Only allow core or expansions to be upcoming sets 2018-03-29 21:29:07 -04:00
austinio7116
8e074e2093 Removed unwanted import 2018-03-29 11:15:06 +01:00
austinio7116
70bd88e2d9 Fixed failing tests due to missing StaticData. Fixed Commander-based fully random deck generation. 2018-03-29 08:47:15 +01:00
austinio7116
9e053865e1 Code cleanup 2018-03-29 07:00:37 +01:00
austinio7116
08dc5f5654 Fixed deckformat to fully support Brawl requiring standard legal cards. Deck generation for brawl working on desktop and android. 2018-03-29 06:33:02 +01:00
austinio7116
ed564b904f Random brawl deck generator working on Desktop 2018-03-28 23:41:57 +01:00
austinio7116
e2ee43fb2d Code cleanup 2018-03-27 23:04:16 +01:00
austinio7116
5b8342188c Fixed adding planeswalker commanders from pool in android brawl deck editor 2018-03-26 22:59:16 +01:00
austinio7116
756c272821 Fixed brawl deck editor and deckformat rules for brawl 2018-03-26 20:39:34 +01:00
austinio7116
364bf3724f Added UI elements required for Brawl variant 2018-03-26 06:57:15 +01:00
austinio7116
81373d2b69 Initial fiddling with Brawl game formats 2018-03-25 19:58:52 +01:00
Blacksmith
9e786bbdff [maven-release-plugin] prepare for next development iteration 2018-03-20 01:14:26 +00:00
Blacksmith
6e6af1c6c4 [maven-release-plugin] prepare release forge-1.6.8 2018-03-20 01:14:23 +00:00
swordshine
b81fba82a5 Merge branch 'SellingLandsReplacement' into 'master' 
Selling lands fixes

See merge request core-developers/forge!273
 2018-03-18 09:17:52 +00:00