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

807 Commits

Author SHA1 Message Date
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
Misha Colbourne
dcecbd4e37 Update DeckFormat.java 2018-03-14 22:43:40 +00:00
Misha Colbourne
12c84196f3 Update DeckFormat.java 2018-03-14 03:31:29 +00:00
Seravy
83bae5ad74 Sold basic lands that could have been added through "Add basic land" will not be removed from decks. 2018-03-04 23:36:48 +01:00
Jamin W. Collins
4299491104 avoid creating an additinal map of all cards 
While getting all cards is needed for some network play variants, they
can be retrieved with the additional memory usage.  The nested lookup
isn't as elegant (IMO) but does avoid memory bloat with the additional
data structure.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-01 04:24:50 -07:00
Jamin W. Collins
3415d76b40 allow ALL cards to be (de)serialized 
This is needed by network play variants like:
- Vanguard
- Planechase

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-28 20:03:53 -07:00
Jamin W. Collins
2c55a9d86c bump commons-lang3 version for Java 9 support 
Closes core-developers/forge#157

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-28 17:44:30 -07:00
Sol
b0a786970f Merge branch 'commanderDeckGenerator' into 'master' 
Commander deck generator

See merge request core-developers/forge!249
 2018-02-28 02:55:11 +00:00
austinio7116
d05e1e59dc Merge branch 'token_scripts' into 'master' 
Allow scripts to be written for Tokens

See merge request core-developers/forge!236
 2018-02-27 22:14:13 +00:00
austinio7116
52ae852953 Addition of new new random commander deck generation - both fully random decks based on a selected commander and matrix-based synergistic deck generation using a model learned from thousands of commander decks. This also includes support for commander net-decks on desktop. 2018-02-26 23:49:47 +00:00
Blacksmith
d6278541dd Clear out release files in preparation for next release 2018-02-25 22:55:10 +00:00
Blacksmith
5977598c71 [maven-release-plugin] prepare for next development iteration 2018-02-25 22:49:44 +00:00
Blacksmith
35706d71f7 [maven-release-plugin] prepare release forge-1.6.7 2018-02-25 22:49:41 +00:00
Blacksmith
c38f0900d1 Update README.txt for release 2018-02-25 22:48:23 +00:00
Sol
d4d376c8c6 Merge branch 'PlaneshiftPromos' into 'master' 
Fixing Planeshift set alter foils in boosters

See merge request core-developers/forge!202
 2018-02-25 20:19:19 +00:00
tehdiplomat
6ca1269261 Add ability to load tokens via scripts before 2018-02-19 13:15:12 -05:00
Michael Kamensky
275e1be6be Revert "Merge branch 'Guavafix' into 'master'" 
This reverts merge request !217
 2018-02-18 18:54:20 +00:00
Michael Kamensky
a9e15c2d33 Merge branch 'Guavafix' into 'master' 
The guava fix

See merge request core-developers/forge!217
 2018-02-18 07:17:15 +00:00
Jamin W. Collins
d60d350fcb token-artwork - try removing variant as a fallback 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-17 08:48:46 -07:00
Jamin W. Collins
b1e7e407a7 token artwork - try uppercase set name 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-17 08:48:46 -07:00
Seravy
b6395aa463 The guava fix 2018-02-17 12:06:57 +01:00
Seravy
8f9857e72d Fixing Planeshift set alter foils in boosters 
-Now always foil, and with the (guesstimated) correct chance.
 2018-02-12 01:11:03 +01:00
Michael Kamensky
ebd0a8096c Merge branch 'error-msg-fixes' into 'master' 
Disambiguate class name in error StorageReader errors

See merge request core-developers/forge!196
 2018-02-10 18:54:01 +00:00
Jamin W. Collins
0a4dc6961d make development version reference GIT not SVN 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-10 11:13:41 -07:00
Jamin W. Collins
844a7b5d76 Disambiguate class name in error StorageReader errors 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-10 10:28:39 -07:00
Seravy
36917c0d18 Fixes compile/run bugs in IntelliJ 2018-02-08 10:25:17 +01:00
Sol
d48c93938f Merge branch 'patch-2' into 'master' 
Simplify string generation in a few files

See merge request core-developers/forge!128
 2018-01-26 01:51:30 +00:00
Rob Schnautz
8380da7a10 Don't need transformPT anymore. 2018-01-21 04:59:46 +00:00
Rob Schnautz
f8decaac41 simplify strings 2018-01-20 20:51:37 +00:00