Commit Graph

6934 Commits

Author SHA1 Message Date
xawotihs
2b1f1d016e Auto-Updated Travis-CI configuration for Mac 2017-05-08 04:45:57 +00:00
Anthony Calosa
3868f4eb98 Merge pull request #965 from kevlahnota/master
Minor Corrections
2017-05-08 12:15:44 +08:00
Anthony Calosa
44304ee5b3 minor corrections 2017-05-08 11:41:00 +08:00
Anthony Calosa
9f4b8d65c8 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-05-08 11:33:57 +08:00
punkeduard
665f8ce755 Fixing bugs in the primitives
Daring Sleuth was crashing the game in the collection
2017-05-03 14:42:10 -05:00
Anthony Calosa
e1d5348f23 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-20 11:37:01 +08:00
Anthony Calosa
b596dc9eea Merge pull request #964 from kevlahnota/master
Add some cards
2017-03-20 06:09:04 +08:00
Anthony Calosa
eb8370b86b add some cards
also added countb() - countedbamount..
2017-03-19 21:57:59 +08:00
Anthony Calosa
fa69686f0a Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-19 08:59:21 +08:00
Rolzad73
3fe5372d28 non-commit to test build 2017-03-18 11:27:20 -04:00
Anthony Calosa
3058d42b49 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-16 20:58:36 +08:00
Anthony Calosa
4975ee0028 Merge pull request #963 from kevlahnota/master
Bushido, Modular points
2017-03-16 17:53:14 +08:00
Anthony Calosa
d4e1d809f3 Bushido & Modular
add Bushido and Modular points
2017-03-16 16:58:56 +08:00
Anthony Calosa
44cb0d995e support some cards discarded by opponent 2017-03-16 10:58:27 +08:00
Anthony Calosa
c73d08187b Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-16 06:11:27 +08:00
Anthony Calosa
4382c34539 Merge pull request #962 from kevlahnota/master
minor fixes
2017-03-15 12:54:44 +08:00
Anthony Calosa
cb173b7bf9 update unsupported 2017-03-15 11:46:47 +08:00
Anthony Calosa
b5d4674471 unused variable 2017-03-15 11:23:53 +08:00
Anthony Calosa
be1803dfb6 unearth rule 2017-03-15 06:35:30 +08:00
Anthony Calosa
417c1af21e hide action stack
if there's a human player and a menu object
2017-03-15 06:31:39 +08:00
Anthony Calosa
00bccd02da Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-15 06:16:46 +08:00
punkeduard
8596443da5 Fixing card primitives
Add flying to an angel and corrected some values on mana costs
2017-03-14 12:53:29 -06:00
Anthony Calosa
a2eda76a26 fix prefetch options 2017-03-14 17:06:14 +08:00
Anthony Calosa
b4e25838bd update targetchooser 2017-03-14 09:15:14 +08:00
Anthony Calosa
44d703887c Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-14 09:12:05 +08:00
Anthony Calosa
29fd3e4c96 Merge pull request #961 from kevlahnota/master
Totem Armor
2017-03-14 05:39:38 +08:00
Anthony Calosa
0778b13e2b Totem Armor 2017-03-14 03:40:29 +08:00
Anthony Calosa
bef1f6d8b8 aura parent 2017-03-13 18:16:22 +08:00
Anthony Calosa
d6a0b04930 Partial fix for Cards with Bestow
missing was to seperate the mode as aura enchantment or enchantment
creature when cast and update the cost
2017-03-13 13:32:43 +08:00
Anthony Calosa
87ae60f323 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-12 22:14:59 +08:00
Anthony Calosa
85df061701 Merge pull request #960 from kevlahnota/master
Update Rules
2017-03-12 12:14:09 +08:00
Anthony Calosa
4ed44c638f Update Rules
Also fix stack display and removed unnecessary code (border for card is
targetted/targetter since we used forcedborder in actionstack). Also
fixed some cards
2017-03-12 10:53:39 +08:00
Anthony Calosa
54f0cd7864 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-12 07:36:00 +08:00
Rolzad73
4f523b1b9b Non-commit to test build system 2017-03-11 12:01:07 -05:00
Anthony Calosa
d492481a4f Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-11 22:10:28 +08:00
Anthony Calosa
3975a45858 Merge pull request #959 from kevlahnota/master
Hide action stack & Sorted Filter
2017-03-11 10:48:17 +08:00
Anthony Calosa
5f2fbb370c fix 2017-03-11 07:57:54 +08:00
Anthony Calosa
d9bd6bbb32 cascade, cascade 2017-03-10 19:25:54 +08:00
Anthony Calosa
31814bda37 sort filter 2017-03-10 19:24:49 +08:00
Anthony Calosa
8f61b590f8 Hide Action stack if there's a menu object 2017-03-10 19:24:39 +08:00
Anthony Calosa
37642c1f78 rageform
rageform, lightform & cloudform support. withenchant is for only these
cards...
2017-03-10 14:14:02 +08:00
Anthony Calosa
8ea7b4d4cb Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-10 13:43:31 +08:00
Anthony Calosa
245f5c6e93 Merge pull request #958 from kevlahnota/master
Ripple Cards
2017-03-10 12:58:02 +08:00
Anthony Calosa
88d1c29621 safe delete 2017-03-10 08:49:35 +08:00
Anthony Calosa
44926393ac Ripple cards 2017-03-10 07:19:29 +08:00
Anthony Calosa
5d790c9406 moved lastcontroller override 2017-03-10 07:19:15 +08:00
Anthony Calosa
66261b0f51 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-10 07:08:56 +08:00
Anthony Calosa
e99a9abacd Merge pull request #957 from kevlahnota/master
Provoke
2017-03-09 19:34:10 +08:00
Anthony Calosa
b01c1455f5 Provoke
also add aicode for Amplify cards
2017-03-09 18:37:55 +08:00
Anthony Calosa
650d794eec Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2017-03-09 14:33:29 +08:00