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
66,835 Commits 32 Branches 187 Tags
bada43b901b55a573d245800f1ec53e474917ef1
Commit Graph

2461 Commits

Author SHA1 Message Date
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
austinio7116
aaf27f2d60 Added options to disable card based deck generation and to ensure it fails gracefully if .dat data and/or decks folder is missing 2018-02-26 23:54:27 +00:00
austinio7116
9cb1f2787c Assigning lstDecks.getGameType().getDeckFormat() to a variable so we don't have to write it out each conditional 2018-02-26 23:49:47 +00:00
austinio7116
2b54468923 Increased basic land count in random commander decks. 
Fixed lobby update on variant change
 2018-02-26 23:49:47 +00:00
austinio7116
e8f257d2cf Completed random commander deck generation refactoring to work on Desktop, to support partner commanders and corrected a number of bugs found during testing. Full support on android and desktop for saving of selected deck states for the new features added. 2018-02-26 23:49:47 +00:00
austinio7116
66763e537d 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
austinio7116
6231775997 Increased basic land count in random commander decks. 
Fixed lobby update on variant change
 2018-02-26 23:49:47 +00:00
austinio7116
61ff4d50fd Completed random commander deck generation refactoring to work on Desktop, to support partner commanders and corrected a number of bugs found during testing. Full support on android and desktop for saving of selected deck states for the new features added. 2018-02-26 23:49:47 +00:00
austinio7116
13560e3b53 Error handling and thread timeout added to simulated matches to allow large AI tournaments without infinite length games due to loops. AI tournaments should now always finish - if the matches take too long they are scored as a draw. 2018-02-26 23:49:47 +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
Jamin W. Collins
fd35c8d862 add option to be alerted on receipt of priority 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-24 10:51:43 -07:00
austinio7116
361443d845 Extended multiplayer chat text box to 255 character max from 60 
Prevented the game from stealing focus from the multi player chat box to ensure you do not auto end turn or pass priority due to typing in chat when you regain priority
 2018-02-23 21:20:25 +00:00
Michael Kamensky
21e682f54d Merge branch 'deck-editor' into 'master' 
improve how foiling is done

See merge request core-developers/forge!233
 2018-02-19 04:27:28 +00:00
Jamin W. Collins
f6bd725633 improve how foiling is done 
Previous implementation relied on the removed card becoming focused in
the full card inventory.  This implementation works directly with the
deck avoiding the full inventory.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-18 12:51:55 -07:00
Michael Kamensky
275e1be6be Revert "Merge branch 'Guavafix' into 'master'" 
This reverts merge request !217
 2018-02-18 18:54:20 +00:00
Hanmac
25efe15329 fix final in ACEditor 2018-02-18 11:17:48 +01:00
Michael Kamensky
6b528a6d99 Merge branch 'DeckResetFixing' into 'master' 
Deck reset fixing

See merge request core-developers/forge!213
 2018-02-18 08:36:08 +00:00
Michael Kamensky
a392fc43f9 Merge branch 'deck-viewer' into 'master' 
improve "Copy to Clipboard" - merge reprinted cards

See merge request core-developers/forge!215
 2018-02-18 07:41:49 +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
373e11bc41 add option to foil cards in a deck 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-17 12:42:56 -07:00
Jamin W. Collins
4e7d338144 improve "Copy to Clipboard" - merge reprinted cards 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-17 08:48:45 -07:00
Seravy
b6395aa463 The guava fix 2018-02-17 12:06:57 +01:00
Sol
7ade1b9a52 Merge branch 'multiplayer' into 'master' 
Multiplayer

See merge request core-developers/forge!207
 2018-02-16 01:07:35 +00:00
Seravy
e8be6f674e Add quest mode option to make Foil and Personal Rating filters default on all editor screens. 2018-02-15 10:01:59 +01:00
Jamin W. Collins
375adab087 gracefully handle failure to connect to server 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-13 18:33:25 -07:00
Jamin W. Collins
fbf0f98c3a Limit team editing to each player 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-13 18:30:58 -07:00
Sol
5e5fca9722 Merge branch 'LifeTotalBonusOption' into 'master' 
Life total bonus option

See merge request core-developers/forge!176
 2018-02-13 02:57:25 +00:00
Seravy
3b72bd18f0 Now quest data needs to be saved when changing decks, instead of quest preferences. 2018-02-13 02:14:42 +01:00
Seravy
56983b2553 Moves "Current_Deck" from Quest Preferences to Quest Data. 
Without this, the selected deck name was global for all quests - switching to another quest retained the deck name from the previous quest
and if the new quest had a deck with the identical name, selected that one, otherwise selected nothing. (in one weird case, this resulted in quest data that crashed caused bugs when loading forge - as quest was saved with a selected deck from another quest data.)
Preferred behavior is to select the deck that was last selected in THAT QUEST when switching to another quest.
 2018-02-13 01:37:00 +01:00
Seravy
67e8046af6 Remove the line that resets the selected deck index to 0, so the next time the deck tab is opened, it autopicks the first deck instead of keeping what was last chosen. 2018-02-13 00:43:26 +01:00
Sol
dc11fad342 Merge branch 'QuestDraftRotation' into 'master' 
Quest draft rotation

See merge request core-developers/forge!179
 2018-02-12 03:06:40 +00:00