external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,112 Commits 33 Branches 187 Tags
e5584ea0656f29aea65e54d4bf5c76e5bb896dc0
Commit Graph

40112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blacksmith
e5584ea065 Clear out release files in preparation for next release 2019-02-02 02:05:37 +00:00
Blacksmith
17dedb4bf4 [maven-release-plugin] prepare for next development iteration 2019-02-02 02:00:32 +00:00
Blacksmith
eb3fb9e1ce [maven-release-plugin] prepare release forge-1.6.20 forge-1.6.20 2019-02-02 02:00:28 +00:00
Blacksmith
b27f49c4ff Update README.txt for release 2019-02-02 01:58:00 +00:00
Sol
1c33e3b039 Merge branch 'master' into 'master' 
Update rakdos_the_showstopper.txt using DestroyAll

See merge request core-developers/forge!1344
 2019-02-02 01:35:24 +00:00
T.J. Tillman
eda0a49097 Update token image parameter for Domri, Chaos Bringer 2019-02-02 00:14:16 +00:00
T.J. Tillman
ea8c6630e0 Update cry_of_the_carnarium.txt 2019-02-01 23:31:09 +00:00
T.J. Tillman
0d4310382e Update rakdos_the_showstopper.txt using DestroyAll 2019-02-01 20:10:21 +00:00
Sol
4ae1547384 Merge branch 'patch-3' into 'master' 
Update carnival_carnage.txt

See merge request core-developers/forge!1343
 2019-02-01 19:11:38 +00:00
Sol
4192195579 Update carnival_carnage.txt 2019-02-01 19:11:15 +00:00
Sol
0d11e28c11 Merge branch 'master' into 'master' 
Update Captive Audience to Functional plus a few others

See merge request core-developers/forge!1342
 2019-02-01 19:10:41 +00:00
T.J. Tillman
9cf78d0eb4 Update deputy_of_detention.txt 2019-02-01 18:18:04 +00:00
T.J. Tillman
7843004c40 Fixed Ferocious condition 2019-02-01 18:12:25 +00:00
T.J. Tillman
4c7c2ee1b5 User reported Locust God's return trigger wasn't working on Resolution, but that it does work for Scarab God. Changed one word in Locust God's trigger to match Scarab God's 2019-02-01 17:20:23 +00:00
T.J. Tillman
05538bfba2 Update captive_audience.txt 2019-02-01 17:10:37 +00:00
Michael Kamensky
6fe6d6ecfd Merge branch 'master' into 'master' 
A few more RNA card script updates

See merge request core-developers/forge!1339
 2019-02-01 16:56:41 +00:00
Michael Kamensky
34a8184cc7 Merge branch 'patch-3' into 'master' 
Light up the stage: Fix script with Commune with Lava

See merge request core-developers/forge!1341
 2019-02-01 16:55:39 +00:00
Hans Mackowiak
5d9f86bf20 Light up the stage: Fix script with Commune with Lava 2019-02-01 16:34:43 +00:00
Michael Kamensky
661555551d Merge branch 'rnabuild' into 'master' 
RNA LDA deck generation data

See merge request core-developers/forge!1340
 2019-02-01 14:35:40 +00:00
austinio7116
02e118b2e2 RNA deckgen data 
(cherry picked from commit eb7a6da)

(cherry picked from commit 32e02e7)
 2019-02-01 08:02:02 +00:00
maustin
b59fbe43f0 Merge branch 'coremaster' into rnabuild 2019-02-01 08:01:34 +00:00
T.J. Tillman
ac51d4170f Update rumbling_ruin.txt 2019-02-01 07:37:01 +00:00
Sol
dc91df0e19 Merge branch 'patch-2' into 'master' 
Update plaza_of_harmony.txt

See merge request core-developers/forge!1338
 2019-02-01 04:20:07 +00:00
