Commit Graph

5378 Commits

Author SHA1 Message Date
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 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 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
zethfoxster 9f8ead5e4e added other={cost}
other={emerge}
2016-07-20 20:06:18 -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 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
xawotihs 3d7362aa9d Merge branch 'master' of https://github.com/WagicProject/wagic 2016-07-20 22:16:23 +01:00
Anthony Calosa 2657af1aef semicolon 2016-07-21 00:38:01 +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
zethfoxster 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
xawotihs 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
xawotihs b3d580cada Changed Android app manifest to be not debuggable. 2016-07-19 21:03:24 +01:00
zethfoxster 6f649bd680 Merge pull request #25 from WagicProject/master
getting master
2016-07-18 22:30:30 -04:00
zethfoxster 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
Anthony Calosa 61cd74fcd0 revert psp cache 2016-07-19 09:52:18 +08:00
zethfoxster 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
zethfoxster 520be9dbe8 Merge pull request #24 from WagicProject/master
getting master
2016-07-18 17:23:54 -04:00
Anthony Calosa b6eea6fe2e Some Changes to Deck Editor and Others
Some Deck Editor changes
2016-07-19 04:33:23 +08:00
Anthony Calosa dc84c50ea8 add deck editor graphics 2016-07-19 03:32:22 +08:00
Anthony Calosa bd36590084 offquad for offset bg 2016-07-18 13:52:28 +08:00
Anthony Calosa 4e64ff4ff9 center menu title 2016-07-18 13:51:49 +08:00
Anthony Calosa 1380bc9940 psp cache 2016-07-18 12:44:19 +08:00
Anthony Calosa c9576e260e fix blinking menu item 2016-07-18 11:04:14 +08:00
Anthony Calosa 362d692879 cleanup 2016-07-18 10:53:07 +08:00
Anthony Calosa acbaa69305 use previous "phaseinfo" as fakebar 2016-07-18 10:38:47 +08:00
Anthony Calosa 592a48c725 add fakebar 2016-07-18 10:38:47 +08:00
zethfoxster bfaaf7d893 travis int order 2016-07-17 22:37:32 -04:00
zethfoxster 9e73dc9c00 add support for repeater deplete cards.
Scalpelexis
Sphinx's Tutelage
Grindstone
normally I aim for much bigger card groups, but this was requested by one of the only 2 active members we have on the forum.
I'll have the card code for these cards ready when I code eldrich moon set.

to use, use it like any normal depelte except add
name
color
to the front, 
name deplete:4 targetsZone(player)
this will repeat this until the player depletes cards that dont have atleast 2 with the same name.
color deplete:2 target(player)
this will continue to deplete until the player depletes a set of cards that dont share a color with each other lands not included when checking colors.
enjoy.
2016-07-17 22:24:53 -04:00
Anthony Calosa d37aac0c71 added fakebar.png 2016-07-18 10:15:22 +08:00
Anthony Calosa 8314d4c9ae update GameStateMenu
as Zeth suggested
2016-07-18 09:24:28 +08:00
Anthony Calosa d860954c32 fix crash with cdaactive and token
cdaactive is forcedalive, if the token dies, forcedestroy it, token/s go
to garbage
2016-07-18 07:32:02 +08:00
Anthony Calosa 0b4b085095 fix layer order 2016-07-18 07:28:31 +08:00
zethfoxster 6acd897e16 Merge pull request #23 from WagicProject/master
getting master
2016-07-17 10:39:10 -04:00
Anthony Calosa 208b4f68b5 added statsholder 2016-07-17 19:05:00 +08:00
Anthony Calosa 33fd704a00 move stats to the right in deck menu 2016-07-17 19:03:55 +08:00
Anthony Calosa 6d8ece6822 change avatar holder bg color 2016-07-17 19:02:45 +08:00
Anthony Calosa 2477b8a3ea large icons for Android 2016-07-17 15:39:10 +08:00
Anthony Calosa c61c17f19c increased cache 2016-07-17 15:05:53 +08:00
Anthony Calosa 774b79f07e seperated backdrop and backdropframe 2016-07-17 14:44:37 +08:00
Anthony Calosa 002172281b added backdrop frame 2016-07-17 14:42:16 +08:00