external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,874 Commits 33 Branches 187 Tags
07c2065917c28f3d1615efeb6bd67e21fd5f301c
Commit Graph

39874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
e8d1cbd01d - Fixed Jade Monolith 2018-10-02 22:36:43 +08:00
swordshine
bba18f9bc4 Merge branch 'master' into 'master' 
- Fixed Whispering Snitch

See merge request core-developers/forge!975
 2018-10-02 14:23:05 +00:00
swordshine
aa10ca0795 Merge branch 'fix-kraul_harpooner-add-pump' into 'master' 
Fix Kraul Harpooner: add pump to triggered ability

See merge request core-developers/forge!973
 2018-10-02 14:23:00 +00:00
swordshine
09b62681c1 - Fixed Whispering Snitch 2018-10-02 22:21:13 +08:00
austinio7116
ce119c518f Merge branch 'fix-finality-allow-cast-no-creatures' into 'master' 
Fix Finality to allow casting without controlling any creatures

See merge request core-developers/forge!974
 2018-10-02 13:05:10 +00:00
pfirpfel
8042a202a6 Fix Kraul Harpooner: add pump to triggered ability 2018-10-02 11:35:14 +02:00
pfirpfel
7a439fe26f Fix Finality to allow casting without controlling any creatures 2018-10-02 11:33:41 +02:00
Michael Kamensky
27f61201f8 Merge branch 'volver' into 'master' 
cards: update Volver to use ReplacementEffect

See merge request core-developers/forge!972
 2018-10-02 07:56:15 +00:00
Michael Kamensky
7c0eb68ed5 Merge branch 'tokenCardText' into 'master' 
Token card text

Closes #716

See merge request core-developers/forge!961
 2018-10-02 07:18:45 +00:00
Hanmac
4f004069c0 cards: update Volver to use ReplacementEffect 2018-10-02 07:52:43 +02:00
Sol
18ca338968 Merge branch 'bug-fixes' into 'master' 
avoid NPE when right clicking during draft

See merge request core-developers/forge!971
 2018-10-02 03:48:41 +00:00
Jamin W. Collins
4c6b59e7ec avoid NPE when right clicking during draft 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-10-01 21:46:19 -06:00
Krazy
b1e070e3f8 Merge branch 'android' into 'master' 
Preparing Forge for Android publish 1.6.16.001

See merge request core-developers/forge!970
 2018-10-02 03:45:09 +00:00
Sol
4349fc5647 Merge branch 'typo-Citywatch-Sphinx' into 'master' 
Fix typo in TriggerDescription of Citywatch Sphinx  (exile -> surveil)

See merge request core-developers/forge!969
 2018-10-01 13:02:48 +00:00
Sol
55ce48975d Merge branch 'patch-14' into 'master' 
Probably fixes Oni Possession.

See merge request core-developers/forge!968
 2018-10-01 13:02:27 +00:00
Sol
245c22e508 Merge branch 'patch-13' into 'master' 
Probably fixes Honor the Fallen

See merge request core-developers/forge!967
 2018-10-01 13:02:09 +00:00
Michael Kuenzli
9a81a53fe3 Fix typo (exile -> surveil) 2018-10-01 09:01:02 +02:00
Meerkov
8fb18d278e Probably fixes Oni Possession. 2018-10-01 05:21:04 +00:00
Meerkov
2e46ff5667 I'm guessing this card is broken, and that this fixes it. 2018-10-01 05:17:31 +00:00
Michael Kamensky
304487bc50 Merge branch 'mayPlayLand' into 'master' 
Player: canPlayLand use the mayPlay of the Land Ability

See merge request core-developers/forge!965
 2018-09-30 17:36:21 +00:00
Jamin W. Collins
2b6aae8a09 Preparing Forge for Android publish 1.6.16.001 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-30 11:29:08 -06:00
Michael Kamensky
97a6dd95f1 Merge branch 'guilds_fxes' into 'master' 
Fix reported GRN issues

See merge request core-developers/forge!966
 2018-09-30 16:57:01 +00:00