Sol
5bce464268 Update plaza_of_harmony.txt 2019-02-01 04:19:56 +00:00
T.J. Tillman
60d5afe9a2 Update eyes_everywhere.txt 2019-02-01 04:02:15 +00:00
T.J. Tillman
ef6e09d4c4 Update fireblade_artist.txt 2019-02-01 03:12:45 +00:00
Sol
76324bc6db Merge branch 'master' into 'master' 
Fixed Rakdos, the Showstopper

See merge request core-developers/forge!1336
 2019-02-01 01:08:25 +00:00
T.J. Tillman
bee8348b67 Update cosmotronic_wave.txt to reflect ruling that this is a continuous effect. 2019-01-31 22:12:14 +00:00
T.J. Tillman
51fb900eb5 Revert "Update rumbling_ruin.txt" 
This reverts commit 8b902671d6
 2019-01-31 22:06:31 +00:00
T.J. Tillman
8b902671d6 Update rumbling_ruin.txt 2019-01-31 22:02:53 +00:00
T.J. Tillman
7dbbf0a554 Update rakdos_the_showstopper.txt 2019-01-31 19:22:12 +00:00
T.J. Tillman
e75b15b7cb Update rakdos_the_showstopper.txt 2019-01-31 19:20:09 +00:00
Michael Kamensky
43cca9b635 Merge branch 'master' into 'master' 
Check for alternative additional costs in the AI routines.

Closes #813 and #820

See merge request core-developers/forge!1334
 2019-01-31 13:43:48 +00:00
Agetian
b29f390b62 - Fix the AI activating player setup for additional costs. 
- Fix Thrilling Encore.
 2019-01-31 16:39:49 +03:00
Michael Kamensky
f83a97bedd Merge branch '819-spectra-ward-broken' into 'master' 
Resolve "Spectra Ward broken"

Closes #819

See merge request core-developers/forge!1335
 2019-01-31 13:24:19 +00:00
Agetian
c58690dd96 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-01-31 09:34:27 +03:00
Hans Mackowiak
3402cddd1d GameAction: fix Spectral Ward #819 2019-01-31 06:25:06 +00:00
Agetian
3956a5b558 - Check for alternative additional costs in the AI routines (fixes AI not paying those costs for Final Payment and other cards). 2019-01-31 08:45:53 +03:00
Sol
72b60c91f5 Merge branch 'master' into 'master' 
Fix Deputy of Detention

See merge request core-developers/forge!1333
 2019-01-31 04:28:00 +00:00
T.J. Tillman
d063e98e33 Update deputy_of_detention.txt 2019-01-31 04:11:09 +00:00
Sol
8743cba5d7 Merge branch 'rna-rankings' into 'master' 
Add RNA rankings

See merge request core-developers/forge!1332
 2019-01-31 01:25:37 +00:00
Chris H
1d2bbe4923 Add RNA rankings 2019-01-30 20:24:30 -05:00
Michael Kamensky
58311e5265 Merge branch 'fix-gurzigost' into 'master' 
Fix Gurzigost.

Closes #817

See merge request core-developers/forge!1331
 2019-01-30 16:04:16 +00:00
Agetian
8c020c7c8c - Generic check. 2019-01-30 18:54:15 +03:00
Agetian
ba25696ea7 - Fix Gurzigost. 2019-01-30 18:30:07 +03:00
Michael Kamensky
68359097df Merge branch 'patch-2' into 'master' 
CardState: this catch the Exception in case it crash in Keyword.initialize

See merge request core-developers/forge!1330
 2019-01-30 15:17:47 +00:00
Hans Mackowiak
4b882ad215 CardState: this catch the Exception in case it crash in Keyword.initialize 2019-01-30 10:22:43 +00:00
Michael Kamensky
ee6806b36a Merge branch 'patch-1' into 'master' 
Send SpellAbility into getDefinedPlayers of greatestPower

See merge request core-developers/forge!1329
 2019-01-30 04:48:01 +00:00
Sol
343723e529 Send SpellAbility into getDefinedPlayers of greatestPower 2019-01-30 01:34:05 +00:00
Sol
15bf426386 Merge branch 'master' into 'master' 
Couple RNA fixes

See merge request core-developers/forge!1328
 2019-01-30 01:19:19 +00:00