external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,404 Commits 31 Branches 187 Tags
f1f96557c2a08d30a84a68f9bd731c94b0fc715c
Commit Graph

38404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
ee87a75621 Update sakashimas_student 2018-07-27 15:33:15 +00:00
Michael Kamensky
6852748739 Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M192.

See merge request core-developers/forge!800
 2018-07-27 03:35:27 +00:00
Agetian
63bca8ce93 - Added puzzle PS_M192. 2018-07-27 06:34:44 +03:00
Sol
0d6fbb60ca Merge branch 'planeswalkerUpdate' into 'master' 
Planeswalker update

See merge request core-developers/forge!662
 2018-07-27 02:44:30 +00:00
Michael Kamensky
a670245b3d Merge branch 'bushidoFix' into 'master' 
Bushido fix

See merge request core-developers/forge!794
 2018-07-26 06:24:03 +00:00
Michael Kamensky
9b27742a5a Merge branch 'brawlm19format' into 'master' 
Brawl M19 format update

See merge request core-developers/forge!799
 2018-07-26 06:13:58 +00:00
austinio7116
ca7f551af4 Brawl M19 format update 2018-07-26 07:04:14 +01:00
Michael Kamensky
61040f4c05 Merge branch 'iss632' into 'master' 
Swap order of operands so `.equals` can't get called on a null value.

Closes #632

See merge request core-developers/forge!797
 2018-07-26 06:01:23 +00:00
Hanmac
421da7285c ComputerUtilCombat: hotfix for predictPowerBonusOfBlocker and predictToughnessBonusOfBlocker 2018-07-26 06:54:57 +02:00
Hanmac
6d829db99e ComputerUtilCombat: hotfix for predictPowerBonusOfAttacker and predictToughnessBonusOfAttacker 2018-07-26 06:48:33 +02:00
Hanmac
60d247503e cards: update Bushido 2018-07-26 06:35:07 +02:00
Hanmac
50cea02ae1 CardFactoryUtil: switch Bushido to new : format 2018-07-26 06:35:07 +02:00
kms70847
05c3402817 Swap order of operands so .equals can't get called on a null value. 
Resolves https://git.cardforge.org/core-developers/forge/issues/632
 2018-07-26 00:07:27 -04:00
Michael Kamensky
34c29be136 Merge branch 'keywordEnumTypeFix' into 'master' 
Keyword: fixed getting Enum

See merge request core-developers/forge!795
 2018-07-26 03:29:45 +00:00
Sol
efa8fa10d6 Update thorn_lieutenant.txt 2018-07-26 02:09:44 +00:00
Michael Kamensky
8f93f8e4bc Merge branch 'deckgenupdatem19' into 'master' 
Updated deck gen data

See merge request core-developers/forge!796
 2018-07-25 18:29:13 +00:00
austinio7116
fd061354ff Updated deck gen data 2018-07-25 18:43:14 +01:00
Agetian
b7553385f1 - Compile fix (deFails -> deTails) 2018-07-25 19:52:49 +03:00
Hanmac
805048b6b8 Keyword: fixed getting Enum 2018-07-25 17:57:12 +02:00
Michael Kamensky
85ad10a78a Merge branch 'immediate_trigger' into 'master' 
Working on Immediate trigger type

See merge request core-developers/forge!752
 2018-07-25 08:14:47 +00:00
Hans Mackowiak
2cc5bc11c9 Merge branch 'flashbackKeywordFix2' into 'master' 
Flashback keyword fix2

See merge request core-developers/forge!793
 2018-07-25 05:16:36 +00:00
Hanmac
88ac89a6d2 GameActionUtil: fix Flashback Cost 2018-07-24 20:05:14 +02:00
Hanmac
3bb9e96dd0 cards: update Flashback 2018-07-24 07:13:15 +02:00
Hanmac
36b62f2219 Keyword: replace "Flashback " with "Flashback:" 2018-07-24 07:08:32 +02:00
Sol
7a52668418 Merge branch 'fix_first_strike' into 'master' 
Fix first strike

See merge request core-developers/forge!792
 2018-07-24 02:51:22 +00:00
