external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,439 Commits 31 Branches 187 Tags
688f8599be7d1d5886d854052a8add82173f320c
Commit Graph

40439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
T.J. Tillman
d763e3a1db Update arresters_zeal.txt 2019-02-07 06:42:14 +00:00
T.J. Tillman
ebddcb3210 Update spear_spewer.txt 2019-02-07 06:40:11 +00:00
T.J. Tillman
526104104c Merge branch 'forPushing' into 'master' 
For pushing

See merge request tjtillmancoag/forge!5
 2019-02-07 06:35:27 +00:00
T.J. Tillman
ebd5e7b419 Merge branch 'SpearSpewerFix' into 'master' 
Spear spewer fix et all

See merge request tjtillmancoag/forge!4
 2019-02-07 06:14:18 +00:00
Michael Kamensky
d491972995 Merge branch 'master' into 'master' 
Translating hard-coded text to res en-US.properties

See merge request core-developers/forge!1283
 2019-02-07 05:54:47 +00:00
Michael Kamensky
60c68b10d9 Merge branch 'master' into 'master' 
Guardian Project fix by friarsol: patch and integrate

See merge request core-developers/forge!1371
 2019-02-07 05:05:44 +00:00
Agetian
471fcaa938 - Revert an accidental change in CardProperty. 2019-02-07 08:05:06 +03:00
Agetian
7111c3f3aa Merge branch 'fix-guardian-project' of https://git.cardforge.org/friarsol/forge into agetian-master 2019-02-07 08:04:27 +03:00
Michael Kamensky
384b5c2c5b Merge branch 'SpearSpewerFix' into 'master' 
Several RNA fixes

See merge request core-developers/forge!1369
 2019-02-07 04:20:13 +00:00
Sol
84a2fed516 Update guardian_project.txt 2019-02-07 03:42:23 +00:00
Chris H
a1c137a86b Fix Guardian Project 2019-02-06 22:04:31 -05:00
T.J. Tillman
87359257fd Update end_raze_forerunners.txt 2019-02-07 02:06:54 +00:00
T.J. Tillman
4e8c18b232 Update angel_of_grace.txt 2019-02-07 01:42:51 +00:00
T.J. Tillman
95f46dfde3 Update smothering_tithe.txt 2019-02-07 01:01:59 +00:00
T.J. Tillman
20c978a64f Revert "Update spear_spewer.txt" 
This reverts commit c7d8a112d0
 2019-02-06 21:39:56 +00:00
T.J. Tillman
bb57cb1e1b Update kaya_orzhov_usurper.txt 2019-02-06 20:28:43 +00:00
T.J. Tillman
29b0c6eb69 Update kaya_orzhov_usurper.txt 2019-02-06 20:17:25 +00:00
T.J. Tillman
76b929b814 Revert "Update arresters_zeal.txt" 
This reverts commit fbde2483e4
 2019-02-06 18:47:19 +00:00
T.J. Tillman
fbde2483e4 Update arresters_zeal.txt 2019-02-06 18:41:40 +00:00
T.J. Tillman
55ccd88790 Update descriptions on swirling_torrent.txt 2019-02-06 18:38:32 +00:00
T.J. Tillman
5b9e121674 Update Contamination.dck 2019-02-06 18:29:37 +00:00
T.J. Tillman
d86e04222d Revert "Update Contamination.dck" 
This reverts commit 5b10cb0e26
 2019-02-06 18:29:08 +00:00
T.J. Tillman
5b10cb0e26 Update Contamination.dck 2019-02-06 18:28:41 +00:00
T.J. Tillman
5d99a0e918 Update pestilent_spirit.txt 2019-02-06 18:21:31 +00:00
T.J. Tillman
8385e80fd3 Revert guardian_project.txt for this branch 2019-02-06 18:00:09 +00:00