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

6173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
894615bee6 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-25 05:15:38 +08:00
zethfoxster
aeed094be0 Merge pull request #789 from zethfoxster/master 
big whoops here, this would be a disastrous change.
 2016-07-24 11:12:45 -04:00
zethfoxster
61068ee166 big whoops here, this would be a disastrous change. 2016-07-24 11:12:13 -04:00
zethfoxster
bdce25cb8c Merge pull request #788 from zethfoxster/master 
pushing to master
 2016-07-24 11:09:18 -04:00
zethfoxster
6a71bf5653 Merge pull request #32 from WagicProject/master 
getting master
 2016-07-24 11:08:51 -04:00
zethfoxster
3007ddc093 added oplifetotal...or readded, i swear this was already in a long time ago when I added lifetotal as a variable. either way. 2016-07-24 11:08:08 -04:00
Anthony Calosa
4495e1649f Merge pull request #787 from kevlahnota/master 
Little border adjustments
 2016-07-24 21:19:57 +08:00
Anthony Calosa
f960cdea9b A little border adjustment 
no more very thin borders on awards and in game...
 2016-07-24 20:25:20 +08:00
Anthony Calosa
b70b2a65bc Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-07-24 20:20:31 +08:00
Anthony Calosa
4a73e90da8 remove test 
temporarily
 2016-07-24 20:19:58 +08:00
Anthony Calosa
fc59bef156 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-24 19:41:58 +08:00
zethfoxster
512f4ca4e4 Merge pull request #786 from zethfoxster/master 
pushing to master
 2016-07-24 07:33:17 -04:00
zethfoxster
f254ca57c6 Merge pull request #31 from WagicProject/master 
getting master
 2016-07-24 07:32:06 -04:00
Anthony Calosa
5e35dac1da Update Living_Death.txt 2016-07-24 17:51:26 +08:00
Anthony Calosa
44cbd408ce Update _tests.txt 2016-07-24 14:25:08 +08:00
Anthony Calosa
6fbe9de1a8 Create Living_Death.txt 2016-07-24 14:24:11 +08:00
Anthony Calosa
3b1410f913 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-24 14:21:15 +08:00
Anthony Calosa
f9265923a9 Merge pull request #784 from kevlahnota/master 
Border Adjustment & Added repeat depleter/ingest cards
 2016-07-24 13:29:26 +08:00
Anthony Calosa
3282848631 Normalized Big Quad Border 
Hopefully all Big Quads have identical border sizes: In Game, Deck
Editor Carousel and Trophies .
 2016-07-24 13:12:40 +08:00
Anthony Calosa
f142363bfa smaller scaled big quad and forced border 
Ingame big quads are scaled smaller
 2016-07-24 12:40:41 +08:00
Anthony Calosa
c0e9800179 added scalpelexis, sphinx's tutelage, grindstone, primal surge 2016-07-24 12:31:16 +08:00
Anthony Calosa
97308ca31c Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-24 11:24:02 +08:00
zethfoxster
02992954c2 Merge pull request #30 from WagicProject/master 
getting master
 2016-07-23 09:19:12 -04:00
Anthony Calosa
78d4f178a3 Merge pull request #783 from kevlahnota/master 
Fix Flying vs Moat (multiples of them). Fixes issue #526
 2016-07-23 10:16:47 +08:00
Anthony Calosa
fe577d9dd0 fix flying and multiple moat in play 
putrid imp that gains temporary flying cant attack if the opponent has
multiple moat in play, this should fix it.
 2016-07-23 09:45:12 +08:00
Anthony Calosa
007010067b Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-23 09:06:56 +08:00
zethfoxster
bc2d8dab31 corrected my logic for emerge, originally I thought the cost was the same as the original cost, while coding i noticed it can have a completely different cost than the real manacost. 
moved the extra cost check for "offerings" to a location before canafford in alternative reacttoclick, the reason for this is that the 2 offering cost we have handle the can afford calls, and even cast the card in the dopay. not placing this before it causes the card to not react to click if there is a different manacost attached to the emerge/kill 
test codes below.
mana={g}{g}{g}
other={emerge}(r}{4} name(emerge)

