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
swordshine
1bd18eece0 Merge branch 'master' into 'master' 
Support playing against Net Decks through the Test Deck function on mobile Forge.

See merge request core-developers/forge!307
 2018-03-23 04:12:02 +00:00
Michael Kamensky
7d39889cef Merge branch 'androidmultiaiplayers' into 'master' 
3/4 player matches on Android

See merge request core-developers/forge!295
 2018-03-21 18:20:22 +00: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
austinio7116
951a5dc978 Enabled team combo box on android now that multiplayer is possible, also attempted to prevent hanging on conceding in multiplayer games - only working on android so far 2018-03-20 21:53:06 +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
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
austinio7116
df61e5d9aa Update to android to support 3/4 player games 2018-03-14 23:05:07 +00:00
Hanmac
9f7e02933f CostDamage: use spellAbility as cause 2018-03-14 07:15:04 +01:00
Hanmac
0b64ffb4c7 DamageMap: use cause for Lifelink part 2018-03-14 07:15:03 +01:00
Hanmac
c74b0a017b Damage: add Cause Param for damage deal, needed for Silhouette or Bronze Horse 2018-03-14 07:15:03 +01: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
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
Jamin W. Collins
d9913ffb1e broadcast message on player leaving, like joins 
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
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
f76c60e867 CommanderDeckGenerator: fixed getCommanderDecks 2018-03-06 22:10:20 +01:00
austinio7116
ca099e077b Ensuring that non-AI cards are excluded from the list of card-based decks that can be selected for an AI player 2018-03-05 12:43:05 +00:00
Seravy
3ea30a4461 Basic lands from drafts, except foils, do not get added to the player's inventory, to avoid generating an infinite lands through "add basic land". This both removes potential abuse by selling them, and eliminates the annoyance of having these lands wasting space in your inventory. 2018-03-04 23:53:27 +01: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
austinio7116
1b0955b959 Removed commented out code and moved comment to correct location 2018-03-04 06:35:39 +00:00
austinio7116
73a623cc1b Fixed card-based deck generation where extra colours were kept despite no cards of that colour being included. 2018-03-03 10:53:57 +00:00
austinio7116
e0882ab6b5 Switched off logging in deckbuilder 2018-03-03 10:23:31 +00:00
Jamin W. Collins
f01df7bdd2 display broadcast messages on server too 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-02 18:58:34 -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
Jamin W. Collins
e9217f3261 fix server startup indentation for readability 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-02 18:58:34 -07:00
Jamin W. Collins
d2e4c53c20 Improve TargetSelection#chooseCardFromList 
Closes core-developers/forge#151

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-02 18:58:34 -07:00
maustin
cd0cf2106a Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements 2018-03-02 20:09:24 +00: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
austinio7116
b67c060211 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 19:49:42 +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
austinio7116
9cfc42156d Remove dual lands from mono coloured generated decks 2018-03-01 16:07:09 +00:00
austinio7116
52d8e3d54f Fixed issue where generic mana cost creatures with colour identities were getting into decks that could not activate their abilities 2018-03-01 15:37:24 +00:00
austinio7116
ad693eb71f Switched off deck builder logging 2018-03-01 07:09:28 +00:00
maustin
02eb8f632f Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements 
# Conflicts:
#	forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
#	forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
 2018-03-01 06:55:16 +00:00
austinio7116
352236c390 Moved magic number to static variable 2018-03-01 06:54:04 +00:00
austinio7116
cb5f5938f7 Fixed issue with using random n-color deck generators for commander and tiny leaders by switching to the same deck generator as the card-based deck generation for consistency and to prevent tiny leader decks being short of cards using the n-color generators. 2018-03-01 06:14:38 +00:00
austinio7116
ed4583ee7a Fixed adding wastes in colourless decks 2018-03-01 06:14:38 +00:00
austinio7116
d4b09f39ad Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model. 2018-03-01 06:14:38 +00:00
austinio7116
25ab2ca2dc Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model. 2018-03-01 06:13:25 +00:00
Jamin W. Collins
420d31f825 replicate PlayerView(s) from incoming to existing 
With standard network play games, we got lucky.  With variants the
existing approach was not accurately reflecting state changes.  This
appears to be resolved by replicating incoming PlayerView objects onto
their existing versions inside the Tracker object.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-28 18:09:49 -07:00
Jamin W. Collins
72ca147b73 ensure that selected variant is applied to GameRules 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-28 17:59:38 -07:00
Jamin W. Collins
f1a001a834 retrieve GameType from the Lobby 
The existing GameView does not accurately reflect the GameType when
variants are selected.  The Lobby does have the correct GameType.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-28 17:55:32 -07:00
austinio7116
9aa6990823 Fixed issue with using random n-color deck generators for commander and tiny leaders by switching to the same deck generator as the card-based deck generation for consistency and to prevent tiny leader decks being short of cards using the n-color generators. 2018-02-28 22:11:05 +00:00
austinio7116
f8f3f640e3 Fixed adding wastes in colourless decks 2018-02-28 18:05:58 +00:00
austinio7116
6f28d0721e Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model. 2018-02-28 13:53:43 +00:00
austinio7116
74d0e4c4dc Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model. 2018-02-28 13:00:10 +00:00
austinio7116
2b40b6e560 Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model. 2018-02-28 12:10:53 +00: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
c5c04e762f Code reformat to improve readability and supportiblity whilst addressing issues raised in friarsol's code review 2018-02-27 14:52:41 +00:00