external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,509 Commits 33 Branches 187 Tags
057f5face3ee3f858e546b0e45aabce8f62cec7c
Commit Graph

36509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sol
9a3bc52ffb Merge branch 'network-play' into 'master' 
Network Play

See merge request core-developers/forge!277
 2018-03-08 02:15:10 +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
Sol
534a161dc0 Merge branch 'fixes' into 'master' 
Fixes

See merge request core-developers/forge!276
 2018-03-07 21:46:27 +00:00
Hans Mackowiak
83b1965733 Merge branch 'master' into 'fixes' 2018-03-07 13:59:49 +00:00
Hanmac
d9df1243b6 mark effect as final 2018-03-07 07:04:57 +01:00
Hanmac
b88365e475 SpellAbility fixed some changes 2018-03-07 07:04:00 +01: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
97e17a7754 Merge branch 'a25draftingfixes' into 'master' 
A25draftingfixes

See merge request core-developers/forge!275
 2018-03-07 03:58:41 +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
65d65c9e5f Treasure map: update code using Branch to remove trigger 2018-03-06 22:18:23 +01:00
Hanmac
c5c3591471 TokenEffect: use sa instead of root 2018-03-06 22:11:35 +01:00
Hanmac
a47c3cf004 SetStateEffect: check for StoredTransform svar 2018-03-06 22:11:22 +01:00
Hanmac
f76c60e867 CommanderDeckGenerator: fixed getCommanderDecks 2018-03-06 22:10:20 +01:00
Hanmac
58bba637ca SimulateMatch: fixed simulateSingleMatch 2018-03-06 22:10:11 +01:00
Hanmac
59063bc194 CardTraitBase: use GameObject so it works with SpellAbility too 2018-03-06 22:08:27 +01:00
Hanmac
2e33b3162c AbilityUtils: fixed getSpellAbilities if sa is null 2018-03-06 22:07:53 +01:00
Hanmac
1e7755b877 CloneEffect: setOriginalHost instead of setHostCard 2018-03-06 22:06:44 +01:00
Hanmac
7b8e92ace2 CardFactoryUtil: use AdditionalAbilityList with better check for Fabricate 2018-03-06 22:06:24 +01:00
Hanmac
e25247d0e5 SpellAbility: add IsTargeting property, fixed additional abilities for clone 2018-03-06 22:03:00 +01:00
Hanmac
93dc3338c1 SpellAbility: isValid check for root 2018-03-06 22:01:51 +01:00
austinio7116
fcd392eec1 Added Masters 25 to draft blockdata for drafting and corrected Konming Sleeping Dragon quotes and rarity of Akroma 2018-03-06 19:50:36 +00:00
maustin
81b002ad63 Merge branch 'master' into deckgenimprovements 2018-03-06 19:47:06 +00:00
maustin
70feec2f5a Merge remote-tracking branch 'origin/master' 2018-03-06 19:46:33 +00: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
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
austinio7116
30048e7a82 Moved repeated AI slot check logic into single boolean 2018-03-05 08:26:06 +00:00
Michael Kamensky
2ee05f46e7 Merge branch 'masters-25' into 'master' 
Masters 25 booster box

See merge request core-developers/forge!272
 2018-03-05 04:07:18 +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
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