Commit Graph

  • de44abd529 Revert "fix token names with ","" Anthony Calosa 2016-08-08 11:29:04 +08:00
  • 9807ca99f9 Revert "multi tokens images on same source" Anthony Calosa 2016-08-08 11:20:25 +08:00
  • 8c9d2d6f1d multi tokens images on same source Anthony Calosa 2016-08-08 10:37:27 +08:00
  • 65ef1f384c fix token names with "," Anthony Calosa 2016-08-08 10:15:50 +08:00
  • bf2cc36719 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-08 09:30:33 +08:00
  • 34ffe7eefa Merge pull request #842 from kevlahnota/master Anthony Calosa 2016-08-07 22:37:57 +08:00
  • b756c8b9ec resize avatar Anthony Calosa 2016-08-07 22:33:40 +08:00
  • 19a98c9ad6 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-07 22:26:39 +08:00
  • e159025ebb Merge pull request #841 from kevlahnota/master Anthony Calosa 2016-08-07 19:46:56 +08:00
  • 05e81ad923 Fix Westvale Abbey and Master Transmuter Anthony Calosa 2016-08-07 19:42:56 +08:00
  • 8e1a0eb20f Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-07 15:29:23 +08:00
  • a881b8fa5a Merge pull request #840 from kevlahnota/master Anthony Calosa 2016-08-07 14:08:51 +08:00
  • 6982030013 Minor adjustment Anthony Calosa 2016-08-07 14:08:09 +08:00
  • 01da4c6af5 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-07 14:06:22 +08:00
  • a42805d4cc Merge pull request #839 from kevlahnota/master Anthony Calosa 2016-08-07 13:24:54 +08:00
  • 01145c4581 new adjustments Anthony Calosa 2016-08-07 13:24:14 +08:00
  • 4d1dfb58ff Fix Enstack Attackers Anthony Calosa 2016-08-07 11:49:57 +08:00
  • 43f44a4142 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-07 11:47:32 +08:00
  • b314d3cafe Merge pull request #838 from kevlahnota/master Anthony Calosa 2016-08-07 11:21:43 +08:00
  • 9bbf28e44b correction Anthony Calosa 2016-08-07 11:21:07 +08:00
  • d995d25f69 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-07 10:37:31 +08:00
  • 1f58b8e6a7 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-07 10:30:42 +08:00
  • eeb881cdc2 Merge pull request #837 from kevlahnota/master Anthony Calosa 2016-08-07 10:29:06 +08:00
  • 807874ce5d add andAbility support for AACopier Anthony Calosa 2016-08-07 10:15:11 +08:00
  • 213d11c8e9 Changes to primitives punkeduard 2016-08-06 21:03:23 -05:00
  • dfd0761506 Corrected cards reported from forums Anthony Calosa 2016-08-07 09:59:59 +08:00
  • 4c30086896 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-06 21:28:57 +08:00
  • 1efdca399e Merge pull request #836 from kevlahnota/master Anthony Calosa 2016-08-06 20:29:09 +08:00
  • 4f27c8051a forgot these Anthony Calosa 2016-08-06 19:55:18 +08:00
  • d43693fef0 when ingame, try finding the quad Anthony Calosa 2016-08-06 19:41:34 +08:00
  • 88f0202b16 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-06 19:06:57 +08:00
  • be98e0b543 Update CardGui.cpp Anthony Calosa 2016-08-06 01:40:21 -05:00
  • 8a907bb3f3 Merge pull request #835 from WagicProject/android_tweaks Rolzad73 2016-08-06 00:25:36 -04:00
  • 1b34a478a1 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-06 08:04:15 +08:00
  • cda0bba555 Merge pull request #834 from kevlahnota/master Anthony Calosa 2016-08-05 22:26:57 +08:00
  • dae1b10de1 Copied Token Image Anthony Calosa 2016-08-05 21:52:46 +08:00
  • 0c4e72ece2 - attempt to fix storage location list issue on Android 4.3+ Rolzad73 2016-08-04 14:53:52 -04:00
  • 77dfd51b28 - Android debug logging organization Rolzad73 2016-08-04 13:15:49 -04:00
  • b601a549d0 - added option for Android x86 build types Rolzad73 2016-08-04 11:26:41 -04:00
  • c4907edd76 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-04 21:19:32 +08:00
  • dcf4148d75 Merge pull request #831 from kevlahnota/master Anthony Calosa 2016-08-04 21:02:34 +08:00
  • 8afeef568f update ability Anthony Calosa 2016-08-04 20:55:36 +08:00
  • dd5635d9cd - only minor whitespace formatting Android Rolzad73 2016-08-04 08:32:17 -04:00
  • 62a6ddf3ca - update android gitignore - update android launcher icons Rolzad73 2016-08-04 08:02:32 -04:00
  • 195daa97f3 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-04 13:59:34 +08:00
  • b1c5c87443 Merge pull request #830 from kevlahnota/master Anthony Calosa 2016-08-04 12:16:48 +08:00
  • 1ab88940f9 add nonCombatDamage count Anthony Calosa 2016-08-04 09:56:53 +08:00
  • 8ba97b8a74 Fix attackcost & blockcost Anthony Calosa 2016-08-04 09:50:09 +08:00
  • e7f5442a64 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-04 09:29:45 +08:00
  • 066dd866b1 - reverting debuggable attribute removal Rolzad73 2016-08-03 20:36:34 -04:00
  • fa0722a9e2 Merge pull request #828 from kevlahnota/master Anthony Calosa 2016-08-04 05:50:00 +08:00
  • 5f276f6b22 blockcost and attackcost Anthony Calosa 2016-08-04 05:46:23 +08:00
  • c45b5751af cantattack Anthony Calosa 2016-08-04 05:41:22 +08:00
  • 161802cf9d minor Android tweaks - removed ads reference no longer used in manifest - removed redundant android:debuggable attribute - cleared EGL debug warning log spamming issue #581 Rolzad73 2016-08-03 16:01:43 -04:00
  • 0679832b04 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-04 03:20:24 +08:00
  • b20d6f8820 Merge pull request #827 from kevlahnota/master Anthony Calosa 2016-08-04 03:17:26 +08:00
  • 52fb40d543 AACloner & AACopier TokenAndAbility Anthony Calosa 2016-08-04 02:12:59 +08:00
  • 067279d2e8 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-04 02:02:12 +08:00
  • a0bbed6c6c Merge pull request #826 from kevlahnota/master Anthony Calosa 2016-08-04 00:41:31 +08:00
  • 9371125eb0 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-04 00:40:01 +08:00
  • 0a0f6cdce9 fix crash Anthony Calosa 2016-08-04 00:36:49 +08:00
  • fc350be3a1 Update README.md Rolzad73 2016-08-03 12:36:25 -04:00
  • be731a99c0 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-03 23:09:13 +08:00
  • c65fd1d7ae Merge pull request #825 from kevlahnota/master Anthony Calosa 2016-08-03 23:06:45 +08:00
  • be899159f3 correction Anthony Calosa 2016-08-03 23:03:32 +08:00
  • 2400e6578b Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-03 22:34:05 +08:00
  • 1aac2b8e75 Update AllAbilities.cpp Anthony Calosa 2016-08-03 21:23:38 +08:00
  • c7581220b8 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-03 20:40:12 +08:00
  • f3968215e0 Merge pull request #824 from kevlahnota/master Anthony Calosa 2016-08-03 18:46:46 +08:00
  • 56a8011b78 revert Anthony Calosa 2016-08-03 18:44:41 +08:00
  • adccae7937 switched places Anthony Calosa 2016-08-03 18:11:29 +08:00
  • 1c63c1937a Update some cards Anthony Calosa 2016-08-03 16:28:49 +08:00
  • 4753f7bb51 andAbility on ATokenCreator, Extend AAFlip, Anthony Calosa 2016-08-03 16:10:53 +08:00
  • d7fec7d10a Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-02 12:34:06 +08:00
  • 3c90a29b1e Merge pull request #823 from kevlahnota/master Anthony Calosa 2016-08-01 23:17:12 +08:00
  • 98de361bf4 change comment Anthony Calosa 2016-08-01 22:34:28 +08:00
  • c1df10e064 Minor Proportioning Anthony Calosa 2016-08-01 22:17:53 +08:00
  • 3743e0bc03 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-01 21:40:22 +08:00
  • 12e6a4d0ae Merge pull request #822 from kevlahnota/master Anthony Calosa 2016-08-01 15:32:07 +08:00
  • 969511953a vector count of abilities Anthony Calosa 2016-08-01 14:45:57 +08:00
  • 223e2e04b0 Correction Anthony Calosa 2016-08-01 11:44:07 +08:00
  • 0b0368ffcc Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-01 08:23:16 +08:00
  • 9e4684b524 Merge pull request #821 from kevlahnota/master Anthony Calosa 2016-08-01 06:52:38 +08:00
  • d825c7e4ea parenthesis Anthony Calosa 2016-08-01 04:49:04 +08:00
  • c38c996773 Revised "putinplay" in castcard Anthony Calosa 2016-08-01 04:43:54 +08:00
  • 71a9ef00ee Support transforms for nonpermanent Anthony Calosa 2016-08-01 03:52:10 +08:00
  • 89a30ae5ee Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-08-01 03:02:01 +08:00
  • 94bd0e057b Merge pull request #39 from WagicProject/master zethfoxster 2016-07-31 10:46:46 -04:00
  • 0efc6338bb Merge pull request #820 from kevlahnota/master Anthony Calosa 2016-07-31 21:38:10 +08:00
  • 3b98da1d86 Fix Cloner ability Anthony Calosa 2016-07-31 18:46:07 +08:00
  • 6927c68811 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-31 18:06:12 +08:00
  • f0909ba3a0 Merge pull request #819 from kevlahnota/master Anthony Calosa 2016-07-31 13:30:15 +08:00
  • 2f7d2873f7 @at to @each Anthony Calosa 2016-07-31 13:28:55 +08:00
  • 7a6b6aa335 Change copier copy Anthony Calosa 2016-07-31 13:24:18 +08:00
  • 2861ef0c73 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-31 13:13:26 +08:00
  • 059fc06f3a Merge pull request #818 from kevlahnota/master Anthony Calosa 2016-07-31 08:20:09 +08:00
  • a971576de0 Fix Chandra, Cryptolith Rite Anthony Calosa 2016-07-31 08:16:25 +08:00
  • a4e059e3ec Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2016-07-31 08:14:28 +08:00
  • 07408b7bc3 Merge pull request #817 from kevlahnota/master Anthony Calosa 2016-07-31 08:09:09 +08:00
  • 9722f7b71e Added Eternal Masters Anthony Calosa 2016-07-31 08:06:53 +08:00