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
40,394 Commits 32 Branches 187 Tags
7da2316c0a6ebe7dfc23dcc77a87404c90ced92c
Commit Graph

40394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
T.J. Tillman
10745eb9c7 Update consecrate_consume.txt 2019-02-03 02:34:59 +00:00
T.J. Tillman
18934c7f9f Update revival_revenge.txt 2019-02-03 02:25:36 +00:00
T.J. Tillman
c54682850b Update theater_of_horrors.txt 2019-02-03 00:33:59 +00:00
T.J. Tillman
f241a62d95 Update clear_the_stage.txt 2019-02-03 00:15:59 +00:00
Peter F. Patel-Schneider
31bca6c614 try to do fewer layout calculations when moving cards 2019-02-02 16:46:23 -05:00
Hans Mackowiak
567aab0c43 Fix: c_a_treasure_sac 2019-02-02 21:04:01 +00:00
Michael Kamensky
ef1f1c33cf Merge branch 'giantbaiting-patch' into 'master' 
Bug fix: Giantbaiting

See merge request core-developers/forge!1349
 2019-02-02 16:42:53 +00:00
Rob Schnautz
a18d98c231 Token script had typo in name. 2019-02-02 16:39:51 +00:00
Michael Kamensky
66b97d5d8e Merge branch 'fix-sarkhan-dragonsoul' into 'master' 
Fix Sarkhan, Dragonsoul (ultimate ability) and Kaya, Orzhov Usurper (costs).

Closes #823

See merge request core-developers/forge!1347
 2019-02-02 13:24:28 +00:00
Michael Kamensky
3c83b62d98 Merge branch 'landwalkFix' into 'master' 
CombatUtil: fix Basic Landwalk abilities

See merge request core-developers/forge!1348
 2019-02-02 13:24:17 +00:00
Hanmac
0569a0b36d CombatUtil: fix Basic Landwalk abilities 2019-02-02 14:07:48 +01:00
Agetian
a8abbadec4 - Fix Kaya, Orzhov Usurper ability costs. 2019-02-02 13:58:13 +03:00
Agetian
6235b42c31 - Limit the search to Dragon creature cards. 2019-02-02 13:54:23 +03:00
Agetian
1d41f1b330 - Fix Sarkhan, Dragonsoul. 2019-02-02 13:51:18 +03:00
Michael Kamensky
ad8778d397 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.20.001 [incremental].

See merge request core-developers/forge!1346
 2019-02-02 05:56:08 +00:00
Agetian
e38bd51193 - Preparing Forge for Android publish 1.6.20.001 [incremental]. 2019-02-02 08:49:31 +03:00
KrazyTheFox
92ba90bc9e Add Sting deck by timmermac 2019-02-01 23:22:39 -05:00
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
KrazyTheFox
8d4854bd5d Saving progress 2019-02-01 20:39:57 -05: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
tehdiplomat
e330cabc64 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-01-31 20:56:32 -05: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
Peter F. Patel-Schneider
30607291fc optimize redisplay of floating card areas 2019-01-31 19:53:05 -05: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