external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,974 Commits 33 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

4900 Commits

Author SHA1 Message Date
Northmoc
d03bc797fc DiscardEffect.java add "RememberDiscardingPlayers" param 2021-03-25 18:13:10 -04:00
Hans Mackowiak
0413e5ded8 Fix ExiledWith being cleared when successfully added to MagicStack 2021-03-25 14:50:25 +01:00
Lyu Zong-Hong
d1de248894 Fix Invasion Plans 2021-03-25 21:19:28 +09:00
Hans Mackowiak
5b0a228f4f SpellAbilityEffect: fix untilHostLeavesPlayCommand to check the until CardCollection 2021-03-25 08:51:35 +01:00
Anthony Calosa
1745ee3e3b Merge branch 'master' into 'master' 
Fix TrackableProperty for cardbackup

See merge request core-developers/forge!4258
 2021-03-25 04:49:44 +00:00
Anthony Calosa
65f96ed9d0 Fix TrackableProperty for cardbackup 
- add IPaperCardType trackable
 2021-03-25 12:48:45 +08:00
Michael Kamensky
1ade85ad5d Merge branch 'silence' into 'master' 
Fix Suspend & CantBeCast

See merge request core-developers/forge!4255
 2021-03-25 04:07:59 +00:00
Anthony Calosa
b50d546279 Fix networkplay issue on cardbackup 2021-03-25 10:41:17 +08:00
tool4EvEr
fedc92977a Fix Suspend & CantBeCast 2021-03-24 21:16:33 +01:00
Hythonia
9db11ce690 ManaEffect rework 2021-03-24 20:14:41 +01:00
Hans Mackowiak
9ca66c213d Merge branch 'cleanup' into 'master' 
Code cleanup

See merge request core-developers/forge!4248
 2021-03-23 17:17:37 +00:00
tool4EvEr
dda5af5d4d Code cleanup 2021-03-22 21:54:09 +01:00
Michael Kamensky
89dfdff05b Merge branch 'raging_river' into 'master' 
Add Raging River

See merge request core-developers/forge!4244
 2021-03-22 19:05:32 +00:00
tool4EvEr
a08dd6efc8 Fix DifferentCardNames counting 2021-03-22 18:39:23 +01:00
Lyu Zong-Hong
214a35ba5e Add Raging River 2021-03-23 02:18:01 +09:00
Bug Hunter
e6c60f389f getCardsfromTargets: Add sanity check 2021-03-22 14:45:37 +00:00
Lyu Zong-Hong
af6e091b02 Add Backdraft 2021-03-21 18:39:33 +09:00
Hans Mackowiak
1742c30450 fix bestow and ExiledWith when adding to Stack 2021-03-21 09:07:36 +01:00
Michael Kamensky
4687ad7f38 Merge branch 'torch' into 'master' 
Fix Blazing Torch ability

See merge request core-developers/forge!4237
 2021-03-21 05:16:45 +00:00
Michael Kamensky
53b2088b33 Merge branch 'card-fixes' into 'master' 
Two Topsy Turvies cancel out

See merge request core-developers/forge!4235
 2021-03-21 05:16:39 +00:00
Anthony Calosa
4bf557ca91 Update forge-game/src/main/java/forge/game/card/Card.java 2021-03-20 23:43:41 +00:00
tool4EvEr
db451886ad Fix Blazing Torch ability 2021-03-20 21:16:13 +01:00
Adam Pantel
05547bfda6 Two Topsy Turvies cancel out 2021-03-20 15:30:17 -04:00
Anthony Calosa
aa8ed1ed8d Update forge-game/src/main/java/forge/game/card/Card.java 2021-03-20 16:25:53 +00:00
Anthony Calosa
76cfe3da35 Update forge-game/src/main/java/forge/game/card/Card.java 2021-03-20 16:03:22 +00:00
Anthony Calosa
5f8a3a9c36 Fix modal card backside playing ability transforming to original state 
close #1777
 2021-03-20 13:32:01 +00:00
Hans Mackowiak
730bf1befa Merge branch 'fixtargets2' into 'master' 
Fix Spell targets

See merge request core-developers/forge!4226
 2021-03-20 11:10:45 +00:00
