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
39,300 Commits 33 Branches 187 Tags
2f88b45d67a23ceee644b6b6b61b9743e35e94e2
Commit Graph

39300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
62a11481ab - Fixed more cards 2018-10-16 07:20:10 +03:00
Chris H
210896b64e Pull ManaConversion out to be reused for SpellAbilityStackInstance 2018-10-16 07:20:10 +03:00
tehdiplomat
e4fddafc10 Fixing Mana types being inappropriately referenced in relation to Matrices 2018-10-16 07:20:10 +03:00
Michael Kamensky
d12e6430a6 Merge branch 'epicRework' into 'master' 
Epic rework

See merge request core-developers/forge!1018
 2018-10-16 04:12:53 +00:00
swordshine
efc021339a Merge branch 'patch-3' into 'master' 
Update kraul_harpooner.txt not up to targeting

See merge request core-developers/forge!1019
 2018-10-16 03:56:21 +00:00
swordshine
2e0a0c5560 Merge branch 'migrate-full-cost' into 'master' 
Convert FullCost to PermanentCreature

See merge request core-developers/forge!1020
 2018-10-16 03:56:08 +00:00
Chris H
a80396ae97 Convert FullCost to PermanentCreature 2018-10-15 22:18:23 -04:00
Sol
ac3370e83a Update kraul_harpooner.txt not up to targeting 2018-10-16 01:55:49 +00:00
Hanmac
6c2dfcffff Epic rework 2018-10-15 22:05:13 +02:00
Michael Kamensky
1304227020 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.17.001 [incremental].

See merge request core-developers/forge!1017
 2018-10-15 16:52:28 +00:00
Agetian
81776f88a6 - Preparing Forge for Android publish 1.6.17.001 [incremental]. 2018-10-15 19:51:45 +03:00
Blacksmith
32b336274e Clear out release files in preparation for next release 2018-10-15 15:47:03 +00:00
Blacksmith
b11830a12a [maven-release-plugin] prepare for next development iteration 2018-10-15 15:42:16 +00:00
Blacksmith
a8fbfce51f [maven-release-plugin] prepare release forge-1.6.17 forge-1.6.17 2018-10-15 15:42:12 +00:00
Blacksmith
87f10ea742 Update README.txt for release 2018-10-15 15:40:05 +00:00
Michael Kamensky
c5769cbcc7 Merge branch 'update-brawl-GRN' into 'master' 
Brawl GRN format update

See merge request core-developers/forge!1015
 2018-10-15 14:27:44 +00:00
Michael Kamensky
ece1ae6747 Merge branch 'update-standard-banlist-GRN' into 'master' 
Update standard ban list

See merge request core-developers/forge!1016
 2018-10-15 14:27:40 +00:00
pfirpfel
8780b18ca5 Update standard ban list: remove cards that rotated 2018-10-15 13:32:19 +02:00
pfirpfel
361927c100 Brawl GRN format update 2018-10-15 13:27:47 +02:00
Michael Kamensky
31f2063226 Merge branch 'patch-2' into 'master' 
Update teferi_hero_of_dominaria.txt

See merge request core-developers/forge!1014
 2018-10-15 04:26:42 +00:00
Sol
308c6bbccf Update forge-gui/res/cardsfolder/t/teferi_hero_of_dominaria.txt 2018-10-15 02:02:07 +00:00
Sol
1955b453fd Update teferi_hero_of_dominaria.txt 2018-10-14 12:30:13 +00:00
swordshine
3143751550 Merge branch 'fix-lich' into 'master' 
Fix Underrealm Lich revealing a card going to hand.

See merge request core-developers/forge!1013
 2018-10-14 08:15:38 +00:00
Agetian
8653338f56 - Underrealm Lich should not reveal a card going to hand. 2018-10-14 08:57:06 +03:00
Michael Kamensky
7142751ef3 Merge branch 'add-jump-start-to-flashback' into 'master' 
Improve flashback zone display

See merge request core-developers/forge!1012
 2018-10-14 03:40:12 +00:00
