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
51,951 Commits 31 Branches 187 Tags
b049c8c09becb7188894a86bb76f7abcded916f3
Commit Graph

3490 Commits

Author SHA1 Message Date
Hans Mackowiak
88c017f962 GameView: do not store Game anymore, get it from Match 2020-11-29 11:18:58 +01:00
Hans Mackowiak
ab0331cd6e SpellAbility: moved ManaSpent from Card into CastSA 2020-11-28 11:44:24 +01:00
Michael Kamensky
c9f9781576 Merge branch 'doubleagenda' into 'master' 
Double agenda - Summoner's Bond!

Closes #113

See merge request core-developers/forge!3449
 2020-11-28 04:23:01 +00:00
Hythonia
3d46bb89ae Revert "Drain Life update" 
This reverts commit 539406b4a1f032e78a91550e65b4c21924082d3d
 2020-11-28 04:05:47 +00:00
Northmoc
8abb8e784d Double agenda - Summoner's Bond! 2020-11-27 15:53:12 -05:00
Northmoc
a3908b3edb add XMaxLimit to announce 2020-11-23 18:49:32 -05:00
Hans Mackowiak
ba37bf2312 PlayerController: fix copy activated abilities 2020-11-22 12:18:13 +01:00
friarsol
3ba8892c4f Double Pick each pass 2020-11-18 18:13:33 -05:00
Michael Kamensky
57b9260d8a Merge branch 'true_editions' into 'master' 
Editions can generate their own print sheets now

See merge request core-developers/forge!3344
 2020-11-09 04:38:04 +00:00
Hans Mackowiak
71348b7317 TargetChoices extend ForwardingList 2020-11-08 10:48:01 +01:00
friarsol
abad110caf Editions can generate their own print sheets now 2020-11-06 11:36:04 -05:00
Hans Mackowiak
386260ea0d fix spell ability copies only on stack when spells 2020-11-05 20:22:32 +01:00
Tim Mocny
85357aba2c add CardProperty IsNotCommander (fixes Slash the Ranks for AI) 2020-11-04 19:46:14 +00:00
Hans Mackowiak
9b040b063b - DelayedTriggerAi: port over AILogic NarsetRebound and SpellCopy (the latter doesn't quite work yet and the spell somehow magically fizzles with no trace). 2020-11-04 08:56:41 +00:00
Hans Mackowiak
bc9b2a0268 Cascade: fix Maelstrom Nexus and Golos 2020-11-02 08:09:56 +01:00
CCTV-1
9d30bf9343 Merge remote-tracking branch 'upstream/master' into display_localization_cardname 2020-10-28 18:11:11 +08:00
Anthony Calosa
fde28d1fea Add alternate preference for displaying life, experience, energy and poison counters 2020-10-28 06:19:12 +08:00
Anthony Calosa
2709968e25 Merge remote-tracking branch 'core/master' into newBranch 2020-10-23 18:00:36 +08:00
Anthony Calosa
04be4ce993 Refactor ReplaceAll 2020-10-23 17:51:57 +08:00
Michael Kamensky
0cc174fe99 Merge branch 'themed-chaos-drafts' into 'master' 
Themed Chaos Drafts

See merge request core-developers/forge!3283
 2020-10-23 08:03:37 +00:00
pfirpfel
f277b72a67 Move empty init exception into BagRandomizer 2020-10-22 22:42:27 +02:00
pfirpfel
fd1ece9aea Add more documentation 2020-10-22 21:42:06 +02:00
Anthony Calosa
63e67b0aa5 [Mobile] Prevent Conceding while on Mulligan 
closes issue #1376
 2020-10-22 20:36:59 +08:00
pfirpfel
1f2c41a729 Fix format filter 2020-10-21 23:13:40 +02:00
pfirpfel
2b07183ef9 Add more theme data 2020-10-21 22:15:02 +02:00
pfirpfel
01992c62e6 Add initial new themed chaos draft functionality 
Add new randomizer
 2020-10-21 22:14:55 +02:00
Michael Kamensky
7808252c14 - Alternate Sound System: don't use it in LibGdx port, matters for the Forge backport (only needed in desktop Forge on *nix systems). 2020-10-14 21:47:03 +03:00
Michael Kamensky
936d07bd86 Merge branch 'newBranch' into 'master' 
[Mobile] Update some GUI Elements

See merge request core-developers/forge!3255
 2020-10-11 13:26:28 +00:00
Alessandro Coli
77938a8b90 Implementation to make available (for Wild opponents) also the decks 
stored in subfolders of the main "constructed" folder
 2020-10-11 14:22:51 +02:00
Anthony Calosa
688fad9023 [Mobile] Added Deckbox and Commander Background for ImageView 
- updated Assets required!
 2020-10-11 14:18:21 +08:00
Anthony Calosa
58805979c2 removed unused imports 2020-10-05 11:29:15 +08:00
Michael Kamensky
5536f3c33a Merge branch 'questMode_wildOpponents' into 'master' 
Wild opponents included in the "random duel choice"

See merge request core-developers/forge!3226
 2020-10-04 12:44:20 +00:00
Michael Kamensky
784455c9df Merge branch 'cardTypeMimicFixes' into 'master' 
CardType: sanisfySubtypes each time its changed, moved shareTypeWith functions into CardType

See merge request core-developers/forge!3222
 2020-10-04 04:13:32 +00:00
Sol
2c3b56c562 Merge branch 'newBranch' into 'master' 
[Mobile] Fix Quest Tournament loading

See merge request core-developers/forge!3221
 2020-10-04 01:26:40 +00:00
Alessandro Coli
07a6b94d7c In case wild opponents are enabled and available, the "random opponent" 
choice use them in the randomization, with a 50% possibility to propose
one of them.
 2020-10-03 14:10:24 +02:00
Hans Mackowiak
e281f1e5ec CardType: sanisfySubtypes each time its changed, moved shareTypeWith functions into CardType 2020-10-03 10:04:10 +02:00
Anthony Calosa
ccc0ac5f78 Fix Quest Tournament loading on Mobile :) 2020-10-03 14:54:23 +08:00
Hans Mackowiak
5854a2ff36 GUI: make many call getChoices and not order 2020-10-03 08:29:57 +02:00
Michael Kamensky
b2adfd4a02 Merge branch '1577-znr-charm-effect-tweaks' into 'master' 
Resolve "ZNR: Charm Effect tweaks"

