external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,079 Commits 32 Branches 187 Tags
2cda73ad77ee07c3115cca08901bbedd169985d1
Commit Graph

1145 Commits

Author SHA1 Message Date
Agetian
bc701fecb3 - Making transform cards work as plane/region art in Planar Conquest (mobile Forge). 
- Currently will show the cards untransformed on the plane selection screen and transformed on the multiverse/region screen.
 2018-04-27 10:46:48 +03:00
austinio7116
acef14aadc Merge branch 'fix_outcome_memory_leak' into 'master' 
Memory leak within a match

See merge request core-developers/forge!458
 2018-04-25 22:35:02 +00: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
1522baa97d - Adding Rat Colony to card limit exceptions in several places. 2018-04-23 07:31:39 +03:00
Chris H
ade17c5eaf Fix Memory leak within a match 2018-04-22 15:18:22 -04: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
Meerkov
6efd631fd8 Declares a serialVersionUID. 
Lots of classes here are serializable, but warn due to missing UID. Serializables are supposed to have a UID for version compatability. Fixes a bunch of compiler warnings.

Also adds in "default:" branch to a few switches which were warning due to missing cases.
 2018-04-17 16:48:18 -07:00
Meerkov
db3e4d9e83 Fixes ~50 compiler warnings for unused libraries. 2018-04-17 16:06:00 -07:00
Michael Kamensky
f51b80739a Merge branch 'master' into 'master' 
Re-merge request for RNG Changes etc

See merge request core-developers/forge!422
 2018-04-17 15:35:05 +00:00
Hanmac
79c9c914e2 LandAbility: do extra ability class, so it can use mayPlay 2018-04-17 08:07:11 +02:00
Meerkov
130fc4ee18 Complete update to Java 8. 2018-04-16 20:38:20 -07:00
austinio7116
a73667610b Added MoJhoSto variant 2018-04-02 07:19:09 +01:00
Jamin W. Collins
35d0e73901 handle null response from getPhase() 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-30 08:20:34 -06:00
Jamin W. Collins
434573a5f8 reflow the PhaseIndicator switch statement 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-30 08:11:50 -06: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
Jamin W. Collins
e9773e57b7 make dual list dialog sizing dynamic, like single 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-29 09:26:53 -06:00
austinio7116
ed564b904f Random brawl deck generator working on Desktop 2018-03-28 23:41:57 +01:00
maustin
b9aef9b317 Merge branch 'master' into BrawlFormat 2018-03-28 06:44:42 +01:00
austinio7116
ba41a27981 Corrected name of brawl deck builder button 2018-03-27 23:53:27 +01:00
KrazyTheFox
2d23ce0084 Use double quotes to prevent users with apostrophes from causing issues. 
Pesky users.
 2018-03-26 21:40:31 -04: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
Alexei Svitkine
f436fa895b Support playing against Net Decks through the Test Deck function 
on mobile Forge.
 2018-03-21 00:04:14 -04: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
Jamin W. Collins
a564f49381 allow human players to make mass select, sometimes 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-14 20:32:25 -06:00
Hanmac
e9c02edfae DamageMap: use DamageMap for RepeatEach cards and similar 2018-03-14 07:15:02 +01:00
austinio7116
b0d5834396 Improved human/AI deck switching to remember and reload selected deck if still available 2018-03-11 20:22:36 +00:00
austinio7116
9ca0d7244e Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-11 07:25:43 +00:00
austinio7116
4dd52e6f82 Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-11 07:20:03 +00:00
austinio7116
13ad244be1 Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-10 20:23:34 +00:00
Jamin W. Collins
7615f333e1 disclose and enforce DEV_MODE state in network play 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-07 17:25:15 -07:00
Hans Mackowiak
83b1965733 Merge branch 'master' into 'fixes' 2018-03-07 13:59:49 +00:00
Sol
090d4dc2c5 Merge branch 'assorted-fixes' into 'master' 
Attempting to fix "Copy to Clipboard" not copying e.g. dual partner commanders.

See merge request core-developers/forge!274
 2018-03-07 04:02:00 +00:00
Sol
a5db48c719 Merge branch 'deckgenimprovements' into 'master' 
Card-based deck generation improvements and refactoring

See merge request core-developers/forge!260
 2018-03-07 03:52:05 +00:00
Hanmac
58bba637ca SimulateMatch: fixed simulateSingleMatch 2018-03-06 22:10:11 +01:00
Agetian
4ddb73e8d2 - When copying deck to clipboard, do not attempt to check the validity of zone sizes to avoid situations when exceptional, but legal deck compositions (such as two partner Commanders) are not allowed / not fully copied. 2018-03-06 22:13:04 +03:00
austinio7116
30048e7a82 Moved repeated AI slot check logic into single boolean 2018-03-05 08:26:06 +00:00
Jamin W. Collins
d8405e2fc8 move foil option to be available in all sections 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-03 12:08:41 -07:00
Jamin W. Collins
ed16e6f4e9 option to fully reset the OnlineLobby 
Closes core-developers/forge#161

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-02 18:58:34 -07:00
austinio7116
edc921bf98 Fixed bug with not counting keycards as lands in the land count causing various issues. Fixed final keyword issue causing build warnings. 2018-03-02 20:09:06 +00:00
maustin
cb5791276a Fixed AI commander and tiny leader decks not being passed correct forAI boolean so including non AI playable cards. Also allowed more lands in generated decks if required. 2018-03-02 19:28:05 +00:00
Jamin W. Collins
81af09d86f ensure variants are only disabled for network play 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-01 04:41:30 -07:00
Jamin W. Collins
193f1f8b23 network play: enable Vanguard 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-28 20:03:53 -07:00
Jamin W. Collins
a5b9512fdb network play: allow readying if Momir is selected 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-28 20:03:53 -07:00
Jamin W. Collins
26c0df6e05 network play: fix for Commander and Tiny Leaders variants 
This method is called numerous times, many before the Commander data has
been populated on the PlayerView objects.  This is reflected a few lines
above where similar logic is applied to the current PlayerView.  This
simply applies similar logic to the player's opponents.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-28 18:24:19 -07:00
Jamin W. Collins
2b704e16c7 disable all network play variants 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-28 17:48:45 -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