Commit Graph

  • 478ce0863b Replace cmake installation script Xawotihs 2017-09-03 14:04:32 +02:00
  • 329011460f Update .travis.yml Xawotihs 2017-09-03 13:55:39 +02:00
  • 48ec51a923 Shold fix travis script xawotihs 2017-09-03 12:49:31 +02:00
  • 9936962c56 Should fix cmake issues on linux xawotihs 2017-09-03 12:44:30 +02:00
  • 15111d1b20 Merge branch 'master' of https://github.com/WagicProject/wagic into cmake xawotihs 2017-09-02 21:15:47 +02:00
  • 07e6d90c98 Merge pull request #975 from kevlahnota/master latest-master Anthony Calosa 2017-08-06 13:33:07 +08:00
  • 85231cda01 Fix Nissa's Chosen Anthony Calosa 2017-08-05 22:09:49 +08:00
  • 8549b7b1b4 Interrupt targetted abilities Anthony Calosa 2017-08-05 18:52:27 +08:00
  • 9f58ef9916 small fixes for primitives Anthony Calosa 2017-08-05 18:16:47 +08:00
  • c734ee9fd1 Add exert Indicator Anthony Calosa 2017-08-05 18:16:24 +08:00
  • 77d87902d9 Add restriction for exert Anthony Calosa 2017-08-05 18:15:44 +08:00
  • b5c8656ac9 Fix Blink Anthony Calosa 2017-08-05 18:15:13 +08:00
  • 28f6b73da6 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-08-03 20:03:26 +08:00
  • 521b505543 Merge pull request #974 from kevlahnota/master Anthony Calosa 2017-08-03 19:54:35 +08:00
  • c5a3310103 quick Fix for zerodead Anthony Calosa 2017-08-03 18:32:16 +08:00
  • 0c053c713a fix morbid Anthony Calosa 2017-08-03 18:27:45 +08:00
  • bc06f93aae Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-08-03 15:52:56 +08:00
  • 8e919aeeb1 Merge pull request #973 from kevlahnota/master Anthony Calosa 2017-08-03 10:36:15 +08:00
  • 6bd09e42e0 Add support for Amonkhet Mechanics Anthony Calosa 2017-08-03 09:49:37 +08:00
  • 1f670b9919 Merge pull request #12 from WagicProject/master Anthony Calosa 2017-08-03 09:16:30 +08:00
  • c805a58fb0 Update unsuported cards, set a condition for showing poison counters and energy counter, added tribal al card type check, show the amount o punkeduard 2017-08-02 18:42:52 -05:00
  • 34517004df Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-05-09 12:38:59 +08:00
  • b0506bcd96 Merge pull request #968 from kevlahnota/master Anthony Calosa 2017-05-09 12:29:16 +08:00
  • 7a3a6c04a6 readded fixes by punkeduard Anthony Calosa 2017-05-09 12:28:07 +08:00
  • 54e4b08e1f Merge pull request #11 from WagicProject/master Anthony Calosa 2017-05-09 12:25:45 +08:00
  • 67c22c5186 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-05-09 12:09:12 +08:00
  • 87aba86fa8 Revert "Fixing bugs in the primitives" punkeduard 2017-05-08 22:17:27 -05:00
  • 28ea300f42 - fix forward declaration Rolzad73 2017-05-08 19:39:32 -04:00
  • 858c26b46a Merge pull request #966 from WagicProject/key_bind_changes Rolzad73 2017-05-08 19:03:03 -04:00
  • 70a6c7149c - semi cleanup Rolzad73 2017-05-08 19:01:41 -04:00
  • b4a34216c8 - updated Qt keybinding translation Rolzad73 2017-05-08 18:58:47 -04:00
  • 2b1f1d016e Auto-Updated Travis-CI configuration for Mac travis_mac_osx xawotihs 2017-05-08 04:45:57 +00:00
  • 3868f4eb98 Merge pull request #965 from kevlahnota/master Anthony Calosa 2017-05-08 12:15:44 +08:00
  • 44304ee5b3 minor corrections Anthony Calosa 2017-05-08 11:41:00 +08:00
  • 9f4b8d65c8 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-05-08 11:33:57 +08:00
  • 665f8ce755 Fixing bugs in the primitives punkeduard 2017-05-03 14:42:10 -05:00
  • e1d5348f23 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-20 11:37:01 +08:00
  • b596dc9eea Merge pull request #964 from kevlahnota/master Anthony Calosa 2017-03-20 06:09:04 +08:00
  • eb8370b86b add some cards Anthony Calosa 2017-03-19 21:57:59 +08:00
  • fa69686f0a Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-19 08:59:21 +08:00
  • 3fe5372d28 non-commit to test build Rolzad73 2017-03-18 11:27:20 -04:00
  • 3058d42b49 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-16 20:58:36 +08:00
  • 4975ee0028 Merge pull request #963 from kevlahnota/master Anthony Calosa 2017-03-16 17:53:14 +08:00
  • d4e1d809f3 Bushido & Modular Anthony Calosa 2017-03-16 16:58:56 +08:00
  • 44cb0d995e support some cards discarded by opponent Anthony Calosa 2017-03-16 10:58:27 +08:00
  • c73d08187b Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-16 06:11:27 +08:00
  • 4382c34539 Merge pull request #962 from kevlahnota/master Anthony Calosa 2017-03-15 12:54:44 +08:00
  • cb173b7bf9 update unsupported Anthony Calosa 2017-03-15 11:46:47 +08:00
  • b5d4674471 unused variable Anthony Calosa 2017-03-15 11:23:53 +08:00
  • be1803dfb6 unearth rule Anthony Calosa 2017-03-15 06:35:30 +08:00
  • 417c1af21e hide action stack Anthony Calosa 2017-03-15 06:31:39 +08:00
  • 00bccd02da Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-15 06:16:46 +08:00
  • 8596443da5 Fixing card primitives punkeduard 2017-03-14 12:53:29 -06:00
  • a2eda76a26 fix prefetch options Anthony Calosa 2017-03-14 17:06:14 +08:00
  • b4e25838bd update targetchooser Anthony Calosa 2017-03-14 09:15:14 +08:00
  • 44d703887c Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-14 09:12:05 +08:00
  • 29fd3e4c96 Merge pull request #961 from kevlahnota/master Anthony Calosa 2017-03-14 05:39:38 +08:00
  • 0778b13e2b Totem Armor Anthony Calosa 2017-03-14 03:40:29 +08:00
  • bef1f6d8b8 aura parent Anthony Calosa 2017-03-13 18:16:22 +08:00
  • d6a0b04930 Partial fix for Cards with Bestow Anthony Calosa 2017-03-13 13:32:43 +08:00
  • 87ae60f323 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-12 22:14:59 +08:00
  • 85df061701 Merge pull request #960 from kevlahnota/master Anthony Calosa 2017-03-12 12:14:09 +08:00
  • 4ed44c638f Update Rules Anthony Calosa 2017-03-12 10:53:39 +08:00
  • 54f0cd7864 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-12 07:36:00 +08:00
  • 4f523b1b9b Non-commit to test build system Rolzad73 2017-03-11 12:01:07 -05:00
  • d492481a4f Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-11 22:10:28 +08:00
  • 3975a45858 Merge pull request #959 from kevlahnota/master Anthony Calosa 2017-03-11 10:48:17 +08:00
  • 5f2fbb370c fix Anthony Calosa 2017-03-11 07:57:54 +08:00
  • d9bd6bbb32 cascade, cascade Anthony Calosa 2017-03-10 19:25:54 +08:00
  • 31814bda37 sort filter Anthony Calosa 2017-03-10 19:24:49 +08:00
  • 8f61b590f8 Hide Action stack if there's a menu object Anthony Calosa 2017-03-10 19:24:39 +08:00
  • 37642c1f78 rageform Anthony Calosa 2017-03-10 14:14:02 +08:00
  • 8ea7b4d4cb Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-10 13:43:31 +08:00
  • 245f5c6e93 Merge pull request #958 from kevlahnota/master Anthony Calosa 2017-03-10 12:58:02 +08:00
  • 88d1c29621 safe delete Anthony Calosa 2017-03-10 08:49:35 +08:00
  • 44926393ac Ripple cards Anthony Calosa 2017-03-10 07:19:29 +08:00
  • 5d790c9406 moved lastcontroller override Anthony Calosa 2017-03-10 07:19:15 +08:00
  • 66261b0f51 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-10 07:08:56 +08:00
  • e99a9abacd Merge pull request #957 from kevlahnota/master Anthony Calosa 2017-03-09 19:34:10 +08:00
  • b01c1455f5 Provoke Anthony Calosa 2017-03-09 18:37:55 +08:00
  • 650d794eec Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-09 14:33:29 +08:00
  • acf74e7f6e Merge pull request #956 from kevlahnota/master Anthony Calosa 2017-03-09 09:07:45 +08:00
  • 53f0c2421d manifest support Anthony Calosa 2017-03-09 07:44:06 +08:00
  • 01d46615a7 fix credits Anthony Calosa 2017-03-09 02:01:08 +08:00
  • 57f55e4270 corrections Anthony Calosa 2017-03-08 22:44:34 +08:00
  • 5c159e86d7 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-08 20:52:04 +08:00
  • fb03037923 Merge pull request #955 from kevlahnota/master Anthony Calosa 2017-03-08 16:14:09 +08:00
  • ff6e4aec9a adjust stack display & game credits Anthony Calosa 2017-03-08 13:38:19 +08:00
  • c78db0eb26 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-08 05:46:00 +08:00
  • 324e206b74 Merge pull request #954 from kevlahnota/master Anthony Calosa 2017-03-08 02:37:09 +08:00
  • 030dca051a support for wish cards and deck sideboard Anthony Calosa 2017-03-07 23:42:34 +08:00
  • 24e3fd3267 Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-07 15:47:18 +08:00
  • a28f6b1194 Merge pull request #953 from kevlahnota/master Anthony Calosa 2017-03-07 05:32:38 +08:00
  • 38e97aa79f fix etched affinity stalling the game Anthony Calosa 2017-03-06 17:52:44 +08:00
  • 8adfd1b10b Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-06 12:52:58 +08:00
  • ffda7a53fe Merge pull request #952 from kevlahnota/master Anthony Calosa 2017-03-06 11:19:53 +08:00
  • 20ddd9157f prefetching options Anthony Calosa 2017-03-06 10:41:52 +08:00
  • a3f329bd7a Merge remote-tracking branch 'refs/remotes/WagicProject/master' Anthony Calosa 2017-03-06 10:40:25 +08:00
  • 13c6837b60 Merge pull request #951 from kevlahnota/master Anthony Calosa 2017-03-06 06:25:03 +08:00
  • 84fe9fbc74 highlight border fix Anthony Calosa 2017-03-05 22:38:53 +08:00