Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,343 Commits 14 Branches 14 Tags
d995d25f69ad2cb9903bef6424201e5172117d09
Commit Graph

6343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
d995d25f69 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-07 10:37:31 +08:00
Anthony Calosa
1f58b8e6a7 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-07 10:30:42 +08:00
Anthony Calosa
eeb881cdc2 Merge pull request #837 from kevlahnota/master 
AACopier andAbility support
 2016-08-07 10:29:06 +08:00
Anthony Calosa
807874ce5d add andAbility support for AACopier 
the granted ability must exists only if you copy a card, if you don't
copy any card, the source doesn't have any granted abillities.
 2016-08-07 10:15:11 +08:00
punkeduard
213d11c8e9 Changes to primitives 
name=Ojutai, Soul of Winter
name=Atarka, World Render
name=Kolaghan, the Storm's Fury
name=Savageborn Hydra
 2016-08-06 21:03:23 -05:00
Anthony Calosa
dfd0761506 Corrected cards reported from forums 2016-08-07 09:59:59 +08:00
Anthony Calosa
4c30086896 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-06 21:28:57 +08:00
Anthony Calosa
1efdca399e Merge pull request #836 from kevlahnota/master 
re enabled token quads
 2016-08-06 20:29:09 +08:00
Anthony Calosa
4f27c8051a forgot these 2016-08-06 19:55:18 +08:00
Anthony Calosa
d43693fef0 when ingame, try finding the quad 
for copier/cloner when copying token generated cards...
 2016-08-06 19:41:34 +08:00
Anthony Calosa
88f0202b16 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-06 19:06:57 +08:00
Anthony Calosa
be98e0b543 Update CardGui.cpp 
Disabled temporary...
 2016-08-06 01:40:21 -05:00
Rolzad73
8a907bb3f3 Merge pull request #835 from WagicProject/android_tweaks 
Android tweaks
 2016-08-06 00:25:36 -04:00
Anthony Calosa
1b34a478a1 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-06 08:04:15 +08:00
Anthony Calosa
cda0bba555 Merge pull request #834 from kevlahnota/master 
Copied token images
 2016-08-05 22:26:57 +08:00
Anthony Calosa
dae1b10de1 Copied Token Image 
If the image is not found, try finding the token counterpart by Id
 2016-08-05 21:52:46 +08:00
Rolzad73
0c4e72ece2 - attempt to fix storage location list issue on Android 4.3+ 2016-08-04 14:53:52 -04:00
Rolzad73
77dfd51b28 - Android debug logging organization 2016-08-04 13:15:49 -04:00
Rolzad73
b601a549d0 - added option for Android x86 build types 2016-08-04 11:26:41 -04:00
Anthony Calosa
c4907edd76 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-08-04 21:19:32 +08:00
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
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
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
Rolzad73
066dd866b1 - reverting debuggable attribute removal 2016-08-03 20:36:34 -04: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
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
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