Commit Graph

6305 Commits

Author SHA1 Message Date
Rolzad73
b601a549d0 - added option for Android x86 build types 2016-08-04 11:26:41 -04:00
Rolzad73
dd5635d9cd - only minor whitespace formatting Android 2016-08-04 08:32:17 -04:00
Rolzad73
62a6ddf3ca - update android gitignore
- update android launcher icons
2016-08-04 08:02:32 -04:00
Rolzad73
066dd866b1 - reverting debuggable attribute removal 2016-08-03 20:36:34 -04:00
Rolzad73
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
2016-08-03 16:01:43 -04: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
Anthony Calosa
059fc06f3a Merge pull request #818 from kevlahnota/master
Fix Chandra, Flamecaller & Cryptolith Rite
2016-07-31 08:20:09 +08:00
Anthony Calosa
a971576de0 Fix Chandra, Cryptolith Rite 2016-07-31 08:16:25 +08:00
Anthony Calosa
a4e059e3ec Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-31 08:14:28 +08:00
Anthony Calosa
07408b7bc3 Merge pull request #817 from kevlahnota/master
Added EMA & Revert Stormtide Leviathan code
2016-07-31 08:09:09 +08:00
Anthony Calosa
9722f7b71e Added Eternal Masters 2016-07-31 08:06:53 +08:00
Anthony Calosa
45d8413d59 Revert Stormtide Leviathan code 2016-07-31 07:58:26 +08:00
Anthony Calosa
5c400457a9 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-31 07:32:08 +08:00
zethfoxster
3e9ee5890f Merge pull request #816 from zethfoxster/master
add some handling of reveal to avoid a crash in demo for AI.
2016-07-30 10:51:26 -04:00
zethfoxster
1acdb40498 add some handling of reveal to avoid a crash in demo for AI. 2016-07-30 10:50:31 -04:00
zethfoxster
1dc0b00133 Merge pull request #815 from zethfoxster/master
same applies for scry
2016-07-30 10:20:48 -04:00
zethfoxster
f2208389bd same applies for scry 2016-07-30 10:20:19 -04:00
zethfoxster
ab92c3e15b Merge pull request #814 from zethfoxster/master
pushing to master
2016-07-30 10:14:54 -04:00
zethfoxster
018e35295a fixed a crash in revealing, not sure why I thought it was a good idea to test testdestroy something that I just removed from the game. if anyone can find another crash with it, let me know which card causes it. 2016-07-30 10:13:58 -04:00
zethfoxster
2c9e90eee0 Merge pull request #38 from WagicProject/master
getting master
2016-07-30 08:29:45 -04:00