external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,640 Commits 31 Branches 187 Tags
d36651a779e001d9b68b51a45fb598c8161952a3
Commit Graph

10599 Commits

Author SHA1 Message Date
Sol
b544718140 Merge branch 'master' into 'master' 
Use PeekAndReveal for Sunbird's Invocation

Closes #841

See merge request core-developers/forge!1395
 2019-02-18 16:47:42 +00:00
Sol
dc4b65593e Update Brawl.txt 2019-02-18 16:00:23 +00:00
Sol
5f5b34478d Update Standard.txt 2019-02-18 15:59:02 +00:00
Sol
64e7aa902b Update M19 Gift Pack.txt 2019-02-18 15:58:32 +00:00
Blacksmith
e4d41001db Clear out release files in preparation for next release 2019-02-17 19:56:08 +00:00
Blacksmith
4ed17e1e16 [maven-release-plugin] prepare for next development iteration 2019-02-17 19:51:17 +00:00
Blacksmith
a70136c98c [maven-release-plugin] prepare release forge-1.6.21 2019-02-17 19:51:13 +00:00
Blacksmith
e42f3f3369 Update README.txt for release 2019-02-17 19:48:59 +00:00
Hans Mackowiak
3fab25ab8c Merge branch 'master' into 'master' 
Clarify Target Prompts for Applied Biomancy and Swirling Torrent

See merge request core-developers/forge!1398
 2019-02-16 13:13:09 +00:00
T.J. Tillman
452a47e573 Update swirling_torrent.txt 2019-02-16 02:42:27 +00:00
T.J. Tillman
d002ddaa5d Update applied_biomancy.txt 2019-02-16 02:42:06 +00:00
Sol
95a69f053b Merge branch 'deckconstructionrules-null-check' into 'master' 
Add null check for getDeckConstructionRules()

See merge request core-developers/forge!1397
 2019-02-16 01:37:35 +00:00
Chris H
f2c48a386b Add null check for getDeckConstructionRules() 2019-02-15 20:28:40 -05:00
Sol
7db1b4a106 Merge branch 'master' into 'master' 
Update flames_of_the_raze_boar.txt

See merge request core-developers/forge!1396
 2019-02-16 01:26:52 +00:00
T.J. Tillman
8b186bb890 Update flames_of_the_raze_boar.txt 2019-02-15 19:45:35 +00:00
Peter F. Patel-Schneider
2b0fc5a00a generalize card showing in PlayEffect 2019-02-15 10:59:12 -05:00
Peter F. Patel-Schneider
f63e59fbda PlayEffect has ShowRemembered parameter which shows remembered cards if playing cards selected from a zone 2019-02-15 08:49:16 -05:00
Tim Scott
7f16a3dce2 Remove Eclipse-specific files and directories. Maven-based build configurations can be easily imported by (at least) Eclipse 2018-12. Hint: File > Import > Maven > Existing Maven Projects > Navigate to root forge folder. 
Tweak base pom.xml to allow for error-free Eclipse compilation.
 2019-02-14 21:26:23 -06:00
Peter F. Patel-Schneider
3d3f1b08e4 prevent shuffling during resolution of Sunbird's Invocation and Aetherworks Marvel 2019-02-14 19:24:55 -05:00
Peter F. Patel-Schneider
f4c326826e Use PeekAndReveal for Sunbird's Invocation 2019-02-14 16:07:40 -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
Sol
4cc397baa4 Update ragavan.txt 2019-02-13 02:11:13 +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
T.J. Tillman
eb17f4972a Update angel_of_grace.txt 2019-02-10 19:06:10 +00: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
Sol
d6b011fd72 Update angelic_exaltation.txt 2019-02-10 03:11:26 +00:00
Hanmac
4da05f03dc CardFactoryUtil: Aura swap as Keyword 2019-02-09 17:53:05 +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
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
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
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
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