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

38471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
8134d72861 Merge branch 'patch-13' into 'master' 
Update goblin_grappler.txt

See merge request core-developers/forge!783
 2018-07-20 04:52:20 +00:00
Michael Kamensky
69e5e4cb21 Merge branch 'iss618' into 'master' 
Resolves https://git.cardforge.org/core-developers/forge/issues/618

Closes #618

See merge request core-developers/forge!784
 2018-07-20 04:51:17 +00:00
Michael Kamensky
1319e0fda9 Merge branch 'patch-2' into 'master' 
Allow Llanowar Envoy in AI draft decks

See merge request core-developers/forge!772
 2018-07-20 04:50:25 +00:00
kms70847
674d09c06d Resolves https://git.cardforge.org/core-developers/forge/issues/618 2018-07-19 20:53:33 -04:00
Meerkov
f0833573be Update goblin_grappler.txt 2018-07-19 14:31:54 +00:00
Meerkov
a2d59cae6a Update whisper_blood_liturgist.txt 2018-07-19 07:12:08 +00:00
Meerkov
53eec599c4 Update cabal_stronghold.txt 2018-07-19 07:04:59 +00:00
Meerkov
e70fa161b4 Update damping_sphere.txt 2018-07-19 06:45:39 +00:00
Meerkov
a7a6a3265a Update the_flame_of_keld.txt 2018-07-19 06:32:59 +00:00
Meerkov
955c79b640 Update skirk_prospector.txt 2018-07-19 06:08:57 +00:00
Meerkov
253a4d389c Update rona_disciple_of_gix.txt 2018-07-19 05:14:06 +00:00
Meerkov
7d608ece67 Allow Llanowar Envoy in AI draft decks 2018-07-19 04:34:44 +00:00
Michael Kamensky
e572b4a506 Merge branch 'patch-1' into 'master' 
Undo RemAiDeck on Deep Freeze

See merge request core-developers/forge!771
 2018-07-19 04:11:33 +00:00
Meerkov
0b23d89783 There is no reason for AI not to play Deep Freeze. 2018-07-19 04:02:50 +00:00
Michael Kamensky
5eab3065bc Merge branch 'FixDepartedDeckhand' into 'master' 
Departed Deckhand AI Targeting Fix

See merge request core-developers/forge!770
 2018-07-18 17:06:52 +00:00
T.J. Tillman
5a5cfb30ef Add Svar so AI doesn't target its own Departed Deckhand with pump spells/auras. 2018-07-18 15:59:57 +00:00
Michael Kamensky
5b3c22201b Merge branch 'flashbackKeywordFix' into 'master' 
Keyword: fix Flashback vs Flash

Closes #621

See merge request core-developers/forge!769
 2018-07-18 06:31:15 +00:00
Hanmac
14ee2f99c8 Keyword: fix Flashback vs Flash 2018-07-18 07:45:48 +02:00
Michael Kamensky
a760901a79 Merge branch 'm19questimages' into 'master' 
Quest images M19

See merge request core-developers/forge!768
 2018-07-18 05:09:45 +00:00
austinio7116
2cf101ac7d Quest images M19 2018-07-17 20:42:00 +01:00
Michael Kamensky
48f0d5b5e4 Merge branch 'm19deckgenupdate' into 'master' 
M19 deckgen updates for standard

See merge request core-developers/forge!767
 2018-07-17 17:59:05 +00:00
austinio7116
eaaa18b15e M19 deckgen updates for standard 2018-07-17 18:18:14 +01:00
Michael Kamensky
613bae436d Merge branch 'puzzle-engine' into 'master' 
GameState: preserve the number of lands played so that land drops from the previous game state do not affect the new game state

See merge request core-developers/forge!766
 2018-07-17 15:27:18 +00:00
Agetian
3c2f5b2ecf - Also reset the lands played last turn. 2018-07-17 16:13:35 +03:00
Michael Kamensky
15aa393d19 Merge branch 'changes-updated' into 'master' 
Updated changes before release.

See merge request core-developers/forge!765
 2018-07-17 07:56:42 +00:00
Michael Kamensky
f8fda3fb2c Merge branch 'CorrectMacabreWaltz' into 'master' 
Fix Macabre Waltz bug

See merge request core-developers/forge!763
 2018-07-17 07:53:42 +00:00
Agetian
442263710b - GameState: preserve the number of lands played so that land drops from the previous game state do not affect the new game state. 2018-07-17 08:50:56 +03:00
maustin
41013330fc Updated changes before release. 2018-07-17 06:29:40 +01:00
Michael Kamensky
64b456827d Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M191.

See merge request core-developers/forge!764
 2018-07-17 05:25:35 +00:00
Agetian
54ad6393ac - Added puzzle PS_M191. 2018-07-17 08:24:53 +03:00
tjtillmancoag
c4a3e93e44 Fixed bug where if opponent controlled your creature and then it died, that creature couldn't be targeted by Macabre Waltz 2018-07-16 22:23:53 -07:00
Michael Kamensky
d51b9cfa24 Merge branch 'CorrectThornLieutenant' into 'master' 
Fix Thorn Lieutenants token generating trigger

See merge request core-developers/forge!762
 2018-07-17 05:09:31 +00:00
tjtillmancoag
7250fa7134 Changed parameter SourceType$ to ValidSource$ in Thorn Lieutenant so that it properly doesn't create tokens from being targeted by its controllers spells and abilities 2018-07-16 21:46:56 -07:00