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 |
|
zethfoxster
|
30df5226df
|
Merge pull request #20 from WagicProject/master
getting master
|
2016-07-16 09:39:26 -04:00 |
|
Anthony Calosa
|
c8369ce316
|
replaced backdrop and taskboard
|
2016-07-16 21:30:09 +08:00 |
|
Anthony Calosa
|
ffb7e5d573
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-16 21:00:14 +08:00 |
|
Anthony Calosa
|
3d41531a84
|
Merge pull request #754 from kevlahnota/master
support doubled res for awards
|
2016-07-16 19:50:20 +08:00 |
|
Anthony Calosa
|
f0fa6986d7
|
support double res award
the 203.f height and 268.f is reserved for small award images, if you
want double res, make the award in scale of 171x192 (example 342x384)
|
2016-07-16 14:49:57 +08:00 |
|
Anthony Calosa
|
d908606527
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-16 13:30:55 +08:00 |
|
Anthony Calosa
|
886a26aa20
|
Merge pull request #753 from kevlahnota/master
First set of Graphic Changes ... use default theme
|
2016-07-16 10:19:37 +08:00 |
|
Anthony Calosa
|
bc77ff45cd
|
Create readme.txt
|
2016-07-16 09:44:42 +08:00 |
|
Anthony Calosa
|
c1fb884dcd
|
moved old themes
|
2016-07-16 09:38:20 +08:00 |
|
Anthony Calosa
|
26992828f0
|
Add files via upload
|
2016-07-16 09:36:22 +08:00 |
|
Anthony Calosa
|
07670c6bc5
|
Create readme.txt
|
2016-07-16 09:32:15 +08:00 |
|
Anthony Calosa
|
b2bc6b7740
|
remove old theme
|
2016-07-16 09:25:21 +08:00 |
|
Anthony Calosa
|
c617ede243
|
First set of Graphic changes
TODO: generate a graph/stats on deck menu to the right, update other
graphics, move detailed info on the right of deck menu...
|
2016-07-16 09:16:07 +08:00 |
|
Anthony Calosa
|
0d7600d62c
|
revert wallpapers
|
2016-07-16 09:08:38 +08:00 |
|
Anthony Calosa
|
7a0ef10f9f
|
add new graphics
|
2016-07-16 09:06:38 +08:00 |
|
zethfoxster
|
2fc52c9abd
|
changed suspend to use castcard.
|
2016-07-14 21:25:04 -04:00 |
|
zethfoxster
|
9a56817bf8
|
fixed a bug I introduced
|
2016-07-14 20:44:21 -04:00 |
|
zethfoxster
|
e81346f881
|
more work on cascade, I think I figured out what was causing a weird crash.
|
2016-07-14 20:28:19 -04:00 |
|
zethfoxster
|
01fd8fa406
|
recoded cascade, the logic was incorrect. also the ability was coded incorrectly. ALL the cards get exiled, then placed on the bottom, the card that cost less is also exiled then MAY be cast otherwise its placed in the library bottom with the rest.
I also now tell AI to ALWAYS use cast card if available. as the effects are always better.
|
2016-07-13 23:57:30 -04:00 |
|
Anthony Calosa
|
f09e0db311
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-14 10:51:23 +08:00 |
|
zethfoxster
|
5dc72e88fe
|
Merge pull request #19 from WagicProject/master
getting master
|
2016-07-13 20:08:23 -04:00 |
|
Anthony Calosa
|
169e2b8477
|
change path again
|
2016-07-14 01:13:43 +08:00 |
|
Anthony Calosa
|
9fe5ec6068
|
removed old path
|
2016-07-14 00:59:46 +08:00 |
|
Anthony Calosa
|
d4e0ca3f03
|
try to fix build
|
2016-07-14 00:57:50 +08:00 |
|
Anthony Calosa
|
7690a27e60
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-13 18:50:51 +08:00 |
|
Anthony Calosa
|
748d9ef65d
|
Merge pull request #752 from kevlahnota/master
menubar
|
2016-07-13 15:25:18 +08:00 |
|
Anthony Calosa
|
d88db28da8
|
menubar graphic
|
2016-07-13 14:27:33 +08:00 |
|
Anthony Calosa
|
e95b9f57fa
|
menubar
|
2016-07-13 14:25:57 +08:00 |
|
Anthony Calosa
|
6c14aa49ea
|
Merge remote-tracking branch 'refs/remotes/WagicProject/master'
|
2016-07-13 13:50:18 +08:00 |
|
Anthony Calosa
|
1859fc87ae
|
Merge pull request #751 from kevlahnota/master
adjust simple menu & textscroller
|
2016-07-13 13:11:39 +08:00 |
|
Anthony Calosa
|
6c9d2e5db7
|
tooltip graphic
|
2016-07-13 13:09:34 +08:00 |
|