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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Anthony Calosa
|
d70fd8c208
|
test build number
|
2016-07-17 08:35:14 +08:00 |
|
Anthony Calosa
|
9551c9bed4
|
upped build number
don't know if we can compute travis build number minus the last build of
this
wagic-v0.20.1
|
2016-07-17 08:02:04 +08:00 |
|
Anthony Calosa
|
06740564f8
|
centered unlock awards and double res shop
400x100 base scale for the xxx_unlocked.png
|
2016-07-17 07:42:46 +08:00 |
|
Anthony Calosa
|
ef94c31d42
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-17 06:28:17 +08:00 |
|
zethfoxster
|
093b370903
|
Merge pull request #758 from zethfoxster/master
stupid case for travis
|
2016-07-16 16:31:56 -04:00 |
|
zethfoxster
|
542845667a
|
stupid case for travis
|
2016-07-16 15:59:45 -04:00 |
|
zethfoxster
|
8ce08bc4f4
|
Merge pull request #757 from zethfoxster/master
more fixes
|
2016-07-16 14:47:12 -04:00 |
|
zethfoxster
|
69158d55c1
|
more fixes
|
2016-07-16 14:46:40 -04:00 |
|
zethfoxster
|
d9a794e186
|
Merge pull request #756 from zethfoxster/master
pushing to master
|
2016-07-16 14:44:16 -04:00 |
|
zethfoxster
|
6cc146c0a5
|
Merge pull request #21 from WagicProject/master
getting master
|
2016-07-16 14:43:45 -04:00 |
|
Anthony Calosa
|
b490328a45
|
Merge pull request #755 from kevlahnota/master
backdrop & taskboard
|
2016-07-16 22:08:13 +08:00 |
|