external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,013 Commits 31 Branches 187 Tags
e60d5173f4335afb7d0809b9aa79d63c9fbd9a4d
Commit Graph

2514 Commits

Author SHA1 Message Date
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
c047ec8588 Update to card view of decks so long-press opens deck viewer to be consistent with list view 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
2891133c5c Update to card view of decks so long-press opens deck viewer to be consistent with list view 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
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
Jamin W. Collins
eff0012ea1 add warning to server connect dialog 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-24 15:32:30 -07: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
Jamin W. Collins
06bc5e074a ensure that View(s) are used for ManaAbility choice(s) 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-22 20:06:23 -07:00
Jamin W. Collins
21d6b02410 submit previous deck if sideboarding timeout occurs 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-21 17:27:03 -07:00
Jamin W. Collins
5b0b719ce9 use SpellAbilityView for generic effect choice(s) 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-21 17:13:33 -07:00
Jamin W. Collins
9ce0315c3e give remote players 5 minutes per question 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-21 17:10:51 -07:00
Jamin W. Collins
0a034f9acb ensure Stack targeting uses views 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-20 20:47:21 -07:00
Jamin W. Collins
98774c408c ensure that TargetSelection presents CardView(s) 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-20 20:20:41 -07:00
Jamin W. Collins
802036f693 print a message when unable to send event 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-20 15:27:18 -07:00
Jamin W. Collins
487fec0258 multiplayer fix for 2nd and 3rd games of match 
The server was not updating the lobby player's game reference.  So, the
remote client's response was being processed for the wrong game
instance.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-19 16:03:48 -07:00
Jamin W. Collins
d086e4d692 cleanup remote client game state creation 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-19 13:23:07 -07:00
Jamin W. Collins
8d2d66abb9 move external address out to a class attribute 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-19 13:23:07 -07:00
tehdiplomat
6ca1269261 Add ability to load tokens via scripts before 2018-02-19 13:15:12 -05: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
Sol
7ade1b9a52 Merge branch 'multiplayer' into 'master' 
Multiplayer

See merge request core-developers/forge!207
 2018-02-16 01:07:35 +00:00
Jamin W. Collins
b47d528bf0 ensure that remote client has trackers defined 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-15 17:07:14 -07:00
Seravy
59612c45ea Resolving conflicts 2018-02-15 10:03:54 +01: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
e8c9c8b90c Define getter for ClientGameLobby 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-13 18:41:56 -07:00
Jamin W. Collins
367fcad53c Define getter for GameView 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-13 18:38:58 -07: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
711342829b Improve interruption messaging 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-13 18:28:47 -07:00
Jamin W. Collins
daf3be6346 Improve reported multiplayer host IP 
The existing IP selection logic was less than optimal on Linux hosts
where it would frequently select and report 127.0.0.1 as the IP address
to share.  The new logic will create a datagram socket, use it to locate
an interface with a default route, and further backtrack to the
interface's IPv4 address.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-13 18:16:10 -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
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
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
Sol
14fc75be44 Merge branch 'QuestDraftSetFix' into 'master' 
Quest draft set fix

See merge request core-developers/forge!174
 2018-02-11 15:18:12 +00:00
Sol
a489e0845b Merge branch 'BonusForWinsOption' into 'master' 
Bonus for wins option

See merge request core-developers/forge!173
 2018-02-11 15:16:10 +00:00
Seravy
5dc5082c4e Added MAX to option variable name. 2018-02-09 10:58:07 +01:00
Seravy
42f79630e6 Deleted commented parts as suggested 2018-02-09 10:43:43 +01:00
Seravy
f8ccf0a91e Adding suggested simplification 2018-02-09 10:25:35 +01:00
Seravy
569e884a2c Adds an option to choose between draft rotation deleting, or replacing old drafts. 
Also moves the draft rotation settings to appear under "draft torunaments" where they belong.
 2018-02-08 14:13:11 +01:00
Agetian
647e9f6a14 - Got rid of an esoteric component for logging, switched over to standard err printout like it's done in most other places. 2018-02-08 15:28:50 +03:00
Seravy
a24cffa9df Makes the maximal amount of bonus for life total difference optional 2018-02-08 13:12:35 +01:00
Michael Kamensky
2b3e39cbb8 Merge branch 'regeneration' into 'master' 
Regeneration

See merge request core-developers/forge!168
 2018-02-08 12:07:41 +00:00
Seravy
689e5eecc4 Add options to control how much extra credits are given for accumulated wins 2018-02-08 12:04:07 +01:00
Agetian
c3b655f675 - Do not allow the human to confirm a Reveal cost with 0 revealed cards if the minimum is more than zero (fixes e.g. Morph costs with "Reveal a X card" when the human player doesn't have that kind of card in hand). 2018-02-06 22:17:48 +03:00
Hanmac
ff7a0f1ae6 Regeneration Rework: 
- Regenerate or RegenerateAll does create an Effect
in Command which does replace Destroy if possible
- Trigger Regenerated will be added to the Effect
if something does care about "regenerated that way"
- new Regeneration Api is the internal effect
that does handle the actual regeneration
- ReplaceDestroy has Section to handle if Regeneration is possible
- CardShields are removed with the option in PlayerController
 2018-02-06 12:56:02 +01:00
austinio7116
f7209ef32c Updates to card-based deck generation data and improvements to handling of non-basic land selection in those decks 2018-01-30 22:33:40 +00:00
Jamin W. Collins
fcb8e1f8c9 allow for custom deck directory paths 
This adds support for two additional configuration options to the
forge.profile.properties file:
 * decksDir
 * decksConstructedDir

The first sets the desired path for all decks.  The second sets the
desired path specifically for constructed decks.  This allows users to
reference an external directory that may be synced between multiple
users or systems by an external (to forge) mechanism.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-01-27 08:53:54 -07:00
Agetian
1e59b75d08 - Don't order cards from Discard<0/Hand> if there's only one card going to graveyard. 
- Allow to order the cards going to graveyard from Discard<X/Random>.
 2018-01-24 16:53:30 +03:00