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

6137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zethfoxster
161623a8d2 Merge pull request #779 from zethfoxster/master 
pushing to master
 2016-07-21 22:31:17 -04:00
zethfoxster
155a7a6582 Merge pull request #28 from WagicProject/master 
getting master
 2016-07-21 22:29:58 -04:00
zethfoxster
6aafe9dee0 added lifegain and oplifegain variable used the same as lifelost, but stores the value of life gained this turn. 2016-07-21 21:11:15 -04:00
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
ea920d352f Merge pull request #777 from kevlahnota/master 
Award images
 2016-07-21 15:50:58 -05: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
b371bf6efa Merge pull request #776 from kevlahnota/master 
psp fix 3
 2016-07-21 02:37:47 -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
Anthony Calosa
f275792604 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-21 15:23:17 +08:00
zethfoxster
9f8ead5e4e added other={cost} 
other={emerge}
 2016-07-20 20:06:18 -04:00
zethfoxster
a35ccbbe5b Merge pull request #775 from zethfoxster/master 
pushing to master
 2016-07-20 19:01:10 -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
0fd0c5ecc1 Merge pull request #774 from kevlahnota/master 
psp fix 2
 2016-07-20 17:36:02 -05: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
Anthony Calosa
7c7c8c4f34 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-21 06:02:56 +08:00
xawotihs
3d7362aa9d Merge branch 'master' of https://github.com/WagicProject/wagic 2016-07-20 22:16:23 +01:00
Anthony Calosa
f3061a2526 Merge pull request #773 from kevlahnota/master 
Semicolon
 2016-07-20 11:40:24 -05:00
Anthony Calosa
2657af1aef semicolon 2016-07-21 00:38:01 +08:00
Anthony Calosa
dd03ed4b30 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-21 00:37:50 +08:00
Anthony Calosa
64c6b05963 Merge pull request #772 from kevlahnota/master 
try to fix psp
 2016-07-20 19:19:56 +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
Anthony Calosa
3147aa539c Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-20 09:42:16 +08:00
zethfoxster
ad4532932b Merge pull request #771 from zethfoxster/master 
pushing to master
 2016-07-19 20:44:40 -04:00
zethfoxster
ffac3462af Merge pull request #26 from WagicProject/master 
Merge pull request #770 from zethfoxster/master
 2016-07-19 20:44:06 -04: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
775085eca1 Uses now *ant release* to build the APK 2016-07-19 21:30:08 +01:00
xawotihs
b3d580cada Changed Android app manifest to be not debuggable. 2016-07-19 21:03:24 +01:00
Anthony Calosa
37987ddb57 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-19 10:47:53 +08:00
zethfoxster
a56ab4f561 Merge pull request #770 from zethfoxster/master 
pushing to master
 2016-07-18 22:30:53 -04: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
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