mana={6}
other={k(giant|mybattlefield)}

fixed memleaks in killoffering code.

note to devs, remember to make diff costs a variable that you can safe_delete, it creates a manacost object that will become a leak otherwise.
do not use it directly as a function.
source->controller()->getManaPool()->canAfford(source->getManaCost()->Diff(target->getManaCost()))
this will leave a memleak every single time ai checks this cost, or a player accesses the cost even if you cant pay it.
 2016-07-22 19:10:06 -04:00
zethfoxster
296f8645fb Merge pull request #782 from zethfoxster/master 
pushing to master
 2016-07-22 18:05:35 -04:00
zethfoxster
2d76c8ff0d Merge pull request #29 from WagicProject/master 
getting master
 2016-07-22 18:05:16 -04:00
zethfoxster
0a3d9f9876 flipped the logic of the 2 deck editor menu buttons left and right, it was a nightmare making an ai deck with the tiny buttons to navigate. having my finger slip slightly off the button made it travel the opposite direction from the button, which was confusing and felt very buggy. 2016-07-22 17:46:52 -04:00
Anthony Calosa
2a1d0b19ce Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-22 21:35:23 +08:00
Anthony Calosa
a99c57ab1a Merge pull request #780 from kevlahnota/master 
OK quad and COMBATTOUGHNESS for attackers/blockers
 2016-07-22 16:34:15 +08:00
Anthony Calosa
6832049ccc reserve size 2016-07-22 16:00:29 +08:00
Anthony Calosa
6d72753216 OK quad and COMBATTOUGHNESS for attackers/blockers 
support doubled res for OK quad, AI should consider toughness as power
if it has COMBATTOUGHNESS ability
 2016-07-22 15:38:38 +08:00
Anthony Calosa
b6b3898536 Merge pull request #10 from WagicProject/master 
pull from master
 2016-07-22 14:20:39 +08:00
Anthony Calosa
99922d38e2 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-22 14:15:50 +08:00
zethfoxster
161623a8d2 Merge pull request #779 from zethfoxster/master 
pushing to master
 2016-07-21 22:31:17 -04:00
zethfoxster
155a7a6582 Merge pull request #28 from WagicProject/master 
getting master
 2016-07-21 22:29:58 -04:00
zethfoxster
6aafe9dee0 added lifegain and oplifegain variable used the same as lifelost, but stores the value of life gained this turn. 2016-07-21 21:11:15 -04:00
zethfoxster
680c9d64cb Merge pull request #778 from zethfoxster/master 
getting master
 2016-07-21 20:47:28 -04:00
zethfoxster
ca395492d5 added meld(cardname) 
added meldfrom(cardname|cardname) helper class.

auto={0}:target(arbor colossus|mybattlefield) meld(Arc Runner)
auto=meldfrom(arbor elf|Arbor Colossus)
 2016-07-21 20:46:53 -04:00
Anthony Calosa
ea920d352f Merge pull request #777 from kevlahnota/master 
Award images
 2016-07-21 15:50:58 -05:00
Anthony Calosa
0c0031455b Add files via upload 2016-07-21 15:49:32 -05:00
Anthony Calosa
a8a9893ce4 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-22 04:22:34 +08:00
Anthony Calosa
5143743661 unlocked images 2016-07-21 22:58:27 +08:00
Anthony Calosa
88a42b25cc Add files via upload 2016-07-21 02:39:51 -05:00
Anthony Calosa
b371bf6efa Merge pull request #776 from kevlahnota/master 
psp fix 3
 2016-07-21 02:37:47 -05:00
Anthony Calosa
3bc7ed6f8c Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-07-21 15:36:22 +08:00
Anthony Calosa
f996510969 psp fix 3 2016-07-21 15:36:16 +08:00
Anthony Calosa
58fd119636 Add files via upload 2016-07-21 02:36:16 -05:00