Closes #1562, #1570, and #1577

See merge request core-developers/forge!3197
 2020-10-01 05:02:41 +00:00
Hans Mackowiak
daf70f7e60 Resolve "ZNR: Charm Effect tweaks" 2020-10-01 05:02:41 +00:00
Anthony Calosa
645fa3af3b Prioritize FTP images before scryfall 2020-10-01 00:41:46 +08:00
Anthony Calosa
5be73af7e9 Fix GenericChoice UI 2020-09-30 21:26:06 +08:00
Michael Kamensky
f6c9552c1e Merge branch 'questMode_wildOpponents' into 'master' 
Quest mode wild opponents

See merge request core-developers/forge!3202
 2020-09-30 05:46:47 +00:00
Alessandro Coli
4345d97faf Merge branch 'master' into questMode_wildOpponents 2020-09-29 19:58:46 +02:00
Anthony Calosa
3c76fb4971 [Mobile] Minor Improvement and Fixes 
-Add auto game pause when the spectator is viewing zoomed cards (prevents the bug when you're viewing zoomed cards and suddenly the match ends (AI vs AI), you cannot open the zoom overlay until you restart the app again)
-Fix exiled Facedown card should display the hidden image and not the morph image (Gonti, Lord of Luxury, etc)
-Show Winlose Overlay button should only be enabled when match is over otherwise its disabled.
 2020-09-29 18:52:27 +08:00
Alessandro Coli
c0a3d96621 Merge branch 'master' into questMode_wildOpponents 
# Conflicts:
#	forge-gui/res/languages/en-US.properties
 2020-09-27 16:01:56 +02:00
Alessandro Coli
1382952d76 Introduced 2 quest preferences for the multiplier and the number of wild 
opponents
 2020-09-27 14:14:12 +02:00
Anthony Calosa
8d2e47e993 Update added Borderless Card list 2020-09-27 12:15:35 +08:00
Michael Kamensky
3745da900a Merge branch 'landPopupPanel' into 'master' 
New options introduced to see the popup only for nonbasic lands.

See merge request core-developers/forge!3191
 2020-09-26 16:31:23 +00:00
Alessandro Coli
36da6b6c7f New options introduced to see the popup only for nonbasic lands. 
Trigger of the popup moved earlier so as the sound will play on its
closure (when the lands enters play) and not on its opening.
 2020-09-26 14:24:55 +02:00