external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,457 Commits 31 Branches 187 Tags
ffa7e3912151df72a7035d06af943b51e37121f4
Commit Graph

4819 Commits

Author SHA1 Message Date
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
Hans Mackowiak
84aaccc3da CountersPutEffect: fixes ChoiceAmount when it can be Zero 2021-03-13 21:39:35 +01:00
Michael Kamensky
c6a0a1a886 Merge branch 'conditions' into 'master' 
Fix ConditionLifeTotal

See merge request core-developers/forge!4192
 2021-03-13 17:26:53 +00:00
tool4EvEr
e661b9c0b0 Fix ConditionLifeTotal 2021-03-13 11:52:12 +01:00
Hans Mackowiak
174836a57f SacrificeAllEffect: check timestamp for LKI objects 2021-03-13 10:39:59 +01:00
Michael Kamensky
72e0fb9137 Merge branch 'costdreams' into 'master' 
Fix Devastating Dreams Cost

See merge request core-developers/forge!4187
 2021-03-13 03:39:40 +00:00
tool4EvEr
28be3e3931 Fix Devastating Dreams Cost 2021-03-12 21:12:06 +01:00
Bug Hunter
0b4cc03300 Tahngarth: fix attacking 2021-03-12 18:24:02 +00:00
Alumi
3692c2b391 Add Oracle en-Vec 2021-03-12 10:48:31 +00:00
Michael Kamensky
a36c00e999 Merge branch 'companion' into 'master' 
Restrictions for companion

Closes #1767

See merge request core-developers/forge!4171
 2021-03-12 07:31:15 +00:00
Michael Kamensky
b20c79acd6 Merge branch 'remove-svars' into 'master' 
Remove Svars param from Effect

See merge request core-developers/forge!4152
 2021-03-12 05:43:29 +00:00
tool4EvEr
8151297973 PlayerPredicates: full targetable check 2021-03-11 17:56:40 +01:00
Adam Pantel
26eb83bab3 Captains Maneuver start 2021-03-11 11:51:19 -05:00
Adam Pantel
8a603a2ab2 getSVars improvements, snapshot svars on effect 2021-03-11 11:51:19 -05:00
Adam Pantel
0c15649116 Remove effect svars (code) 2021-03-11 10:49:44 -05:00
Alumi
a305dc999e Add Season of the Witch 2021-03-11 14:30:17 +00:00
tool4EvEr
96a449361c Restrictions for companion 2021-03-10 23:45:12 +01:00
Michael Kamensky
7fe38f8dfa Merge branch 'master' into 'master' 
Torrent of Lava and other fixes

See merge request core-developers/forge!4136
 2021-03-08 14:07:46 +00:00
Adam Pantel
726163dc97 Spelling error 2021-03-07 23:42:13 -05:00
Michael Kamensky
0969645033 Merge branch 'card-fixes' into 'master' 
Card fixes

Closes #1763

See merge request core-developers/forge!4142
 2021-03-08 04:15:31 +00:00
Adam Pantel
e45ed35a79 Fix cloned Zaxara 2021-03-07 22:56:54 -05:00
Adam Pantel
dcda2ade1d [Un-cards] Minigame cards 2021-03-07 17:26:36 -05:00
Hythonia
ecff4f02a3 Miscellaneous fixes and adjustments 2021-03-07 15:22:09 +01:00
Adam Pantel
fdd5aa936f Remove code for References$ 2021-03-07 00:36:03 -05:00
Michael Kamensky
cbc0051f8a [maven-release-plugin] prepare for next development iteration 2021-03-07 08:00:39 +03:00
Michael Kamensky
0437e9354b [maven-release-plugin] prepare release forge-1.6.39 2021-03-07 08:00:30 +03:00
Adam Pantel
acb21b2a28 [Un-cards] DeckLimit keyword + Cardboard Carapace 2021-03-06 16:16:07 -05:00
Michael Kamensky
5decca1571 Merge branch 'master' into 'master' 
[Un-cards] Mine, Mine, Mine!

See merge request core-developers/forge!4122
 2021-03-06 11:09:29 +00:00
Hythonia
849c1faaff ULG: Mine, Mine, Mine! 2021-03-06 12:02:38 +01:00
Michael Kamensky
6b24d93d46 Merge branch 'fix_change_zone_all_remember_meld_mutate' into 'master' 
Remember meld and merged cards for ChangeZoneAll effect

See merge request core-developers/forge!4115
 2021-03-06 04:59:13 +00:00
Lyu Zong-Hong
41da75d346 Don't add SA that are permanent spells to mutated creature 2021-03-06 10:41:19 +09:00
Lyu Zong-Hong
16ed4fa97a Remember meld and merged cards for ChangeZoneAll effect 2021-03-06 10:15:04 +09:00