Alumi
9c11c90f48 Fix Piracy mana restriction 2021-03-20 08:37:59 +00:00
Michael Kamensky
29bf2970f3 Merge branch 'rollback_Phase_dev' into 'master' 
[Mobile] add Experimental Rollback Phase

See merge request core-developers/forge!4195
 2021-03-20 04:31:57 +00:00
Bug Hunter
be9de2cc09 Fix cards 2021-03-20 03:43:12 +00:00
tool4EvEr
0c1ca71f93 Fix Spell targets 2021-03-19 23:13:11 +01:00
Anthony Calosa
9ce1ce14d3 Merge remote-tracking branch 'core/master' into rollback_Phase_dev 2021-03-20 02:42:14 +08:00
Bug Hunter
1dfbc7638a Imoti: Cascade by looking at spell cmc 2021-03-19 17:39:46 +00:00
Alumi
903b0130c7 Add Ertai's Meddling 2021-03-19 16:11:46 +00:00
Lyu Zong-Hong
6b4878776d Fix scheme triggers are registered twice issue. 2021-03-19 11:01:14 +09:00
Hans Mackowiak
0d81961325 AbilityUtils: don't crash when CardTrait is null 2021-03-18 13:37:05 +01:00
Anthony Calosa
f71e31c3a8 Merge remote-tracking branch 'core/master' into rollback_Phase_dev 
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
#	forge-gui-mobile/src/forge/screens/match/MatchController.java
#	forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java
#	forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java
 2021-03-18 17:19:08 +08:00
Michael Kamensky
fc5557a137 Merge branch 'refactor_add_phase' into 'master' 
Refactor AddPhase effect and add World at War

Closes #1606

See merge request core-developers/forge!4214
 2021-03-18 05:01:17 +00:00
Bug Hunter
19a8c821fe RestartGameEffect: refactor resets 2021-03-18 05:01:12 +00:00
Lyu Zong-Hong
69c17586aa Refactor AddPhase effect and add World at War 2021-03-18 13:26:15 +09:00
Leandro Doctors
0978162bf5 Organize imports 2021-03-17 11:52:50 -03:00
Alumi
b6b1ae852d Refactor skip phase/step using replacement effect. Also add Fasting. 2021-03-17 05:43:32 +00:00
tool4EvEr
c9bc9b6a57 Fix ReplaceToken 2021-03-16 21:02:12 +01:00
tool4EvEr
89193429ab EnteredSinceYourLastTurn: use controller of SA, not target 2021-03-15 21:54:41 +01:00
Hans Mackowiak
6ad193a097 fix EnteredSinceYourLastTurn 2021-03-15 21:17:40 +01:00
Hans Mackowiak
0dfe28a861 CardTraitBase: matchesValid as instance method, better use for isValid 
Conflicts:
	forge-gui/res/cardsfolder/d/day_of_the_dragons.txt
	forge-gui/res/cardsfolder/d/deputy_of_detention.txt
	forge-gui/res/cardsfolder/i/induced_amnesia.txt
	forge-gui/res/cardsfolder/l/living_lore.txt
	forge-gui/res/cardsfolder/p/phyrexian_devourer.txt
	forge-gui/res/cardsfolder/p/prototype_portal.txt
	forge-gui/res/cardsfolder/s/search_the_city.txt
	forge-gui/res/cardsfolder/s/skyclave_apparition.txt
	forge-gui/res/cardsfolder/s/soul_foundry.txt
	forge-gui/res/cardsfolder/s/strata_scythe.txt
	forge-gui/res/cardsfolder/s/sutured_ghoul.txt
 2021-03-15 18:22:24 +00:00
Hans Mackowiak
34a813baeb ChangeZoneEffect: add UntilHostLeavesPlay to use GameCommand instead of StaticTrigger 2021-03-15 15:36:55 +00:00
Hans Mackowiak
350fed6d77 Remove RememberMap, use EnteredSinceYourLastTurn instead 2021-03-15 13:39:34 +01:00
Alumi
c5ad28a65e Re-implement skip turn using replacement effect 2021-03-14 04:53:55 +00:00
Anthony Calosa
68ecf41511 [Mobile] add Experimental Rollback Phase 2021-03-14 11:57:20 +08:00