Chris H
3889c75e32 Improve flashback zone display 2018-10-13 19:14:19 -04:00
Sol
35372b53b8 Merge branch 'patch-1' into 'master' 
Update sworn_companions.txt

See merge request core-developers/forge!1011
 2018-10-13 19:47:24 +00:00
Sol
279c7ed97b Update sworn_companions.txt 2018-10-13 19:46:12 +00:00
Michael Kamensky
6535deee48 Merge branch 'master' into 'master' 
Temporarily revert a change in CostPartMana to avoid breaking Convoke, Improvise, and Delve.

Closes #740

See merge request core-developers/forge!1010
 2018-10-13 18:04:18 +00:00
Agetian
46c764d5ab - Temporarily revert a change in CostPartMana to avoid breaking Convoke, Improvise, and Delve. 2018-10-13 21:02:47 +03:00
Michael Kamensky
e6a348fa31 Merge branch 'master' into 'master' 
Fixed Sumala Woodshaper not revealing cards to the controller (the "look at" part of DB Dig).

See merge request core-developers/forge!1009
 2018-10-13 17:14:06 +00:00
Agetian
c952354f56 - Fixed Sumala Woodshaper not revealing cards to the controller (the "look at" part of DB Dig). 2018-10-13 20:13:25 +03:00
Michael Kamensky
76874d7a84 Merge branch 'master' into 'master' 
- Minor mistype fix in SurveilEffect.

See merge request core-developers/forge!1008
 2018-10-13 16:48:31 +00:00
Agetian
2a1a753182 - Minor mistype fix in SurveilEffect. 2018-10-13 19:48:05 +03:00
Michael Kamensky
4df6c9f701 Merge branch 'master' into 'master' 
- Updating CHANGES.txt.

See merge request core-developers/forge!1007
 2018-10-13 15:55:02 +00:00
Agetian
d404979d59 - Updating CHANGES.txt. 2018-10-13 18:49:58 +03:00
Michael Kamensky
1af92c92d8 Merge branch 'master' into 'master' 
Fixed Drowned Secrets oracle text and description.

See merge request core-developers/forge!1006
 2018-10-13 15:41:18 +00:00
Agetian
95e59f6d83 - Fixed Drowned Secrets oracle text and description. 2018-10-13 18:40:48 +03:00
Blacksmith
512565a36f Update README.txt for release 2018-10-13 15:40:09 +00:00
Sol
adb2b50814 Merge branch 'release-updates' into 'master' 
Release updates

See merge request core-developers/forge!1005
 2018-10-13 15:38:54 +00:00
tehdiplomat
c5fb6c5fd1 Update GRN rankings 2018-10-13 11:36:40 -04:00
tehdiplomat
6019d486d2 Updating release files 2018-10-13 11:34:05 -04:00
Jamin Collins
e5773693aa Merge branch 'mobile-release' into 'master' 
Increasing the default memory size values for Android Maven project to allow it to compile with the growing code base.

See merge request core-developers/forge!1004
 2018-10-13 05:14:19 +00:00
Agetian
cd5b95ca0e - Increase the default memory size values for Android Maven project to allow it to compile with the growing code base. 2018-10-13 08:10:06 +03:00
Michael Kamensky
ee31ff2378 Merge branch 'chaos-draft' into 'master' 
Chaos draft

See merge request core-developers/forge!999
 2018-10-13 05:04:50 +00:00
pfirpfel
6b96129c25 Chaos draft 2018-10-13 05:04:50 +00:00
Michael Kamensky
0605b169da Merge branch 'grn-deckhints' into 'master' 
Adding AI draft deck hints for Guilds of Ravnica.

See merge request core-developers/forge!1003
 2018-10-13 03:41:39 +00:00
Jamin Collins
51bc066238 Merge branch 'fix+gonti' into 'master' 
Fixing Mana types being inappropriately referenced in relation to Matrices

See merge request core-developers/forge!883
 2018-10-12 23:13:33 +00:00
Agetian
9f640b90ba - Added Ability$LifeGain hint to several cards. 2018-10-12 12:32:40 +03:00
Agetian
0cb3dfe9cb - Ability$Instant... -> Type$Instant 2018-10-12 11:03:25 +03:00