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

6094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
61cd74fcd0 revert psp cache 2016-07-19 09:52:18 +08:00
zethfoxster
8e987a6718 Merge pull request #769 from zethfoxster/master 
pushing to master
 2016-07-18 17:24:15 -04:00
zethfoxster
520be9dbe8 Merge pull request #24 from WagicProject/master 
getting master
 2016-07-18 17:23:54 -04:00
zethfoxster
322e6f7edf Merge pull request #768 from kevlahnota/master 
Some changes on Deck Editor & Others
 2016-07-18 17:22:16 -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
07d7df7271 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-18 23:33:26 +08:00
Anthony Calosa
5b9f3c70dc Merge pull request #767 from kevlahnota/master 
minor changes
 2016-07-18 14:26:31 +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
2dd882a7a5 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-18 13:51:19 +08:00
Anthony Calosa
fe4c102c7d Merge pull request #766 from kevlahnota/master 
psp cache
 2016-07-18 12:47:01 +08:00
Anthony Calosa
1380bc9940 psp cache 2016-07-18 12:44:19 +08:00
Anthony Calosa
5cc549ad3a Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-18 11:11:51 +08:00
Anthony Calosa
75395f6622 Merge pull request #765 from kevlahnota/master 
Fix Deck Menu layer, Change Main Menu Layout, Fix Crash cdaactive on tokens
 2016-07-18 11:04:51 +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
Anthony Calosa
c0334d0c94 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-18 06:07:38 +08:00
zethfoxster
6acd897e16 Merge pull request #23 from WagicProject/master 
getting master
 2016-07-17 10:39:10 -04:00
Anthony Calosa
2adfc55339 Merge pull request #763 from kevlahnota/master 
stats to the right
 2016-07-17 20:07:28 +08: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
6b5cbd5f11 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-17 17:35:36 +08:00
Anthony Calosa
ea6017511b Merge pull request #762 from kevlahnota/master 
large icons for Android
 2016-07-17 15:39:58 +08:00
Anthony Calosa
2477b8a3ea large icons for Android 2016-07-17 15:39:10 +08:00
Anthony Calosa
cdd1075384 Merge pull request #761 from kevlahnota/master 
phaseinfo & backdropframe & backdrop
 2016-07-17 15:22:58 +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
zethfoxster
4e9d4bfaf6 minor changes to ai 2016-07-17 02:19:58 -04:00
Anthony Calosa
894e9f244f added phaseinfo graphic 2016-07-17 14:13:57 +08:00
Anthony Calosa
189b45ab9b new backdrop 2016-07-17 14:12:47 +08:00
Anthony Calosa
b0912de788 Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-07-17 14:11:54 +08:00
Anthony Calosa
f435946f66 seperated backdrop and phase info graphic 2016-07-17 14:11:49 +08:00
Anthony Calosa
64d91ccaab Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-17 12:52:12 +08:00
Anthony Calosa
e97fbb2784 Update DeckImporter.java 2016-07-17 11:47:06 +08:00
zethfoxster
0029e0ed43 Merge pull request #22 from WagicProject/master 
getting master
 2016-07-16 23:13:59 -04:00
Anthony Calosa
088f235f29 Merge pull request #760 from kevlahnota/master 
revert build.xml
 2016-07-17 08:55:34 +08:00
Anthony Calosa
dd5aa90498 revert build.xml 2016-07-17 08:54:26 +08:00
Anthony Calosa
c866e5dd45 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-17 08:54:01 +08:00
Anthony Calosa
6e8f74af15 Merge pull request #759 from kevlahnota/master 
centered unlock awards and double res shop
 2016-07-17 08:36:18 +08:00