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 |
|
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
|
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 |
|
Anthony Calosa
|
f275792604
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-21 15:23:17 +08:00 |
|
zethfoxster
|
9f8ead5e4e
|
added other={cost}
other={emerge}
|
2016-07-20 20:06:18 -04:00 |
|
zethfoxster
|
a35ccbbe5b
|
Merge pull request #775 from zethfoxster/master
pushing to master
|
2016-07-20 19:01:10 -04:00 |
|
zethfoxster
|
9a60a8838f
|
Merge pull request #27 from WagicProject/master
getting master
|
2016-07-20 19:00:08 -04:00 |
|
zethfoxster
|
bb9e02da6b
|
fixed a debug assert i introduced.
|
2016-07-20 18:58:29 -04:00 |
|
Anthony Calosa
|
0fd0c5ecc1
|
Merge pull request #774 from kevlahnota/master
psp fix 2
|
2016-07-20 17:36:02 -05:00 |
|
Anthony Calosa
|
c89961ebf0
|
Add files via upload
|
2016-07-20 17:35:03 -05:00 |
|
Anthony Calosa
|
0f81e82206
|
psp fix 2
|
2016-07-21 06:34:14 +08:00 |
|
Anthony Calosa
|
7c7c8c4f34
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-21 06:02:56 +08:00 |
|
xawotihs
|
3d7362aa9d
|
Merge branch 'master' of https://github.com/WagicProject/wagic
|
2016-07-20 22:16:23 +01:00 |
|
Anthony Calosa
|
f3061a2526
|
Merge pull request #773 from kevlahnota/master
Semicolon
|
2016-07-20 11:40:24 -05:00 |
|
Anthony Calosa
|
2657af1aef
|
semicolon
|
2016-07-21 00:38:01 +08:00 |
|
Anthony Calosa
|
dd03ed4b30
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-21 00:37:50 +08:00 |
|
Anthony Calosa
|
64c6b05963
|
Merge pull request #772 from kevlahnota/master
try to fix psp
|
2016-07-20 19:19:56 +08:00 |
|
Anthony Calosa
|
05017b0236
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-20 19:17:36 +08:00 |
|
Anthony Calosa
|
efd9cce4ef
|
try to fix psp platform
|
2016-07-20 19:16:48 +08:00 |
|
Anthony Calosa
|
144c78fa4b
|
Add files via upload
|
2016-07-20 19:12:06 +08:00 |
|
Anthony Calosa
|
3147aa539c
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-20 09:42:16 +08:00 |
|
zethfoxster
|
ad4532932b
|
Merge pull request #771 from zethfoxster/master
pushing to master
|
2016-07-19 20:44:40 -04:00 |
|
zethfoxster
|
ffac3462af
|
Merge pull request #26 from WagicProject/master
Merge pull request #770 from zethfoxster/master
|
2016-07-19 20:44:06 -04:00 |
|