external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,331 Commits 32 Branches 187 Tags
d64cda692b55e98f97df3225eaf0d65ebac205cc
Commit Graph

41331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
bf0e0a94e4 Merge branch 'master' into 'master' 
fix digging with change number of 0

See merge request core-developers/forge!1394
 2019-02-14 16:32:22 +00:00
Peter F. Patel-Schneider
3a71e2e948 fix digging with change number of 0 2019-02-14 11:04:11 -05:00
Sol
a739492591 Merge branch 'master' into 'master' 
Update lavinia_azorius_renegade.txt

See merge request core-developers/forge!1393
 2019-02-14 04:04:10 +00:00
T.J. Tillman
7a14109abc Update lavinia_azorius_renegade.txt 2019-02-14 01:15:58 +00:00
Michael Kamensky
708886e8cf Merge branch 'master' into 'master' 
Add several APIs to the timestamp check in Wrapped Ability, fixes e.g. Toothy LTB trigger.

Closes #839

See merge request core-developers/forge!1392
 2019-02-13 07:05:46 +00:00
Agetian
ab56e1f7d4 - Add several APIs to the timestamp check in Wrapped Ability, fixes e.g. Toothy LTB trigger. 2019-02-13 10:05:05 +03:00
swordshine
038bc27074 Merge branch 'patch-1' into 'master' 
Update ragavan.txt

See merge request core-developers/forge!1391
 2019-02-13 02:42:06 +00:00
Sol
4cc397baa4 Update ragavan.txt 2019-02-13 02:11:13 +00:00
Michael Kamensky
398b2ee324 Merge branch 'splitcmc' into 'master' 
Fix for CMC of split cards on the stack

Closes #538

See merge request core-developers/forge!1318
 2019-02-12 03:59:07 +00:00
Evan Murawski
6f85b09ee4 Fix for CMC of split cards on the stack 2019-02-12 03:59:07 +00:00
Michael Kamensky
00f6445049 Merge branch 'master' into 'master' 
Added puzzle PS_RNA3.

See merge request core-developers/forge!1390
 2019-02-12 03:53:34 +00:00
Agetian
24d857f269 - Added puzzle PS_RNA3. 2019-02-12 06:52:48 +03:00
Michael Kamensky
cb13f0a685 Merge branch 'master' into 'master' 
allow floating zones to be sorted by the name of the card

See merge request core-developers/forge!1387
 2019-02-12 03:35:49 +00:00
Peter F. Patel-Schneider
e8f14d5a6c describe change in CHANGES.txt; comment cleanup 2019-02-11 08:04:36 -05:00
Michael Kamensky
64c9f7ffb3 Merge branch '832-state-based-actions-check-conflict-with-upkeep-trigger' into 'master' 
Resolve "State Based Actions check conflict with Upkeep trigger"

Closes #832

See merge request core-developers/forge!1380
 2019-02-11 13:00:14 +00:00
Michael Kamensky
899532666e Merge branch 'master' into 'master' 
Resolve Angel of Grace's Graveyard Ability crash

Closes #838

See merge request core-developers/forge!1388
 2019-02-11 12:35:57 +00:00
Michael Kamensky
d76cd0e37d Merge branch '836-epochrasite' into 'master' 
Resolve "Epochrasite"

Closes #836

See merge request core-developers/forge!1384
 2019-02-11 12:35:18 +00:00
Michael Kamensky
749dc79775 Merge branch '837-rakdos-roustabout-doesn-t-deal-damage-from-his-trigger' into 'master' 
Resolve "Rakdos Roustabout doesn't deal damage from his trigger"

Closes #837

See merge request core-developers/forge!1385
 2019-02-11 12:35:05 +00:00
T.J. Tillman
eb17f4972a Update angel_of_grace.txt 2019-02-10 19:06:10 +00:00
Peter F. Patel-Schneider
c9f9fd93cd allow floating zones to be sorted by the name of the card 2019-02-10 13:28:52 -05:00
Hans Mackowiak
e83c78e2b4 Epochrasite: the LKI thing there is wrong 2019-02-10 11:31:50 +01:00
Michael Kamensky
bf7f07b432 Merge branch 'master' into 'master' 
Fix for Clear the Stage

See merge request core-developers/forge!1386
 2019-02-10 10:22:24 +00:00
T.J. Tillman
245994d094 Update clear_the_stage.txt 2019-02-10 09:40:13 +00:00
Michael Kamensky
c055e4d89c Merge branch 'patch-4' into 'master' 
Update angelic_exaltation.txt