tehdiplomat
ab9df124d7 Fix reported GRN issues 2018-09-30 12:32:08 -04:00
Hanmac
45ee00f10b Player: canPlayLand use the mayPlay of the Land Ability 2018-09-30 16:41:22 +02:00
Hanmac
12eabc6ce4 cards: updated cards with tokenscripts 2018-09-30 15:10:26 +02:00
Hanmac
a298dcf3bc TokenScript: make CardTextChange working again 
SpellAbility: changeTextIntrinsic to sub abilities
 2018-09-30 15:10:12 +02:00
Sol
5371cbe9c8 Merge branch 'fix-prerequisites-warning' into 'master' 
Fix up pom files

See merge request core-developers/forge!964
 2018-09-29 23:55:49 +00:00
KrazyTheFox
f0c2cf8577 Fix up pom files 2018-09-29 16:41:06 -04:00
Blacksmith
1e46f88ef5 [maven-release-plugin] prepare for next development iteration 2018-09-29 19:53:15 +00:00
Blacksmith
5192fc3f59 [maven-release-plugin] prepare release forge-1.6.16 forge-1.6.16 2018-09-29 19:53:10 +00:00
Blacksmith
efca55083c Update README.txt for release 2018-09-29 19:51:13 +00:00
Sol
735a7997d6 Merge branch 'grn-changes' into 'master' 
Add GRN and token changes to CHANGES.txt

See merge request core-developers/forge!963
 2018-09-29 18:35:56 +00:00
Krazy
3e5636ea21 Merge branch 'migrate_upcoming' into 'master' 
Migrate upcoming

See merge request core-developers/forge!962
 2018-09-29 18:19:09 +00:00
tehdiplomat
5f5bcc35ad Fix migrateupcoming script and remove scripted reprints 2018-09-29 14:06:29 -04:00
KrazyTheFox
be5c3a0401 Add GRN and token changes to CHANGES.txt 2018-09-29 14:03:44 -04:00
tehdiplomat
17062eecdb Not sure why these reprints got deleted by migrate script? 2018-09-29 14:03:22 -04:00
tehdiplomat
e036465ce3 Migrate GRN to their letter folders 2018-09-29 13:57:51 -04:00
Sol
c52f8efa11 Merge branch 'grnreleasetest' into 'master' 
Update to GRN standard deck generation ready for release plus changes.txt update

See merge request core-developers/forge!960
 2018-09-29 17:31:22 +00:00
austinio7116
183a671227 Updated Changes.txt to include mention of new random standard quest world 
(cherry picked from commit 958671d)
 2018-09-29 07:09:42 +01:00
austinio7116
7cc247c6c7 Crackling Drake 
(cherry picked from commit 4292012)
 2018-09-29 07:09:29 +01:00
austinio7116
a8a69d2a66 Rerun deck generation with just committed GRN cards 
(cherry picked from commit 827bd24)
 2018-09-29 06:59:53 +01:00
austinio7116
63822c16c1 Updated pre-prerelease Standard LDA deck archetype data for deck generation - assumes new standard format is live 
(cherry picked from commit 913cce4)

(cherry picked from commit 0bffd34)
 2018-09-29 06:45:17 +01:00
Michael Kamensky
f577523dee Merge branch 'no-quest-npe-fix' into 'master' 
Fix a crash that occurred when no quests were available to load

See merge request core-developers/forge!959
 2018-09-29 04:24:13 +00:00
Krazy
dca93282f3 Merge branch 'guilds_fxes' into 'master' 
Update formats

See merge request core-developers/forge!958
 2018-09-29 04:19:20 +00:00
KrazyTheFox
0e9bf4fe4b Fix a crash that occurred when no quests were available to load 2018-09-29 00:07:05 -04:00
tehdiplomat
7cdf7538e9 Update formats 2018-09-28 21:25:25 -04:00
Michael Kamensky
2ab59849a8 Merge branch 'guilds_fxes' into 'master' 
Experimental Frenzy

See merge request core-developers/forge!954
 2018-09-28 09:27:23 +00:00
Hans Mackowiak
60f1b13110 Merge branch 'patch-13' into 'master' 
Changes Tetsuo Umezawa to use the same script as Bartel Runeaxe, instead of a keyworded ability

See merge request core-developers/forge!956
 2018-09-28 08:33:05 +00:00
austinio7116
429201226a Crackling Drake 2018-09-28 08:54:58 +01:00
austinio7116
fce605868d Remaining GRN cards - all either incomplete or with issues to fix 2018-09-28 06:50:16 +01:00