680c9d64cb
Merge pull request #778 from zethfoxster/master
...
getting master
2016-07-21 20:47:28 -04:00
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
ea920d352f
Merge pull request #777 from kevlahnota/master
...
Award images
2016-07-21 15:50:58 -05:00
0c0031455b
Add files via upload
2016-07-21 15:49:32 -05:00
a8a9893ce4
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-07-22 04:22:34 +08:00
5143743661
unlocked images
2016-07-21 22:58:27 +08:00
88a42b25cc
Add files via upload
2016-07-21 02:39:51 -05:00
b371bf6efa
Merge pull request #776 from kevlahnota/master
...
psp fix 3
2016-07-21 02:37:47 -05:00
3bc7ed6f8c
Merge branch 'master' of https://github.com/kevlahnota/wagic
2016-07-21 15:36:22 +08:00
f996510969
psp fix 3
2016-07-21 15:36:16 +08:00
58fd119636
Add files via upload
2016-07-21 02:36:16 -05:00
f275792604
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-07-21 15:23:17 +08:00
9f8ead5e4e
added other={cost}
...
other={emerge}
2016-07-20 20:06:18 -04:00
a35ccbbe5b
Merge pull request #775 from zethfoxster/master
...
pushing to master
2016-07-20 19:01:10 -04:00
9a60a8838f
Merge pull request #27 from WagicProject/master
...
getting master
2016-07-20 19:00:08 -04:00
bb9e02da6b
fixed a debug assert i introduced.
2016-07-20 18:58:29 -04:00
0fd0c5ecc1
Merge pull request #774 from kevlahnota/master
...
psp fix 2
2016-07-20 17:36:02 -05:00
c89961ebf0
Add files via upload
2016-07-20 17:35:03 -05:00
0f81e82206
psp fix 2
2016-07-21 06:34:14 +08:00
7c7c8c4f34
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-07-21 06:02:56 +08:00
3d7362aa9d
Merge branch 'master' of https://github.com/WagicProject/wagic
2016-07-20 22:16:23 +01:00
f3061a2526
Merge pull request #773 from kevlahnota/master
...
Semicolon
2016-07-20 11:40:24 -05:00
2657af1aef
semicolon
2016-07-21 00:38:01 +08:00
dd03ed4b30
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-07-21 00:37:50 +08:00
64c6b05963
Merge pull request #772 from kevlahnota/master
...
try to fix psp
2016-07-20 19:19:56 +08:00
05017b0236
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-07-20 19:17:36 +08:00
efd9cce4ef
try to fix psp platform
2016-07-20 19:16:48 +08:00
144c78fa4b
Add files via upload
2016-07-20 19:12:06 +08:00
3147aa539c
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-07-20 09:42:16 +08:00
ad4532932b
Merge pull request #771 from zethfoxster/master
...
pushing to master
2016-07-19 20:44:40 -04:00
ffac3462af
Merge pull request #26 from WagicProject/master
...
Merge pull request #770 from zethfoxster/master
2016-07-19 20:44:06 -04:00
7c163592b5
removed the changes I made to selectAbility and created a new function which handles sending an ability and card to have AI do the ability of that card.
...
found a selectability call after blockers that was the cause of a race condition debug assert, but most importantly, the reason AI would sometimes block a creature, then immediately decide not to block. causing it to sometimes take preventable damage, and sometime cause AI to stack a ton of blockers on a single card even tho it did not have a chance to actually kill the creature.
this is still a thing, but wont happen so grossly incorrect now.
2016-07-19 20:16:22 -04:00
a6211e371e
Revert usage of ant release and remove the DEBUG define in the NDK makefile to remove the testsuite
2016-07-19 22:24:26 +01:00
775085eca1
Uses now *ant release* to build the APK
2016-07-19 21:30:08 +01:00
b3d580cada
Changed Android app manifest to be not debuggable.
2016-07-19 21:03:24 +01:00
37987ddb57
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-07-19 10:47:53 +08:00
a56ab4f561
Merge pull request #770 from zethfoxster/master
...
pushing to master
2016-07-18 22:30:53 -04:00
6f649bd680
Merge pull request #25 from WagicProject/master
...
getting master
2016-07-18 22:30:30 -04:00
6316577ec7
taught AI basic attack and block cost.
...
added functionality to send specific abilities to AI "selectAbility" to have it find mana, targets, and use a selected ability at our command.
2016-07-18 22:03:16 -04:00
61cd74fcd0
revert psp cache
2016-07-19 09:52:18 +08:00
37fd0ebbd2
readded the "fakebar" size adjustments based on string lengths.
...
in debug there is a strange line drawn sometimes on screen, like the buttons on main screen, this is not present in release builds, I'm guessing its some kind of debug related thing with JGE and quads.
2016-07-18 19:02:03 -04:00
8e987a6718
Merge pull request #769 from zethfoxster/master
...
pushing to master
2016-07-18 17:24:15 -04:00
520be9dbe8
Merge pull request #24 from WagicProject/master
...
getting master
2016-07-18 17:23:54 -04:00
322e6f7edf
Merge pull request #768 from kevlahnota/master
...
Some changes on Deck Editor & Others
2016-07-18 17:22:16 -04:00
b6eea6fe2e
Some Changes to Deck Editor and Others
...
Some Deck Editor changes
2016-07-19 04:33:23 +08:00
dc84c50ea8
add deck editor graphics
2016-07-19 03:32:22 +08:00
07d7df7271
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
2016-07-18 23:33:26 +08:00
5b9f3c70dc
Merge pull request #767 from kevlahnota/master
...
minor changes
2016-07-18 14:26:31 +08:00
bd36590084
offquad for offset bg
2016-07-18 13:52:28 +08:00
4e64ff4ff9
center menu title
2016-07-18 13:51:49 +08:00
zethfoxster
Anthony Calosa
xawotihs
Xawotihs