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

6054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
1859fc87ae Merge pull request #751 from kevlahnota/master 
adjust simple menu & textscroller
 2016-07-13 13:11:39 +08:00
Anthony Calosa
6c9d2e5db7 tooltip graphic 2016-07-13 13:09:34 +08:00
Anthony Calosa
d6d147187d add tooltip on textscroller 2016-07-13 13:07:29 +08:00
Anthony Calosa
ab75c1d5e2 adjust simple menu 
adjust simple menu and fix some cards
 2016-07-13 11:43:00 +08:00
Anthony Calosa
992178eb9a Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-07-12 21:40:16 +08:00
Anthony Calosa
f61ce2884a Merge pull request #9 from WagicProject/master 
pull
 2016-07-12 21:40:03 +08:00
Anthony Calosa
21db8852d6 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-12 21:34:30 +08:00
zethfoxster
2900c1f914 Merge pull request #750 from zethfoxster/master 
Pushing fixes
 2016-07-12 09:01:04 -04:00
zethfoxster
8dd7bd8912 Merge pull request #18 from WagicProject/master 
Getting master
 2016-07-12 09:00:25 -04:00
Anthony Calosa
c6f1784d9d Merge pull request #749 from kevlahnota/master 
small adjustment
 2016-07-12 19:27:57 +08:00
Anthony Calosa
684cb086cc rounded 2016-07-12 17:51:48 +08:00
Anthony Calosa
d2d8b06d97 lowered value 2016-07-12 17:44:57 +08:00
Anthony Calosa
4d346e0ca7 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-12 17:43:47 +08:00
Anthony Calosa
a6cbd10f3b Merge pull request #748 from kevlahnota/master 
Update some items
 2016-07-12 16:34:16 +08:00
Anthony Calosa
416a49d87f Update some items 2016-07-12 15:49:43 +08:00
zethfoxster
f438548e5c teaching ai to select X on the menu again. 2016-07-11 23:46:03 -04:00
zethfoxster
cc75fc42db fixed a memleak that triggered with cards like vise, we were leaving this funtion without deleting an event that was not being sent. 2016-07-11 19:32:57 -04:00
zethfoxster
66e01b12f8 Merge pull request #17 from WagicProject/master 
getting master
 2016-07-11 18:53:15 -04:00
Anthony Calosa
b3045726fb Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-12 06:22:49 +08:00
Anthony Calosa
9b2b541e4d Merge pull request #747 from kevlahnota/master 
try to fix failed logic here
 2016-07-12 05:30:58 +08:00
Anthony Calosa
2d763d106d try to fix failed logic here 2016-07-12 02:27:06 +08:00
Anthony Calosa
37d2feeaa5 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-11 20:01:38 +08:00
Anthony Calosa
66a33cd56e Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-11 19:56:57 +08:00
Anthony Calosa
ae07844a71 a little bit smaller 2016-07-11 19:56:39 +08:00
Anthony Calosa
e00484775e Merge pull request #745 from kevlahnota/master 
Add Missing Devoid Cards and change Simple Menu
 2016-07-11 19:54:37 +08:00
Anthony Calosa
ed871db1f3 use regular images in grid deck view 
i did search for psp-2000 and it has 64mb ram vs psp-1000 32mb ram. use
lowres images for psp to be safe.
 2016-07-11 19:16:47 +08:00
Anthony Calosa
3c4f3146c4 fix cards that move on top of library 
seems when you search your library, after you put it on top, it shuffles
also the chosen card.
 2016-07-11 18:39:21 +08:00
Anthony Calosa
5cde230723 Fix Crash when importing deck 
removed "sideboard"
 2016-07-11 16:35:57 +08:00
Anthony Calosa
6d4a068453 SImple Menu 2016-07-11 13:54:08 +08:00
Anthony Calosa
248e8e6beb Added some missing Devoid cards 2016-07-11 10:49:43 +08:00
Anthony Calosa
4db11ba324 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-11 08:43:52 +08:00
Anthony Calosa
a97f862641 Merge pull request #744 from kevlahnota/master 
Add support for reducing hybrid costs
 2016-07-11 08:33:15 +08:00
Anthony Calosa
69db7f7384 Add support for reducing Hybrid cost 
it doesn't remove the hybrid icons but it reduces the cost.
 2016-07-11 07:55:12 +08:00
Anthony Calosa
a72fb6f01a Merge pull request #8 from WagicProject/master 
pull from master
 2016-07-11 07:47:58 +08:00
zethfoxster
53766b99c9 Merge pull request #743 from zethfoxster/master 
pushing to master
 2016-07-10 14:05:51 -04:00
zethfoxster
1b54cf56e0 auto close graveyard when delving and we have exiled enough to pay for the card. 2016-07-10 14:04:27 -04:00
zethfoxster
05a553ffdc Merge pull request #16 from WagicProject/master 
getting master
 2016-07-10 13:46:43 -04:00
Anthony Calosa
d6ea80843f Merge pull request #742 from kevlahnota/master 
Updated Primitives, Corrected Names, Updated Unsupported
 2016-07-10 18:08:00 +08:00
Anthony Calosa
8c2ce43053 Cleaned Unsupported 2016-07-10 17:04:04 +08:00
Anthony Calosa
34b33798a7 Corrected some card names 2016-07-10 16:44:39 +08:00
Anthony Calosa
adbef081d0 Update primitives 
forcedalive now means forcedalive even when the cards is not in play.
Cloudshift ability is move to exile and move to your battlefield, blink
cannot be used since it moves to exile and then moves to owner
battlefield...
 2016-07-10 15:42:36 +08:00
Anthony Calosa
5eb3a86467 Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-07-10 08:59:10 +08:00
Anthony Calosa
bef2b34faa Merge pull request #7 from WagicProject/master 
pull changes from master
 2016-07-10 08:57:20 +08:00
zethfoxster
7516b44804 Merge pull request #741 from zethfoxster/master 
pushing to master
 2016-07-09 20:22:52 -04:00
zethfoxster
8b70f5a114 added isochron and spell binder 2016-07-09 20:21:40 -04:00
zethfoxster
c4581a8889 added imprintedcard as a usable name for castcard 2016-07-09 20:20:55 -04:00
zethfoxster
fdde5b7fe9 ok round 3 2016-07-09 18:57:01 -04:00
zethfoxster
d1bc246a35 Merge pull request #740 from zethfoxster/master 
Master
 2016-07-09 18:30:16 -04:00
zethfox
262779b515 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-09 18:28:08 -04:00
zethfox
78e4407c71 Revert "edge case fix, the issue arises from castcard but I'm fixing it at a higher level since init to zone should always have a valid "player 1" in its first constructor." 
This reverts commit d247c53136.
 2016-07-09 18:21:52 -04:00