Commit Graph

6319 Commits

Author SHA1 Message Date
Anthony Calosa
dcf4148d75 Merge pull request #831 from kevlahnota/master
fix code monk token
2016-08-04 21:02:34 +08:00
Anthony Calosa
8afeef568f update ability
prowess +1/+1 is ueot
2016-08-04 20:55:36 +08:00
Anthony Calosa
195daa97f3 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-04 13:59:34 +08:00
Anthony Calosa
b1c5c87443 Merge pull request #830 from kevlahnota/master
Fix AttackCost & BlockCost, Add nonCombatDamage count
2016-08-04 12:16:48 +08:00
Anthony Calosa
1ab88940f9 add nonCombatDamage count 2016-08-04 09:56:53 +08:00
Anthony Calosa
8ba97b8a74 Fix attackcost & blockcost
thanks zeth
2016-08-04 09:50:09 +08:00
Anthony Calosa
e7f5442a64 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-04 09:29:45 +08:00
Anthony Calosa
fa0722a9e2 Merge pull request #828 from kevlahnota/master
some card corrections
2016-08-04 05:50:00 +08:00
Anthony Calosa
5f276f6b22 blockcost and attackcost
counter{1%1} -> value
2016-08-04 05:46:23 +08:00
Anthony Calosa
c45b5751af cantattack
change some cards since -cantattack overrides cantattack. If there is an
effect that makes creatures can't attack, you can just activate the
ability to remove -cantattack...
2016-08-04 05:41:22 +08:00
Anthony Calosa
0679832b04 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-04 03:20:24 +08:00
Anthony Calosa
b20d6f8820 Merge pull request #827 from kevlahnota/master
TokenAndAbility for AACloner & AACopier
2016-08-04 03:17:26 +08:00
Anthony Calosa
52fb40d543 AACloner & AACopier TokenAndAbility
if the token has andAbility, the cloner/copier also has that andAbility
also...
2016-08-04 02:12:59 +08:00
Anthony Calosa
067279d2e8 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-04 02:02:12 +08:00
Anthony Calosa
a0bbed6c6c Merge pull request #826 from kevlahnota/master
fix crash when copying tokens
2016-08-04 00:41:31 +08:00
Anthony Calosa
9371125eb0 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-04 00:40:01 +08:00
Anthony Calosa
0a0f6cdce9 fix crash
wrong parenthesis
2016-08-04 00:36:49 +08:00
Rolzad73
fc350be3a1 Update README.md 2016-08-03 12:36:25 -04:00
Anthony Calosa
be731a99c0 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-03 23:09:13 +08:00
Anthony Calosa
c65fd1d7ae Merge pull request #825 from kevlahnota/master
corrections
2016-08-03 23:06:45 +08:00
Anthony Calosa
be899159f3 correction 2016-08-03 23:03:32 +08:00
Anthony Calosa
2400e6578b Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-03 22:34:05 +08:00
Anthony Calosa
1aac2b8e75 Update AllAbilities.cpp
Try to fix IOS/MAC compilation
2016-08-03 21:23:38 +08:00
Anthony Calosa
c7581220b8 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-03 20:40:12 +08:00
Anthony Calosa
f3968215e0 Merge pull request #824 from kevlahnota/master
andAbility on ATokenCreator, Extend AAFlip
2016-08-03 18:46:46 +08:00
Anthony Calosa
56a8011b78 revert 2016-08-03 18:44:41 +08:00
Anthony Calosa
adccae7937 switched places 2016-08-03 18:11:29 +08:00
Anthony Calosa
1c63c1937a Update some cards 2016-08-03 16:28:49 +08:00
Anthony Calosa
4753f7bb51 andAbility on ATokenCreator, Extend AAFlip, 2016-08-03 16:10:53 +08:00
Anthony Calosa
d7fec7d10a Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-02 12:34:06 +08:00
Anthony Calosa
3c90a29b1e Merge pull request #823 from kevlahnota/master
Border size and color, Copier/Token Indicator
2016-08-01 23:17:12 +08:00
Anthony Calosa
98de361bf4 change comment
enable the indicator at all modes...
2016-08-01 22:34:28 +08:00
Anthony Calosa
c1df10e064 Minor Proportioning 2016-08-01 22:17:53 +08:00
Anthony Calosa
3743e0bc03 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-01 21:40:22 +08:00
Anthony Calosa
12e6a4d0ae Merge pull request #822 from kevlahnota/master
Some Corrections
2016-08-01 15:32:07 +08:00
Anthony Calosa
969511953a vector count of abilities
remove unused ones
2016-08-01 14:45:57 +08:00
Anthony Calosa
223e2e04b0 Correction 2016-08-01 11:44:07 +08:00
Anthony Calosa
0b0368ffcc Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-01 08:23:16 +08:00
Anthony Calosa
9e4684b524 Merge pull request #821 from kevlahnota/master
Fix transforms for non-permanent
2016-08-01 06:52:38 +08:00
Anthony Calosa
d825c7e4ea parenthesis 2016-08-01 04:49:04 +08:00
Anthony Calosa
c38c996773 Revised "putinplay" in castcard 2016-08-01 04:43:54 +08:00
Anthony Calosa
71a9ef00ee Support transforms for nonpermanent
fix startled awake to persistent nightmare
2016-08-01 03:52:10 +08:00
Anthony Calosa
89a30ae5ee Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-01 03:02:01 +08:00
Anthony Calosa
0efc6338bb Merge pull request #820 from kevlahnota/master
Fix Cloner
2016-07-31 21:38:10 +08:00
Anthony Calosa
3b98da1d86 Fix Cloner ability 2016-07-31 18:46:07 +08:00
Anthony Calosa
6927c68811 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-31 18:06:12 +08:00
Anthony Calosa
f0909ba3a0 Merge pull request #819 from kevlahnota/master
minor fix
2016-07-31 13:30:15 +08:00
Anthony Calosa
2f7d2873f7 @at to @each 2016-07-31 13:28:55 +08:00
Anthony Calosa
7a6b6aa335 Change copier copy 2016-07-31 13:24:18 +08:00
Anthony Calosa
2861ef0c73 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-31 13:13:26 +08:00