tehdiplomat
22efcf2f3f Fix first strike 2018-07-23 22:18:09 -04:00
Sol
1b95e2a23f Update ANNOUNCEMENTS.txt 2018-07-23 01:57:26 +00:00
Sol
2131bccae7 Update ISSUES.txt 2018-07-23 01:56:40 +00:00
tehdiplomat
5c90770e6f Remove TriggerPayCost. 2018-07-22 21:49:05 -04:00
tehdiplomat
3adf8a21c9 Add Immediate trigger types/Fix Always triggers 
- Fix Skyrider Patrol
 2018-07-22 21:49:05 -04:00
tehdiplomat
2c049b323a Working on Immediate trigger type 2018-07-22 21:45:40 -04:00
Michael Kamensky
c331a045cc Merge branch 'cloneEffectUpdate' into 'master' 
Clone effect update

Closes #610

See merge request core-developers/forge!791
 2018-07-22 09:57:58 +00:00
Hanmac
8a0446add1 Metamorphic Alteration: Choosing Creature is Part of RE 2018-07-22 08:05:34 +02:00
Hanmac
52190b9175 cards: update Clone effect with internal Choice 2018-07-22 08:05:34 +02:00
Hanmac
a484b5288e CloneEffect: add ChoiceZone and make the choice there mandatory 2018-07-22 08:05:34 +02:00
Michael Kamensky
483a01b936 Merge branch 'alwaysTriggerFix' into 'master' 
GameAction: always trigger should not run if used preList

Closes #617

See merge request core-developers/forge!789
 2018-07-21 17:59:22 +00:00
Hanmac
c21f2203c5 GameAction: always trigger should not run if used preList 2018-07-21 18:21:26 +02:00
Michael Kamensky
7d56940384 Merge branch 'brawl1v1update' into 'master' 
Brawl 1v1 rules update

See merge request core-developers/forge!785
 2018-07-21 05:26:10 +00:00
Michael Kamensky
c19832a559 Merge branch 'patch-7' into 'master' 
Update cabal_stronghold.txt

See merge request core-developers/forge!777
 2018-07-21 05:23:05 +00:00
Hans Mackowiak
07a0e08730 Merge branch 'iss628' into 'master' 
Use `Creature.IsRemembered` instead of `Creature.Remembered` or `Targeted` when…

See merge request core-developers/forge!787
 2018-07-21 05:06:27 +00:00
Hans Mackowiak
5329fb0b51 Merge branch 'iss628_blood_feud' into 'master' 
Use `Player.IsRemembered`, not `Player.Remembered`.

See merge request core-developers/forge!788
 2018-07-21 05:03:40 +00:00
kms70847
fc2b5f45a2 Use Player.IsRemembered, not Player.Remembered. 2018-07-21 00:31:46 -04:00
kms70847
86ab628cce Use Creature.IsRemembered instead of Creature.Remembered or Targeted when remembering the target of an ability that created a continuous effect 2018-07-20 23:20:47 -04:00
austinio7116
8db68d8717 1v1 brawl rule changes (Free mulligan) 2018-07-20 22:35:32 +01:00
austinio7116
40623420f9 1v1 brawl rule changes (25 starting life) 2018-07-20 21:56:02 +01:00
Michael Kamensky
d6be6f8b43 Merge branch 'patch-6' into 'master' 
Update damping_sphere.txt

See merge request core-developers/forge!776
 2018-07-20 04:54:44 +00:00
Michael Kamensky
434acedb8f Merge branch 'patch-3' into 'master' 
Update rona_disciple_of_gix.txt

See merge request core-developers/forge!773
 2018-07-20 04:54:33 +00:00
Michael Kamensky
165c95a5d8 Merge branch 'patch-4' into 'master' 
Update skirk_prospector.txt

See merge request core-developers/forge!774
 2018-07-20 04:54:06 +00:00
Michael Kamensky
04dc886c54 Merge branch 'patch-5' into 'master' 
Update the_flame_of_keld.txt

See merge request core-developers/forge!775
 2018-07-20 04:53:48 +00:00
Michael Kamensky
968407b169 Merge branch 'patch-8' into 'master' 
Update whisper_blood_liturgist.txt

See merge request core-developers/forge!778
 2018-07-20 04:52:28 +00:00