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

6253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
b90dfbe3b0 Centered P/T inside P/T box 2016-07-30 15:04:34 +08:00
Anthony Calosa
c230794c82 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-30 15:03:08 +08:00
Anthony Calosa
7f83aa7253 Merge pull request #812 from kevlahnota/master 
small adjustment
 2016-07-30 12:14:24 +08:00
Anthony Calosa
1039815017 small adjustment 
meld card have a little space between. reduce render big display.
 2016-07-30 10:21:39 +08:00
Anthony Calosa
2c43eac80d Merge pull request #811 from kevlahnota/master 
change enstack & scale
 2016-07-30 09:18:44 +08:00
Anthony Calosa
4aa6ad3203 small scale 2016-07-30 08:13:30 +08:00
Anthony Calosa
730b05ad1b change enstack attackers 
their x position is the same in their "default" horizontal stack, so
when attacking it always start at left side, not in the middle. Please
report if you have bugs...
 2016-07-30 07:07:35 +08:00
Anthony Calosa
5a7b2c5029 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-30 07:02:49 +08:00
Anthony Calosa
96dd3faef0 Merge pull request #810 from kevlahnota/master 
Meld card size
 2016-07-30 03:49:06 +08:00
Anthony Calosa
ffdc8cd9ff meld card size 2016-07-30 03:05:24 +08:00
Anthony Calosa
8256ac3bee Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-30 01:41:43 +08:00
Anthony Calosa
037ab83519 Merge pull request #809 from kevlahnota/master 
Border corrections
 2016-07-30 00:10:28 +08:00
Anthony Calosa
a56e77310d Border Corrections 
Removed other border render, and use the one in cardgui::drawcard...
 2016-07-29 23:10:01 +08:00
Anthony Calosa
5350fb7f5d Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-29 18:47:51 +08:00
Anthony Calosa
9161f89057 Merge pull request #808 from kevlahnota/master 
alphabeta border & scale
 2016-07-29 18:40:38 +08:00
Anthony Calosa
1d2abeb20b Minor Border changes 
Also added copier values if it has copied a token or not...
 2016-07-29 18:37:03 +08:00
Anthony Calosa
833c21192a Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-29 18:30:20 +08:00
Anthony Calosa
86168e454f Merge pull request #807 from kevlahnota/master 
Add test and Fix unused variable error
 2016-07-29 08:11:05 +08:00
Anthony Calosa
a20c2ce29a Unused variable 2016-07-29 07:30:20 +08:00
Anthony Calosa
874b27c56d Merge branch 'master' of https://github.com/kevlahnota/wagic 2016-07-29 07:00:46 +08:00
Anthony Calosa
a7dc44e4e1 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-29 07:00:07 +08:00
zethfoxster
047d08882e Merge pull request #806 from zethfoxster/master 
pushing to master
 2016-07-28 18:55:03 -04:00
zethfoxster
52df1ad963 the fix for the sacrifice trigger was a ton easier than expected. 
treat it like a spell. 
the card after contains all the info we need to determine if it should trigger.
 2016-07-28 18:48:47 -04:00
Anthony Calosa
c2cec37928 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-29 06:36:51 +08:00
Anthony Calosa
239a186b36 Update _tests.txt 2016-07-28 21:36:21 +08:00
Anthony Calosa
5aeb2ebc05 Create TirelessGraf.txt 2016-07-28 21:35:43 +08:00
zethfoxster
a7e87aaae5 Merge pull request #36 from WagicProject/master 
Getting master
 2016-07-28 09:11:55 -04:00
zethfoxster
eb545eca57 Merge pull request #804 from zethfoxster/master 
Merge pull request #35 from WagicProject/master
 2016-07-28 08:02:00 -04:00
Anthony Calosa
44ab1827bf Merge pull request #803 from kevlahnota/master 
Update test and Corrected Graf Mole
 2016-07-28 19:39:05 +08:00
Anthony Calosa
96b4f024b4 Update test and Corrected Graf Mole 2016-07-28 19:34:50 +08:00
Anthony Calosa
b070035770 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-28 19:28:05 +08:00
Anthony Calosa
1b0c3d8c00 Merge pull request #802 from kevlahnota/master 
Attempt to fix my mess
 2016-07-28 19:25:42 +08:00
Anthony Calosa
2e71cb08d0 I hope this is correct 2016-07-28 19:24:01 +08:00
Anthony Calosa
3da5d12bee Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-28 17:31:51 +08:00
Anthony Calosa
e8019bbb92 Merge pull request #801 from kevlahnota/master 
Fix Compilation and add Tireless Tracker Test
 2016-07-28 17:09:34 +08:00
Anthony Calosa
30dab27202 Fix Compilation 2016-07-28 16:38:16 +08:00
Anthony Calosa
cc7077d783 Fix compilation and add Tireless Tracker test 2016-07-28 16:37:38 +08:00
Anthony Calosa
fda7e9f39d Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-28 11:20:40 +08:00
zethfoxster
e178533493 Merge pull request #35 from WagicProject/master 
getting master
 2016-07-27 23:04:19 -04:00
zethfoxster
e3ad9296bc Merge pull request #800 from zethfoxster/master 
getting master
 2016-07-27 23:03:37 -04:00
Anthony Calosa
01042a62ae Merge pull request #799 from kevlahnota/master 
revert
 2016-07-28 10:30:49 +08:00
Anthony Calosa
7bd940ddb3 Revert "revised legendary" 
This reverts commit 193d7accb4.
 2016-07-28 10:28:54 +08:00
Anthony Calosa
f168702aad Revert "moved sac event" 
This reverts commit 2a33c0c375.
 2016-07-28 10:28:27 +08:00
Anthony Calosa
2a33c0c375 moved sac event 2016-07-28 10:26:25 +08:00
zethfoxster
eea240d7f2 changing some of the logic to the previous fixes, we want to avoid using code that looks for specific card names. 
currently we have kamiflip as the only defined flip type as it is treated differently from the others. 
but we have room for more if needed now
doublefaced=kamiflip
sets the flip type of a card to the kamiflip style cards. since this is defined on cardprimitive level now, we might be able to do something different from the flipping animation. who knows.

commented out the forcing token triggers, it bypass targetchooser check. still working on a fix for this coming soon.
 2016-07-27 20:03:25 -04:00
zethfoxster
afb98a374c updated codes for changes 2016-07-27 19:58:32 -04:00
Anthony Calosa
ed0d28eaf6 Merge remote-tracking branch 'refs/remotes/WagicProject/master' 2016-07-28 07:02:36 +08:00
Anthony Calosa
50345101e5 Merge pull request #798 from kevlahnota/master 
Revised Legendary
 2016-07-28 06:44:14 +08:00
zethfoxster
c0e4010c88 Merge pull request #34 from WagicProject/master 
getting master
 2016-07-27 18:42:54 -04:00
Anthony Calosa
193d7accb4 revised legendary 2016-07-28 06:42:47 +08:00