external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,379 Commits 32 Branches 187 Tags
14f3d77e7e5eb6d0adcf5e82ddb99b51ea7ce203
Commit Graph

36379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Schnautz
4027e14266 Masters 25 2018-03-04 20:47:02 +00:00
maustin
a84da053a6 Updated card-based deck generation data 2018-03-04 13:58:53 +00:00
austinio7116
1b0955b959 Removed commented out code and moved comment to correct location 2018-03-04 06:35:39 +00:00
Michael Kamensky
bbcea47bfd Merge branch 'foil' into 'master' 
move foil option to be available in all sections

See merge request core-developers/forge!269
 2018-03-04 05:04:22 +00:00
Michael Kamensky
88f656f937 Merge branch 'master' into 'master' 
- Preparing Forge for Android v1.6.7.001 [incremental].

See merge request core-developers/forge!270
 2018-03-04 05:04:10 +00:00
Agetian
148e569182 - Preparing Forge for Android v1.6.7.001 [incremental]. 2018-03-04 08:01:25 +03: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
Sol
594ce263b6 Merge branch 'multiplayer' into 'master' 
Multiplayer

Closes #161 and #151

See merge request core-developers/forge!268
 2018-03-03 14:27:12 +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
maustin
c93d9d909d Merge branch 'master' into deckgenimprovements 2018-03-03 07:19:44 +00:00
maustin
8e5775dd2c Merge remote-tracking branch 'origin/master' 2018-03-03 07:16:41 +00:00
Michael Kamensky
dd38c0d581 Merge branch 'oracle-updates' into 'master' 
Oracle updates

See merge request core-developers/forge!266
 2018-03-03 04:28:57 +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
Jamin Collins
c402ae645e Merge branch 'masters25' into 'master' 
Adding Masters25 cards and perliminary rankings

See merge request core-developers/forge!267
 2018-03-03 00:25:54 +00:00
Chris H
9c69a33734 Adding Masters25 cards and perliminary rankings 2018-03-02 19:12:13 -05:00
Rob Schnautz
47eb18142d Update summoners_pact.txt 2018-03-02 22:25:11 +00:00
Rob Schnautz
0ca97727ad Update ash_barrens.txt 2018-03-02 22:24:14 +00: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
Michael Kamensky
d20317dd62 Merge branch 'patch-1' into 'master' 
Oracle updates

See merge request core-developers/forge!261
 2018-03-01 17:00:13 +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
maustin
186b56c335 Merge branch 'master' into deckgenimprovements 2018-03-01 12:41:28 +00:00
maustin
006bbf8fa0 Merge remote-tracking branch 'origin/master' 2018-03-01 12:41:11 +00:00
austinio7116
ec6ccb69dd Merge branch 'multiplayer' into 'master' 
Multiplayer

See merge request core-developers/forge!265
 2018-03-01 12:08:43 +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
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
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
maustin
c6714fcc4e Merge remote-tracking branch 'origin/master' 2018-03-01 06:12:36 +00:00
Sol
0f558f0479 Merge branch 'fix-zealous-inquisitor' into 'master' 
Fix Zealous Inquisitor spell description

See merge request core-developers/forge!264
 2018-03-01 03:29:34 +00:00
Chris H
4ca87ab84e Fix Zealous Inquisitor spell description 2018-02-28 22:28:14 -05:00
Sol
90d9c45134 Merge branch 'multiplayer' into 'master' 
Multiplayer

Closes #157

See merge request core-developers/forge!262
 2018-03-01 03:12:26 +00: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
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
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 Collins
8db64ffd0a Merge branch 'fix-npe-token-scripts' into 'master' 
Fix NPE for Tokens created by Liliana the Last Hope

See merge request core-developers/forge!263
 2018-03-01 02:15:12 +00:00
Chris H
9a6f407a6d Fix NPE for Tokens created by Liliana the Last Hope 2018-02-28 21:09:27 -05: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