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,869 Commits 31 Branches 187 Tags
37de739a9cb152816310e96ea5e010eadb7ee64c
Commit Graph

5306 Commits

Author SHA1 Message Date
tool4EvEr
84f2d2ead2 Fix Seal of the Guildpact 2021-06-19 07:28:56 +02:00
Lyu Zong-Hong
c7d7130344 Update oracle for MH2 release 2021-06-19 12:47:36 +09:00
Lyu Zong-Hong
9a21f038ad Not use VAssignGenericAmount dialog for TwoEach ability 2021-06-18 18:28:15 +09:00
Lyu Zong-Hong
afa6c9986a Use VAssignGenericAmount dialog to assign mana combo 2021-06-18 17:58:52 +09:00
tool4EvEr
b5e55a3a47 Minor card fixes 2021-06-17 17:05:16 +02:00
Michael Kamensky
5e39a2979b Merge branch 'update_damage_replacement_cards' into 'master' 
Update some damage replacement related cards

See merge request core-developers/forge!4893
 2021-06-17 09:48:53 +00:00
Alumi
20dc234ec1 Update Illusionary Terrain and Vision Charm 2021-06-17 09:48:30 +00:00
Lyu Zong-Hong
cd29194824 Update some damage replacement related cards 2021-06-17 15:44:12 +09:00
tool4EvEr
28ee56baea Small Card fixes 2021-06-16 20:02:56 +02:00
Michael Kamensky
cc362cec5c Merge branch 'fix_trigger_damage_map' into 'master' 
Fix crash when triggered ability is using damage map

See merge request core-developers/forge!4889
 2021-06-16 15:04:26 +00:00
Michael Kamensky
b698b49256 Merge branch 'triggers' into 'master' 
AddToCombat: add missing block trigger

See merge request core-developers/forge!4887
 2021-06-16 15:04:14 +00:00
tool4EvEr
410ceb2bfc Fix facedown reveal 2021-06-16 16:32:43 +02:00
Lyu Zong-Hong
06fa495b0c Fix crash when triggered ability is using damage map by redirect them to the underlying sa 2021-06-16 20:48:50 +09:00
Michael Kamensky
c7d7f5c622 Merge branch 'paycheat' into 'master' 
Fix casting SA while refusing to pay CostSacrifice

See merge request core-developers/forge!4881
 2021-06-16 03:15:52 +00:00
tool4EvEr
d59d5b3b46 AddToCombat: add missing block triggers 2021-06-15 21:26:13 +02:00
tool4EvEr
b1b06dd0f4 Fix Reflect 2021-06-15 17:41:02 +02:00
tool4EvEr
001106ea7b Small fixes 2021-06-15 16:36:33 +02:00
Michael Kamensky
a3e302eee1 Merge branch 'stuff' into 'master' 
Cleanup some cards

See merge request core-developers/forge!4879
 2021-06-15 03:30:36 +00:00
tool4EvEr
56eda948d6 Fix Dermotaxi 2021-06-15 02:32:13 +02:00
tool4EvEr
1c0c0ad38d Fix casting SA while refusing to pay CostSacrifice 2021-06-15 01:28:46 +02:00
tool4EvEr
f447ab64ce Cleanup some cards 2021-06-14 20:45:52 +02:00
Michael Kamensky
32891863ad Merge branch 'pumpAI' into 'master' 
getPumpedCreature: Fix new ID for copy

Closes #1885

See merge request core-developers/forge!4876
 2021-06-13 12:49:47 +00:00
tool4EvEr
ff801fe747 Small fixes 2021-06-13 11:31:00 +02:00
tool4EvEr
73016d1fe0 Fix new ID for copy 2021-06-13 11:23:12 +02:00
Michael Kamensky
4e1c6cb678 [maven-release-plugin] prepare for next development iteration 2021-06-12 16:30:00 +03:00
Michael Kamensky
7e1fd332e0 [maven-release-plugin] prepare release forge-1.6.42 2021-06-12 16:29:51 +03:00
Michael Kamensky
58f369e6e5 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-12 16:25:34 +03:00
Michael Kamensky
368c2f9796 [maven-release-plugin] prepare for next development iteration 2021-06-12 16:13:39 +03:00
Michael Kamensky
d658df35d6 [maven-release-plugin] prepare release forge-1.6.41 2021-06-12 16:13:31 +03:00
Michael Kamensky
4b6edee3e6 Merge branch 'master' into 'master' 
Add Planeswalker achievements for MH2 by Marek14

See merge request core-developers/forge!4872
 2021-06-12 13:01:44 +00:00
Hans Mackowiak
9bdd4b9351 StaticAbilityPanharmonicon: add LastStateBattlefield to Trigger RunParams for stuff that destroys in sequence 2021-06-12 12:57:51 +00:00
tool4EvEr
e9b0902fe0 Fix CantBlockBy ability text not updating 2021-06-12 14:44:47 +02:00
Michael Kamensky
844098a302 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-12 11:28:43 +03:00
Sol
dbe1683ba9 Merge branch 'zabaz' into 'master' 
Zabaz: add Cause to ReplaceAddCounter

See merge request core-developers/forge!4863
 2021-06-11 12:29:46 +00:00
tool4EvEr
d853ca6615 Fix CostTapType NPE 2021-06-11 12:33:37 +02:00
Hans Mackowiak
fc82dbb9aa Zabaz: add Cause to ReplaceAddCounter 2021-06-11 08:31:30 +02:00
Michael Kamensky
c07f3ea34d Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-11 07:50:33 +03:00
Michael Kamensky
8948210e0a Merge branch 'fixland' into 'master' 
Fix playLand ETB check failing if lands changed by another effect

See merge request core-developers/forge!4860
 2021-06-11 03:47:55 +00:00
tool4EvEr
a9b60a87e0 Fix playLand ETB check failing if lands changed by another effect 2021-06-10 18:10:42 +02:00
Sol
694317a50f Merge branch 'fixes' into 'master' 
More small fixes

See merge request core-developers/forge!4855
 2021-06-10 15:36:25 +00:00
tool4EvEr
a856834693 Refactor guard 2021-06-10 17:29:26 +02:00
friarsol
31745fe31e isBlank() is from Java 11 2021-06-09 21:57:47 -04:00
tool4EvEr
084476b8b0 Clean up 2021-06-09 18:43:34 +02:00
Lyu Zong-Hong
f9abb8ca75 Add Garth One-Eye and necessary support 2021-06-09 23:07:55 +09:00
tool4EvEr
083674071b Reset xPaid after ability resolved 2021-06-09 11:40:01 +02:00
tool4EvEr
96ccf0afc6 More small fixes 2021-06-09 09:43:02 +02:00
tool4EvEr
cc8753b563 Small fixes 2021-06-08 23:17:55 +02:00
Michael Kamensky
5a0a63940d Merge branch 'typefix' into 'master' 
Fix missing type

See merge request core-developers/forge!4849
 2021-06-08 03:31:57 +00:00
tool4EvEr
3ab7fcf224 Fix NPE with Grakmaw when run from ChooseType 2021-06-07 22:40:16 +02:00
tool4EvEr
4f4fe04683 Fix missing type 2021-06-07 22:08:21 +02:00