See merge request core-developers/forge!1383
 2019-02-10 07:00:12 +00:00
Hanmac
fcdf49bafd TriggerAttackerBlocked: add TriggeredDefender 2019-02-10 07:42:18 +01:00
T.J. Tillman
b56472555a Revert "Update TriggerAttackerBlocked.java" 
This reverts commit 06df7cb036
 2019-02-10 05:53:23 +00:00
T.J. Tillman
06df7cb036 Update TriggerAttackerBlocked.java 2019-02-10 05:51:08 +00:00
Sol
d6b011fd72 Update angelic_exaltation.txt 2019-02-10 03:11:26 +00:00
Michael Kamensky
b853f34c9e Merge branch 'auraswapKeyword' into 'master' 
CardFactoryUtil: Aura swap as Keyword

See merge request core-developers/forge!1382
 2019-02-09 17:48:52 +00:00
Hanmac
4da05f03dc CardFactoryUtil: Aura swap as Keyword 2019-02-09 17:53:05 +01:00
Michael Kamensky
52cc02a316 Merge branch 'mayPlayFix' into 'master' 
Spell: Fixed MayPlay, getRestrictions.canPlay need originalHost

Closes #827

See merge request core-developers/forge!1381
 2019-02-09 14:09:52 +00:00
Hanmac
d188708028 Spell: Fixed MayPlay, getRestrictions.canPlay need originalHost 2019-02-09 09:29:32 +01:00
Michael Kamensky
1e39137ab5 Merge branch 'patch-1' into 'master' 
Deputy of Detention: need Condition like Bishop of Binding

See merge request core-developers/forge!1376
 2019-02-09 03:59:13 +00:00
Hanmac
47c89fb0ae PhaseHandler: fix executeUntil needs to be done after checkStateEffects 2019-02-08 19:51:51 +01:00
Michael Kamensky
cf57832970 Merge branch 'patch-3' into 'master' 
Update Modern.txt

See merge request core-developers/forge!1379
 2019-02-08 18:12:22 +00:00
Michael Kamensky
6c1487a491 Merge branch 'patch-2' into 'master' 
Update Brawl.txt

See merge request core-developers/forge!1378
 2019-02-08 18:12:08 +00:00
Michael Kamensky
6f26becf5c Merge branch 'ai-combat-adapt' into 'master' 
Implement a simple combat Adapt logic.

Closes #831

See merge request core-developers/forge!1377
 2019-02-08 17:33:31 +00:00
Agetian
0a543ba35e - Don't try the Adapt logic if the card can't receive +1/+1 counters. 2019-02-08 20:17:36 +03:00
Sol
09f90bfe35 Update Modern.txt 2019-02-08 16:13:58 +00:00
Sol
0c06346ca0 Update Brawl.txt 2019-02-08 16:12:15 +00:00
Agetian
1df44f8166 - Implement a simple combat Adapt logic. 2019-02-08 18:05:54 +03:00
Michael Kamensky
0d67c0fb9e Merge branch 'android-npe-fix' into 'master' 
Add test for model being null.  This will occur upon deleting a deck. ...

See merge request core-developers/forge!1375
 2019-02-08 11:47:03 +00:00
Hans Mackowiak
5885c37a0f Deputy of Detention: need Condition like Bishop of Binding 2019-02-08 08:17:01 +00:00
Michael Kamensky
189514f37c Merge branch 'master' into 'master' 
Update amplifire.txt

See merge request core-developers/forge!1374
 2019-02-08 03:37:12 +00:00
Tim Scott
ee8a45b012 Add test for model being null. This will occur upon deleting a deck. Addresses NPE encountered when a deck is deleted. 2019-02-07 19:05:13 -06:00
T.J. Tillman
983eaaff3c Update amplifire.txt 2019-02-07 20:56:54 +00:00
Michael Kamensky
9d79959b87 Merge branch 'master' into 'master' 
Fix Arrester's Zeal

See merge request core-developers/forge!1372
 2019-02-07 15:12:04 +00:00
T.J. Tillman
a3d75035b9 Update arresters_zeal.txt 2019-02-07 15:08:26 +00:00
Michael Kamensky
941adbbc68 Merge branch 'patch-3' into 'master' 
Knight of the last Breath: fix Sac Description

See merge request core-developers/forge!1373
 2019-02-07 09:10:10 +00:00
Hans Mackowiak
67167c29fc Knight of the last Breath: fix Sac Description 2019-02-07 08:41:02 +00:00